deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added a button to the login view (apparently needed by people on obscure PDA browsers)

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-11-13 17:38:43 +00:00
parent 3f46b5f008
commit 07b7d9210a
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
README
View file

@ -84,9 +84,14 @@ you forgot to run ruby script\reset_references after importing the data.
===Upgrading from Instiki-AR Beta 1
In Beta 2 two new tables are added: sessions and wiki_files. Also, there are some indexes renamed or added.
Otherwise, there are no schema changes, table structure is the same as in Beta 1.
Therefore, create a new development database, edit config/database.yml as appropriate, execute 'rake db_schema_import',
export data (but not structure!) from Beta 1 database, import it into the new one, check that Beta 2 development
environment works with imported data, copy the development database (both data AND structure this time) to production.
Therefore:
1. Create a new development database.
2. Edit config/database.yml as appropriate.
3. Execute 'rake db_schema_import'.
4. Export data (but not structure!) from Beta 1 database.
5. Import it into the new one.
6. Check that Beta 2 development environment works with imported data, and finally
7. Copy the development database (both data AND structure this time) to production.
Future releases will use Rails Migrations, so the upgrade will be somewhat less of a hassle.
===Download the latest release from:

13
app/views/wiki/login.rhtml
View file

@ -4,8 +4,17 @@
<%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
{ 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post'})
%>
<b>Password</b><br />
<input type="password" name="password" id="password" default="yes" />
<p>
This web is password-protected. Please enter the password.
<% if @web.published? %>
If you don't have the password, you can view this wiki as a <%= link_to 'read-only version', :action => 'published', :id => 'HomePage' %>.
<% end %>
</p>
<p>
<b>Password: </b>
<input type="password" name="password" id="password" />
<input type="submit" value="Login" default="yes" />
</p>
<%= end_form_tag %>
</p>

5
public/stylesheets/instiki.css
View file

@ -152,13 +152,14 @@ ol.setup li {
}
#error {
color: #8b0000;
color: #900;
font-style: italic;
font-weight: bold;
width: 600px;
}
#info {
color: #006400;
color: #060;
font-style: italic;
width: 600px;
}