Added a button to the login view (apparently needed by people on obscure PDA browsers)
This commit is contained in:
parent
3f46b5f008
commit
07b7d9210a
11
README
11
README
|
@ -84,9 +84,14 @@ you forgot to run ruby script\reset_references after importing the data.
|
||||||
===Upgrading from Instiki-AR Beta 1
|
===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.
|
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.
|
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',
|
Therefore:
|
||||||
export data (but not structure!) from Beta 1 database, import it into the new one, check that Beta 2 development
|
1. Create a new development database.
|
||||||
environment works with imported data, copy the development database (both data AND structure this time) to production.
|
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.
|
Future releases will use Rails Migrations, so the upgrade will be somewhat less of a hassle.
|
||||||
|
|
||||||
===Download the latest release from:
|
===Download the latest release from:
|
||||||
|
|
|
@ -4,8 +4,17 @@
|
||||||
<%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
|
<%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
|
||||||
{ 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post'})
|
{ 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post'})
|
||||||
%>
|
%>
|
||||||
<b>Password</b><br />
|
<p>
|
||||||
<input type="password" name="password" id="password" default="yes" />
|
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 %>
|
<%= end_form_tag %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
|
@ -152,13 +152,14 @@ ol.setup li {
|
||||||
}
|
}
|
||||||
|
|
||||||
#error {
|
#error {
|
||||||
color: #8b0000;
|
color: #900;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
font-weight: bold;
|
||||||
width: 600px;
|
width: 600px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#info {
|
#info {
|
||||||
color: #006400;
|
color: #060;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
width: 600px;
|
width: 600px;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue