Pimki 1.3.092 → 1.4.092

data/app/views/style.rhtml

@@ -1,179 +1,179 @@
-<style type="text/css">
-h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 { color: #<%= @web ? @web.color : "393" %>; }
-
-#Container, #Content {
-	width: <%= @content_width || "600" %>px;
-}
-	
-#Container {
-	float: none;
-	margin: 0 auto;
-	text-align: center;
-}
-
-#Content {
-	margin: 0;
-	padding: 5px;
-	text-align: left;
-	border-top: none;
-	float: left;
-}
-
-body { background-color: #fff; }
-
-body, p, ol, ul, td {
-	font-family: verdana, arial, helvetica, sans-serif;
-	color: #333;
-	font-size:   13px;
-	line-height: 18px;
-}
-
-a { color: #000; }
-
-.newWikiWord { background-color: #eee; }
-.newWikiWord a:hover { background-color: white; }
-
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-h1, h2, h3 { color: #333; font-family: georgia, verdana; }
-h1 { font-size: 28px }
-h2 { font-size: 19px }
-h3 { font-size: 16px }
-
-h1#pageName {
-	margin: 5px 0px 0px 0px;
-	padding: 0px 0px 0px 0px;
-	line-height: 28px;
-}
-
-h1#pageName small {
-  color: grey;
-	line-height: 10px;
-  font-size: 10px;
-  padding: 0px;
-}
-
-a.nav, a.nav:link, a.nav:visited { color: #000; }
-a.nav:hover { color: #fff; background-color:#000; }
-
-li { margin-bottom: 7px }
-
-.navigation {
-  margin-top: 5px;
-	font-size : 12px;
-  color: #000;
-}
-
-.navigation a:hover { color: #fff; background-color:#000; }
-
-.navigation a {
-	font-size: 11px;
-	color: black;
-	font-weight: bold;
-}
-
-.navigation small a {
-  font-weight: normal;
-  font-size: 11px;
-}
-  
-.navOn{
-	font-size: 11px;
-	color: grey;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.help {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 11px;
-}
-
-.inputBox {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 11px;
-  background-color: #eee;
-  padding: 5px;
-  margin-bottom: 20px;
-}
-
-blockquote {
-	display: block;
-	margin: 0px 0px 20px 0px;
-	padding: 0px 30px;
-	font-size:11px;
-	line-height:17px;
-  font-style: italic;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-ol.setup {
-  font-size: 19px;
-  font-family: georgia, verdana;
-  padding-left: 25px;
-}
-
-ol.setup li {
-  margin-bottom: 20px
-}
-
-.byline {
-  font-size: 10px;
-  font-style: italic;  
-  margin-bottom: 10px;
-}
-
-.references {
-  font-size: 10px;
-}
-
-#TextileHelp table {
-	margin-bottom: 0;
-}
-
-#TextileHelp table+h3 {
-	margin-top: 11px;
-}
-
-#TextileHelp table td {
-	font-size: 11px;
-	padding: 3px;
-	vertical-align: top;
-	border-top: 1px dotted #ccc;
-}
-
-#TextileHelp table td.arrow {
-	padding-right: 5px;
-	padding-left: 10px;
-	color: #999;
-}
-
-#TextileHelp table td.label {
-	font-weight: bold;
-	white-space: nowrap;
-	font-size: 10px;
-	padding-right: 15px;
-	color: #000;
-}
-
-#TextileHelp h3 {
-	font-size: 11px;
-	font-weight: bold;
-	font-weight: normal;
-	margin: 0 0 5px 0;
-	padding: 5px 0 0 0;
-}
-
-#TextileHelp p {
-	font-size: 10px;
-}
-
-<%= @style_additions %>
-<%= @web ? web.additional_style : "" %>
+<style type="text/css">
+h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 { color: #<%= @web ? @web.color : "393" %>; }
+
+#Container, #Content {
+	width: <%= @content_width || "600" %>px;
+}
+	
+#Container {
+	float: none;
+	margin: 0 auto;
+	text-align: center;
+}
+
+#Content {
+	margin: 0;
+	padding: 5px;
+	text-align: left;
+	border-top: none;
+	float: left;
+}
+
+body { background-color: #fff; }
+
+body, p, ol, ul, td {
+	font-family: verdana, arial, helvetica, sans-serif;
+	color: #333;
+	font-size:   13px;
+	line-height: 18px;
+}
+
+a { color: #000; }
+
+.newWikiWord { background-color: #eee; }
+.newWikiWord a:hover { background-color: white; }
+
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+h1, h2, h3 { color: #333; font-family: georgia, verdana; }
+h1 { font-size: 28px }
+h2 { font-size: 19px }
+h3 { font-size: 16px }
+
+h1#pageName {
+	margin: 5px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+	line-height: 28px;
+}
+
+h1#pageName small {
+  color: grey;
+	line-height: 10px;
+  font-size: 10px;
+  padding: 0px;
+}
+
+a.nav, a.nav:link, a.nav:visited { color: #000; }
+a.nav:hover { color: #fff; background-color:#000; }
+
+li { margin-bottom: 7px }
+
+.navigation {
+  margin-top: 5px;
+	font-size : 12px;
+  color: #000;
+}
+
+.navigation a:hover { color: #fff; background-color:#000; }
+
+.navigation a {
+	font-size: 11px;
+	color: black;
+	font-weight: bold;
+}
+
+.navigation small a {
+  font-weight: normal;
+  font-size: 11px;
+}
+  
+.navOn{
+	font-size: 11px;
+	color: grey;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.help {
+	font-family: verdana, arial, helvetica, sans-serif;
+	font-size: 11px;
+}
+
+.inputBox {
+	font-family: verdana, arial, helvetica, sans-serif;
+	font-size: 11px;
+  background-color: #eee;
+  padding: 5px;
+  margin-bottom: 20px;
+}
+
+blockquote {
+	display: block;
+	margin: 0px 0px 20px 0px;
+	padding: 0px 30px;
+	font-size:11px;
+	line-height:17px;
+  font-style: italic;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+ol.setup {
+  font-size: 19px;
+  font-family: georgia, verdana;
+  padding-left: 25px;
+}
+
+ol.setup li {
+  margin-bottom: 20px
+}
+
+.byline {
+  font-size: 10px;
+  font-style: italic;  
+  margin-bottom: 10px;
+}
+
+.references {
+  font-size: 10px;
+}
+
+#TextileHelp table {
+	margin-bottom: 0;
+}
+
+#TextileHelp table+h3 {
+	margin-top: 11px;
+}
+
+#TextileHelp table td {
+	font-size: 11px;
+	padding: 3px;
+	vertical-align: top;
+	border-top: 1px dotted #ccc;
+}
+
+#TextileHelp table td.arrow {
+	padding-right: 5px;
+	padding-left: 10px;
+	color: #999;
+}
+
+#TextileHelp table td.label {
+	font-weight: bold;
+	white-space: nowrap;
+	font-size: 10px;
+	padding-right: 15px;
+	color: #000;
+}
+
+#TextileHelp h3 {
+	font-size: 11px;
+	font-weight: bold;
+	font-weight: normal;
+	margin: 0 0 5px 0;
+	padding: 5px 0 0 0;
+}
+
+#TextileHelp p {
+	font-size: 10px;
+}
+
+<%= @style_additions %>
+<%= @web ? web.additional_style : "" %>
 </style>

data/app/views/textile_help.rhtml

@@ -1,28 +1,28 @@
-<div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
-		<h3>Textile formatting tips (<a href="#" onClick="quickRedReference(); return false;">advanced</a>)</h3>
-		<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">&rarr;</td><td><strong>your text</strong></td></tr>
-			<tr><td>%{color:red}hello%</td><td class="arrow">&rarr;</td><td><span style="color: red;">hello</span></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># Numbered list<br /># Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
-			<tr><td>"linkname":URL</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
-			<tr><td>|a|table|row|<br />|b|table|row|</td><td class="arrow">&rarr;</td><td>Table</td></tr>
-			<tr><td>http://url<br />email@address.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
-			<tr><td>!imageURL!</td><td class="arrow">&rarr;</td><td>Image</td></tr>
-    </table>
-    
-    <%= sub_template "wiki_words_help" %>
-</div>
-
-<script language="JavaScript">
-  function quickRedReference() {
-    window.open( 
-      "http://hobix.com/textile/quick.html",
-      "redRef",
-      "height=600,width=550,channelmode=0,dependent=0," +
-      "directories=0,fullscreen=0,location=0,menubar=0," +
-      "resizable=0,scrollbars=1,status=1,toolbar=0" 
-    );
-  }
+<div id="TextileHelp" style="float: right; width: 250px; margin-top: 5px">
+		<h3>Textile formatting tips (<a href="#" onClick="quickRedReference(); return false;">advanced</a>)</h3>
+		<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">&rarr;</td><td><strong>your text</strong></td></tr>
+			<tr><td>%{color:red}hello%</td><td class="arrow">&rarr;</td><td><span style="color: red;">hello</span></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># Numbered list<br /># Second item</td><td class="arrow">&rarr;</td><td>1. Numbered list<br />2. Second item</td></tr>
+			<tr><td>"linkname":URL</td><td class="arrow">&rarr;</td><td><a href="URL">linkname</a></td></tr>
+			<tr><td>|a|table|row|<br />|b|table|row|</td><td class="arrow">&rarr;</td><td>Table</td></tr>
+			<tr><td>http://url<br />email@address.com</td><td class="arrow">&rarr;</td><td>Auto-linked</td></tr>
+			<tr><td>!imageURL!</td><td class="arrow">&rarr;</td><td>Image</td></tr>
+    </table>
+    
+    <%= sub_template "wiki_words_help" %>
+</div>
+
+<script language="JavaScript">
+  function quickRedReference() {
+    window.open( 
+      "http://hobix.com/textile/quick.html",
+      "redRef",
+      "height=600,width=550,channelmode=0,dependent=0," +
+      "directories=0,fullscreen=0,location=0,menubar=0," +
+      "resizable=0,scrollbars=1,status=1,toolbar=0" 
+    );
+  }
 </script>

data/app/views/top.rhtml

@@ -31,9 +31,14 @@
     <%= @web ? web.additional_style : "" %>
   </style>
 </head>
-<body>
 
-<%= sub_template "menu" unless @hide_navigation%>
+<% if @web && @page && @web.enable_dclick_edit %>
+  <body ondblclick="location.href='../edit/<%= @page.name %>'">
+<% else %>
+  <body>
+<% end %>
+
+<%= sub_template "menu" unless @hide_navigation %>
 
 <div id="Container">
   <div id="Content">

data/app/views/wiki/authors.rhtml

@@ -1,15 +1,15 @@
-<% @title = "Authors" %><%= sub_template "top" %>
-
-<p>You can also see a graph of authors->pages in the <a href="../mind/?type=neato&authors_graph=on&Go=Redraw">Mind Map<a> section.<p>
-
-<ul id="authorList">
-  <% for author in @authors %>
-    <li>
-      <%= @web.make_link(author) %>
-      co- or authored:
-      <%= @web.select.pages_authored_by(author).collect { |page| page.link }.join ", " %>
-    </li>
-  <% end %>
-</ul>
-
-<%= sub_template "bottom" %>
+<% @title = "Authors" %><%= sub_template "top" %>
+
+<p>You can also see a graph of authors->pages in the <a href="../mind/?type=neato&authors_graph=on&Go=Redraw">Mind Map<a> section.<p>
+
+<ul id="authorList">
+  <% for author in @authors %>
+    <li>
+      <%= @web.make_link(author) %>
+      co- or authored:
+      <%= @web.select.pages_authored_by(author).collect { |page| page.link }.join ", " %>
+    </li>
+  <% end %>
+</ul>
+
+<%= sub_template "bottom" %>