CSS tweaks around page editing
This commit is contained in:
Alexey Verkhovsky
parent
db20c05283
commit
dd6572ac85
6 changed files with 75 additions and 70 deletions
|
|
@ -9,28 +9,28 @@
|
|||
<%= render 'wiki_words_help' %>
|
||||
</div>
|
||||
|
||||
<%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name },
|
||||
{ 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()',
|
||||
'accept-charset' => 'utf-8' })
|
||||
%>
|
||||
<div id="editForm">
|
||||
<%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name },
|
||||
{ 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()',
|
||||
'accept-charset' => 'utf-8' }) %>
|
||||
|
||||
<textarea name="content" id="content"><%= h(@flash[:content] || @page.content) %></textarea>
|
||||
<div id="editFormButtons">
|
||||
<input type="submit" value="Submit" accesskey="s"/> as
|
||||
<%= text_field_tag :author, @author,
|
||||
:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
|
||||
:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
|
||||
|
|
||||
<span>
|
||||
<%= link_to('Cancel', {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
|
||||
{:accesskey => 'c'}) %>
|
||||
<small>(unlocks page)</small>
|
||||
</span>
|
||||
</div>
|
||||
<%= end_form_tag %>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<textarea name="content" id="content" style="width: 70%; height: 500px"><%= h(@flash[:content] || @page.content) %></textarea>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Submit" accesskey="s"/> as
|
||||
<%= text_field_tag :author, @author,
|
||||
:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
|
||||
:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
|
||||
|
|
||||
<%= link_to('Cancel', {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
|
||||
{:accesskey => 'c'})
|
||||
%>
|
||||
<small>(unlocks page)</small>
|
||||
</p>
|
||||
<%= end_form_tag %>
|
||||
|
||||
<script language="JavaScript1.2">
|
||||
<script type="text/javascript">
|
||||
function cleanAuthorName() {
|
||||
if (document.getElementById('authorName').value == "") {
|
||||
document.getElementById('authorName').value = 'AnonymousCoward';
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
|
||||
<p>
|
||||
<%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
|
||||
{ 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post', 'accept-charset' => 'utf-8' })
|
||||
%>
|
||||
{ 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post', 'accept-charset' => 'utf-8' }) %>
|
||||
<p>
|
||||
This web is password-protected. Please enter the password.
|
||||
<% if @web.published? %>
|
||||
|
|
@ -18,6 +17,6 @@
|
|||
<%= end_form_tag %>
|
||||
</p>
|
||||
|
||||
<script language="JavaScript">
|
||||
document.forms["loginForm"].elements["password"].focus();
|
||||
<script type="text/javascript">
|
||||
document.forms["loginForm"].elements["password"].focus();
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -4,28 +4,26 @@
|
|||
@hide_navigation = true
|
||||
%>
|
||||
|
||||
<div id="MarkupHelp" style="float: right; width: 250px; margin-top: 5px">
|
||||
<div id="MarkupHelp">
|
||||
<%= render("#{@web.markup}_help") %>
|
||||
<%= render 'wiki_words_help' %>
|
||||
</div>
|
||||
|
||||
<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
|
||||
{ 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();',
|
||||
'accept-charset' => 'utf-8' })
|
||||
%>
|
||||
<div id="editForm">
|
||||
<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
|
||||
{ 'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();', 'accept-charset' => 'utf-8' }) %>
|
||||
|
||||
<textarea name="content" id="content"><%= h(@flash[:content] || '') %></textarea>
|
||||
<div id="editFormButtons">
|
||||
<input type="submit" value="Submit" accesskey="s"/> as
|
||||
<%= text_field_tag :author, @author,
|
||||
:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
|
||||
:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
|
||||
</div>
|
||||
<%= end_form_tag %>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<textarea name="content" id="content" style="width: 450px; height: 500px"><%= h(@flash[:content] || '') %></textarea>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Submit" accesskey="s"/> as
|
||||
<%= text_field_tag :author, @author,
|
||||
:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
|
||||
:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
|
||||
</p>
|
||||
<%= end_form_tag %>
|
||||
|
||||
<script language="JavaScript1.2">
|
||||
<script type="text/javascript">
|
||||
function cleanAuthorName() {
|
||||
if (document.getElementById('authorName').value == "") {
|
||||
document.getElementById('authorName').value = 'AnonymousCoward';
|
||||
|
|
|
|||
|
|
@ -6,29 +6,31 @@
|
|||
|
||||
<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
|
||||
|
||||
<%= form_tag({:web => @web.address, :action => 'save', :id => @page.name},
|
||||
{ :id => 'editForm', :method => 'post', :onSubmit => 'cleanAuthorName();',
|
||||
'accept-charset' => 'utf-8' })
|
||||
%>
|
||||
<p>
|
||||
<textarea name="content" style="font-size: 12px; width: 450px; height: 500px"><%= @revision.content %></textarea>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Update" accesskey="u" /> as
|
||||
<input type="text" name="author" id="authorName" value="<%= @author %>"
|
||||
onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
|
||||
|
|
||||
<% link_to('Cancel',
|
||||
{:web => @web.address, :action => 'cancel_edit', :id => @page.name},
|
||||
{:accesskey => 'c'})
|
||||
%>
|
||||
<small>(unlocks page)</small>
|
||||
</p>
|
||||
<%= end_form_tag %>
|
||||
<div id="MarkupHelp">
|
||||
<%= render("#{@web.markup}_help") %>
|
||||
<%= render 'wiki_words_help' %>
|
||||
</div>
|
||||
|
||||
<%= render("#{@web.markup}_help") if @web %>
|
||||
<div id="editForm">
|
||||
<%= form_tag({:web => @web.address, :action => 'save', :id => @page.name},
|
||||
{ :id => 'editForm', :method => 'post', :onSubmit => 'cleanAuthorName();',
|
||||
'accept-charset' => 'utf-8' }) %>
|
||||
<textarea name="content" id="content"><%= @revision.content %></textarea>
|
||||
<div id="editFormButtons">
|
||||
<input type="submit" value="Update" accesskey="u" /> as
|
||||
<input type="text" name="author" id="authorName" value="<%= @author %>"
|
||||
onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
|
||||
|
|
||||
<span>
|
||||
<%= link_to('Cancel', {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
|
||||
{:accesskey => 'c'}) %>
|
||||
<small>(unlocks page)</small>
|
||||
</span>
|
||||
</div>
|
||||
<%= end_form_tag %>
|
||||
</div>
|
||||
|
||||
<script language="JavaScript1.2">
|
||||
<script type="text/javascript">
|
||||
function cleanAuthorName() {
|
||||
if (document.getElementById('authorName').value == "") {
|
||||
document.getElementById('authorName').value = 'AnonymousCoward';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
development:
|
||||
adapter: mysql
|
||||
host: localhost
|
||||
socket: /var/run/mysqld/mysqld.sock
|
||||
database: instiki_dev
|
||||
username: root
|
||||
password:
|
||||
|
|
@ -8,6 +9,7 @@ development:
|
|||
test:
|
||||
adapter: mysql
|
||||
host: localhost
|
||||
socket: /var/run/mysqld/mysqld.sock
|
||||
database: instiki_test
|
||||
username: root
|
||||
password:
|
||||
|
|
@ -92,4 +94,4 @@ sqlite3_example:
|
|||
# In-memory SQLite 3 database. Useful for tests.
|
||||
sqlite3_in_memory_example:
|
||||
adapter: sqlite3
|
||||
database: ":memory:"
|
||||
database: ":memory:"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
body { background-color: white; color: #333; }
|
||||
body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 80%; line-height: 1.3em; }
|
||||
body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; line-height: 1.3em; }
|
||||
|
||||
#Container { float: none; margin: 0 15%; text-align: center; }
|
||||
#Content { margin: 0; padding: 0.3em; text-align: left; border-top: none; float: left; width: 100%; }
|
||||
|
|
@ -16,8 +16,8 @@ h3 { font-size: 120%; }
|
|||
h1#pageName { margin: 0.2em 0 0; line-height: 1em; padding: 0; }
|
||||
h1#pageName small { color: #444; font-size: 35%; line-height: 1em; padding: 0; }
|
||||
|
||||
a.nav, a.nav:link, a.nav:visited { color: #000; }
|
||||
a.nav:hover { color: white; background-color: #000; }
|
||||
a.nav, a.nav:link, a.nav:visited { color: #000; background-color: #FFF; }
|
||||
a.nav:hover { color: #FFF; background-color: #000; }
|
||||
|
||||
table { border: double black; border-collapse: collapse; }
|
||||
td { border: thin solid #888; }
|
||||
|
|
@ -32,14 +32,14 @@ form#navigationSearchForm input { font-size: 80%; }
|
|||
|
||||
.navigation { margin-top: 0.3em; font-size : 90%; color: #999; }
|
||||
.navigation a:hover { color: white; background-color: #000; text-decoration: none; }
|
||||
.navigation a { font-size: 80%; color: #000; font-weight: bold; }
|
||||
.navigation a { color: #000; font-weight: bold; }
|
||||
.navigation small a { font-weight: normal; font-size: 90%; }
|
||||
|
||||
.navOn { font-size: 11px; color: #444; font-weight: bold; text-decoration: none; }
|
||||
|
||||
.help { font-family: verdana, arial, helvetica, sans-serif; font-size: 70%; }
|
||||
div.help { font-family: verdana, arial, helvetica, sans-serif; font-size: 70%; }
|
||||
|
||||
.inputBox { font-family: verdana, arial, helvetica, sans-serif; font-size: 80%; background-color: #EEE; padding: 0.3em; margin-bottom: 1.5em; }
|
||||
div.inputBox { font-family: verdana, arial, helvetica, sans-serif; font-size: 80%; background-color: #EEE; padding: 0.3em; margin-bottom: 1.5em; }
|
||||
|
||||
blockquote { display: block; font-size: 90%; margin: 0 0 1.5em 0; padding: 0 2.5em; line-height: 1.5em; font-style: italic; }
|
||||
|
||||
|
|
@ -65,6 +65,10 @@ div.errorExplanation li { padding: 0; margin: 0; border: none; }
|
|||
div.fieldWithErrors input { border: 1px solid #900; }
|
||||
div.info { color: #060; background-color: #BFBFBF; padding: 0.5em; margin-top: 0.5em; font-weight: bold; width: 100%; }
|
||||
|
||||
div#editFormButtons { margin: 0.5em 0 0 0; }
|
||||
div#editFormButtons span { white-space: nowrap; }
|
||||
div#editForm textarea#content { width: 70%; height: 400px; }
|
||||
|
||||
div#MarkupHelp { float: right; width: 25%; margin-top: 0.5em; }
|
||||
div#MarkupHelp table { margin-bottom: 0; border-top: 3px solid #999; border-left: 3px solid #999;
|
||||
border-right: 3px solid #BBB; border-bottom: 3px solid #BBB}
|
||||
|
|
|
|||
Loading…
Reference in a new issue