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

More XHTML validity and CSS cleanup.

Browse source
This commit is contained in:
Jacques Distler 2007-02-18 17:27:36 -06:00
parent f1cff1a798
commit 21a403b04f
8 changed files with 67 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/views/admin/create_system.rhtml
View file

@ -21,10 +21,10 @@
The address can only consist of letters and digits. The address can only consist of letters and digits.
</div> </div>
<div class="inputBox"> <div class="inputBox">
Name: <input type="text" id="web_name" name="web_name" value="Wiki" <label for="web_name">Name:</label> <input type="text" id="web_name" name="web_name" value="Wiki"
onchange="proposeAddress();" onclick="this.value == 'Wiki' ? this.value = '' : true" /> onchange="proposeAddress();" onclick="this.value == 'Wiki' ? this.value = '' : true" />
&nbsp;&nbsp; &#xa0;&#xa0;
Address: <input type="text" id="web_address" name="web_address" onchange="cleanAddress();" <label for="web_address">Address:</label> <input type="text" id="web_address" name="web_address" onchange="cleanAddress();"
value="wiki" /> value="wiki" />
</div> </div>
</li> </li>
@ -36,9 +36,9 @@
</div> </div>
<div class="help"><em>Everyone with this password will be able to do this, so pick it carefully!</em></div> <div class="help"><em>Everyone with this password will be able to do this, so pick it carefully!</em></div>
<div class="inputBox"> <div class="inputBox">
Password: <input type="password" id="password" name="password" /> <label for="password">Password:</label> <input type="password" id="password" name="password" />
&nbsp;&nbsp; &#xa0;&#xa0;
Verify: <input type="password" id="password_check" name="password_check" /> <label for="password_check">Verify:</label> <input type="password" id="password_check" name="password_check" />
</div> </div>
</li> </li>
</ol> </ol>

8
app/views/admin/create_web.rhtml
View file

@ -21,9 +21,9 @@
The address can only consist of letters and digits. The address can only consist of letters and digits.
</div> </div>
<div class="inputBox"> <div class="inputBox">
Name: <input type="text" id="web_name" name="name" onchange="proposeAddress();" /> <label for="web_name">Name:</label> <input type="text" id="web_name" name="name" onchange="proposeAddress();" />
&nbsp;&nbsp; &#xa0;&#xa0;
Address: <input type="text" id="web_address" name="address" onchange="cleanAddress();" /> <label for="web_address">Address:</label> <input type="text" id="web_address" name="address" onchange="cleanAddress();" />
</div> </div>
</li> </li>
</ol> </ol>
@ -31,7 +31,7 @@
<p align="right"> <p align="right">
<small> <small>
Enter system password <label for="system_password">Enter system password</label>
<input type="password" id="system_password" name="system_password" /> <input type="password" id="system_password" name="system_password" />
and and
<input type="submit" value="Create Web" /> <input type="submit" value="Create Web" />

66
app/views/admin/edit_web.rhtml
View file

@ -14,65 +14,63 @@
</div> </div>
<div class="inputBox"> <div class="inputBox">
Name: <input type="text" id="name" name="name" class="disableAutoComplete" value="<%= @web.name %>" <label for ="name">Name:</label> <input type="text" id="name" name="name" class="disableAutoComplete" value="<%= @web.name %>"
onchange="proposeAddress();" /> &nbsp;&nbsp; onchange="proposeAddress();" /> &#xa0;&#xa0;
Address: <input type="text" class="disableAutoComplete" id="address" name="address" value="<%= @web.address %>" <label for="address">Address:</label> <input type="text" class="disableAutoComplete" id="address" name="address" value="<%= @web.address %>"
onchange="cleanAddress();" /> onchange="cleanAddress();" />
<small><em>(Letters and digits only)</em></small> <small><em>(Letters and digits only)</em></small>
</div> </div>
<h2 style="margin-bottom: 3px">Specialize</h2> <h2 style="margin-bottom: 3px">Specialize</h2>
<div class="inputBox"> <div class="inputBox">
Markup: <label for="markup">Markup:</label>
<select name="markup"> <select id="markup" name="markup">
<%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Markdown+itex2MML' => :markdownMML, 'Mixed' => :mixed, <%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Markdown+itex2MML' => :markdownMML, 'Mixed' => :mixed,
'RDoc' => :rdoc }, @web.markup) %> 'RDoc' => :rdoc }, @web.markup) %>
</select> </select>
&nbsp;&nbsp; &#xa0;&#xa0;
Color: <label for="color">Color:</label>
<select name="color"> <select id="color" name="color">
<%= html_options({ 'Green' => '008B26', 'Purple' => '504685', 'Red' => 'DA0006', <%= html_options({ 'Green' => '008B26', 'Purple' => '504685', 'Red' => 'DA0006',
'Orange' => 'FA6F00', 'Grey' => '8BA2B0' }, @web.color) %> 'Orange' => 'FA6F00', 'Grey' => '8BA2B0' }, @web.color) %>
</select> </select>
<br/> <br/>
<p> <p>
<small> <input type="checkbox" class="disableAutoComplete" id="safe_mode" name="safe_mode" <%= 'checked="checked"' if @web.safe_mode? %> />
<input type="checkbox" class="disableAutoComplete" name="safe_mode" <%= 'checked="on"' if @web.safe_mode? %> /> <label for="safe_mode">Safe mode
Safe mode <em>- strip HTML tags and stylesheet options from the content of all pages</em></label>
<em>- strip HTML tags and stylesheet options from the content of all pages</em>
<br/> <br/>
<input type="checkbox" class="disableAutoComplete" name="brackets_only" <%= 'checked="on"' if @web.brackets_only? %> /> <input type="checkbox" class="disableAutoComplete" id="brackets_only" name="brackets_only" <%= 'checked="checked"' if @web.brackets_only? %> />
Brackets only <label for="brackets_only">Brackets only
<em>- require all wiki words to be as [[wiki word]], WikiWord links won't be created</em> <em>- require all wiki words to be as [[wiki word]], WikiWord links won't be created</em></label>
<br/> <br/>
<input type="checkbox" class="disableAutoComplete" name="count_pages" <%= 'checked="on"' if @web.count_pages? %> /> <input type="checkbox" class="disableAutoComplete" id="count_pages" name="count_pages" <%= 'checked="checked"' if @web.count_pages? %> />
Count pages <label for="count_pages">Count pages</label>
<br/> <br/>
<input type="checkbox" class="disableAutoComplete" name="allow_uploads" <%= 'checked="on"' if @web.allow_uploads? %> /> <input type="checkbox" class="disableAutoComplete" name="allow_uploads" <%= 'checked="checked"' if @web.allow_uploads? %> />
Allow uploads of no more than Allow uploads of no more than
<input type="text" class="disableAutoComplete" name="max_upload_size" value="<%= @web.max_upload_size %>" <input type="text" class="disableAutoComplete" name="max_upload_size" value="<%= @web.max_upload_size %>"
width="20" /> size="20" />
kbytes kbytes
<em>- <em>-
allow users to upload pictures and other files and include them on wiki pages allow users to upload pictures and other files and include them on wiki pages
</em> </em>
<br/> <br/>
</small>
</p> </p>
<a href="#" <a href="#"
onclick="document.getElementById('additionalStyle').style.display='block';return false;"> onclick="document.getElementById('additionalStyle').style.display='block';return false;">
Stylesheet tweaks &gt;&gt;</a> Stylesheet tweaks &gt;&gt;</a>
<small><em> <em>
- add or change styles used by this web; styles defined here take precedence over - add or change styles used by this web; styles defined here take precedence over
instiki.css. Hint: View HTML source of a page you want to style to find ID names on individual instiki.css. Hint: View HTML source of a page you want to style to find ID names on individual
tags.</em></small> tags.</em>
<br/> <br/>
<textarea id="additionalStyle" class="disableAutoComplete" <textarea id="additionalStyle" class="disableAutoComplete" cols="50" rows="20"
style="display: none; margin-top: 10px; margin-bottom: 5px; width: 560px; height: 200px" style="display: none; margin-top: 10px; margin-bottom: 5px;"
name="additional_style"><%= @web.additional_style %> name="additional_style"><%= @web.additional_style %>
</textarea> </textarea>
</div> </div>
@ -83,10 +81,10 @@
Setting the password to nothing will remove the password protection. Setting the password to nothing will remove the password protection.
</div> </div>
<div class="inputBox"> <div class="inputBox">
Password: <input class="disableAutoComplete" type="password" id="password" <label for="password">Password:</label> <input class="disableAutoComplete" type="password" id="password"
name="password" value="<%= @web.password %>" /> name="password" value="<%= @web.password %>" />
&nbsp;&nbsp; &#xa0;&#xa0;
Verify: <input class="disableAutoComplete" type="password" id="password_check" <label for="password_check">Verify:</label> <input class="disableAutoComplete" type="password" id="password_check"
value="<%= @web.password %>" name="password_check" /> value="<%= @web.password %>" name="password_check" />
</div> </div>
@ -97,20 +95,18 @@
The published version is accessible through URLs like /wiki/published/HomePage. The published version is accessible through URLs like /wiki/published/HomePage.
</div> </div>
<div class="inputBox"> <div class="inputBox">
<input type="checkbox" name="published" class="disableAutoComplete" <%= 'checked="on"' if @web.published? %> /> <input type="checkbox" id="published" name="published" class="disableAutoComplete" <%= 'checked="checked"' if @web.published? %> />
Publish this web <label for="published">Publish this web</label>
</div> </div>
<p align="right"> <p style="text-align:right;font-size:.85em;">
<small> <label for="system_password">Enter system password</label>
Enter system password
<input type="password" class="disableAutoComplete" id="system_password" <input type="password" class="disableAutoComplete" id="system_password"
name="system_password" /> name="system_password" />
and and
<input type="submit" value="Update Web" /> <input type="submit" value="Update Web" />
<br/><br/> <br/><br/>
...or forget changes and <%= link_to 'create a new web', :action => 'create_web' %> ...or forget changes and <%= link_to 'create a new web', :action => 'create_web' %>
</small>
</p> </p>
<%= end_form_tag %> <%= end_form_tag %>
@ -123,13 +119,11 @@
:onsubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned').value)", :onsubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned').value)",
'accept-charset' => 'utf-8' }) 'accept-charset' => 'utf-8' })
%> %>
<p align="right"> <p style="text-align:right;font-size:.85em;">
<small>
Clean up by entering system password Clean up by entering system password
<input type="password" id="system_password_orphaned" class="disableAutoComplete" name="system_password_orphaned" /> <input type="password" id="system_password_orphaned" class="disableAutoComplete" name="system_password_orphaned" />
and and
<input type="submit" value="Delete Orphan Pages" /> <input type="submit" value="Delete Orphan Pages" />
</small>
</p> </p>
<%= end_form_tag %> <%= end_form_tag %>

22
app/views/markdownMML_help.rhtml
View file

@ -1,15 +1,15 @@
<h3>Markdown+itex2MML formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">basics</a>, <a target="_new" href="http://maruku.rubyforge.org/#extra">extended syntax</a>, <a target="_new" href="http://maruku.rubyforge.org/proposal.html">metadata</a>)</h3> <h3>Markdown+itex2MML formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">basics</a>, <a target="_new" href="http://maruku.rubyforge.org/#extra">extended syntax</a>, <a target="_new" href="http://maruku.rubyforge.org/proposal.html">metadata</a>)</h3>
<p>For a complete list of LaTeX commands supported here, see the <a href="http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html">itex2MML Commands Summary</a>.</p> <p>For a complete list of LaTeX commands supported here, see the <a href="http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html">itex2MML Commands Summary</a>.</p>
<table cellspacing="0" cellpadding="0"> <table cellspacing="0" cellpadding="0">
<tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr> <tr><td>_your text_</td><td class="arrow">&#x2192;</td><td><em>your text</em></td></tr>
<tr><td>**your text**</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr> <tr><td>**your text**</td><td class="arrow">&#x2192;</td><td><strong>your text</strong></td></tr>
<tr><td>`my code`</td><td class="arrow">&rarr;</td><td><code>my code</code></td></tr> <tr><td>`my code`</td><td class="arrow">&#x2192;</td><td><code>my code</code></td></tr>
<tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr> <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&#x2192;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
<tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr> <tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&#x2192;</td><td>1. Numbered list<br />2. Second item</td></tr>
<tr><td>Definition list<br />: is useful</td><td class="arrow">&rarr;</td><td><dl style="display:inline"><dt>Definition list</dt><dd>is useful</dd></dl></td></tr> <tr><td>Definition list<br />: is useful</td><td class="arrow">&#x2192;</td><td><dl style="display:inline"><dt>Definition list</dt><dd>is useful</dd></dl></td></tr>
<tr><td>[link name](URL)</td><td class="arrow">&rarr;</td><td><a href="URL">link name</a></td></tr> <tr><td>[link name](URL)</td><td class="arrow">&#x2192;</td><td><a href="URL">link name</a></td></tr>
<tr><td>![Alt text](URL)</td><td class="arrow">&rarr;</td><td>Image</td></tr> <tr><td>![Alt text](URL)</td><td class="arrow">&#x2192;</td><td>Image</td></tr>
<tr><td>## Header ##<br />### Subheader ###<br />#### Etc. ####</td><td class="arrow">&rarr;</td><td><b><span style="font-size:1.2em">Header</span><br /><span style="font-size:1.1em">Subheader</span><br /><span style="font-size:1em">Etc.</span></b></td></tr> <tr><td>## Header ##<br />### Subheader ###<br />#### Etc. ####</td><td class="arrow">&#x2192;</td><td><b><span style="font-size:1.2em">Header</span><br /><span style="font-size:1.1em">Subheader</span><br /><span style="font-size:1em">Etc.</span></b></td></tr>
<tr><td>***</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr> <tr><td>***</td><td class="arrow">&#x2192;</td><td>Horizontal ruler</td></tr>
<tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr> <tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&#x2192;</td><td>Auto-linked</td></tr>
</table> </table>

22
app/views/markdown_help.rhtml
View file

@ -1,14 +1,14 @@
<h3>Markdown formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">basics</a>, <a target="_new" href="http://maruku.rubyforge.org/#extra">extended syntax</a>, <a target="_new" href="http://maruku.rubyforge.org/proposal.html">metadata</a>)</h3> <h3>Markdown formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">basics</a>, <a target="_new" href="http://maruku.rubyforge.org/#extra">extended syntax</a>, <a target="_new" href="http://maruku.rubyforge.org/proposal.html">metadata</a>)</h3>
<table cellspacing="0" cellpadding="0"> <table cellspacing="0" cellpadding="0">
<tr><td>_your text_</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr> <tr><td>_your text_</td><td class="arrow">&#x2192;</td><td><em>your text</em></td></tr>
<tr><td>**your text**</td><td class="arrow">&rarr;</td><td><strong>your text</strong></td></tr> <tr><td>**your text**</td><td class="arrow">&#x2192;</td><td><strong>your text</strong></td></tr>
<tr><td>`my code`</td><td class="arrow">&rarr;</td><td><code>my code</code></td></tr> <tr><td>`my code`</td><td class="arrow">&#x2192;</td><td><code>my code</code></td></tr>
<tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&rarr;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr> <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&#x2192;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
<tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr> <tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&#x2192;</td><td>1. Numbered list<br />2. Second item</td></tr>
<tr><td>Definition list<br />: is useful</td><td class="arrow">&rarr;</td><td><dl style="display:inline"><dt>Definition list</dt><dd>is useful</dd></dl></td></tr> <tr><td>Definition list<br />: is useful</td><td class="arrow">&#x2192;</td><td><dl style="display:inline"><dt>Definition list</dt><dd>is useful</dd></dl></td></tr>
<tr><td>[link name](URL)</td><td class="arrow">&rarr;</td><td><a href="URL">link name</a></td></tr> <tr><td>[link name](URL)</td><td class="arrow">&#x2192;</td><td><a href="URL">link name</a></td></tr>
<tr><td>![Alt text](URL)</td><td class="arrow">&rarr;</td><td>Image</td></tr> <tr><td>![Alt text](URL)</td><td class="arrow">&#x2192;</td><td>Image</td></tr>
<tr><td>## Header ##<br />### Subheader ###<br />#### Etc. ####</td><td class="arrow">&rarr;</td><td><b><span style="font-size:1.2em">Header</span><br /><span style="font-size:1.1em">Subheader</span><br /><span style="font-size:1em">Etc.</span></b></td></tr> <tr><td>## Header ##<br />### Subheader ###<br />#### Etc. ####</td><td class="arrow">&#x2192;</td><td><b><span style="font-size:1.2em">Header</span><br /><span style="font-size:1.1em">Subheader</span><br /><span style="font-size:1em">Etc.</span></b></td></tr>
<tr><td>***</td><td class="arrow">&rarr;</td><td>Horizontal ruler</td></tr> <tr><td>***</td><td class="arrow">&#x2192;</td><td>Horizontal ruler</td></tr>
<tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr> <tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&#x2192;</td><td>Auto-linked</td></tr>
</table> </table>

2
app/views/wiki/search.rhtml
View file

@ -28,7 +28,7 @@
<p> <p>
Perhaps you should try expanding your query. Remember that Instiki searches for entire Perhaps you should try expanding your query. Remember that Instiki searches for entire
phrases, so if you search for "all that jazz" it will not match pages that contain these phrases, so if you search for "all that jazz" it will not match pages that contain these
words in separation&mdash;only as a sentence fragment. words in separation &#x2014; only as a sentence fragment.
</p> </p>
<p> <p>
If you're a high-tech computer wizard, you might even want try constructing a Ruby regular If you're a high-tech computer wizard, you might even want try constructing a Ruby regular

2
public/stylesheets/instiki.css
View file

@ -126,7 +126,7 @@ text-decoration:none;
div.help { div.help {
font-family:verdana, arial, helvetica, sans-serif; font-family:verdana, arial, helvetica, sans-serif;
font-size:70%; font-size:75%;
} }
div.inputBox { div.inputBox {

4
vendor/plugins/maruku/lib/maruku/version.rb vendored
View file

@ -19,7 +19,7 @@
#++ #++
module MaRuKu module MaRuKu
Version = '0.5.3' Version = '0.5.4'
MarukuURL = 'http://maruku.rubyforge.org/' MarukuURL = 'http://maruku.rubyforge.org/'
@ -27,6 +27,8 @@ module MaRuKu
# #
# Note: it is not guaranteed that if it's false # Note: it is not guaranteed that if it's false
# then no special features will be used. # then no special features will be used.
#
# So please, ignore it for now.
def markdown_extra? def markdown_extra?
true true
end end