Wiki2Go 1.17.5 → 1.22.0

data/lib/Wiki2Go/Install/site/error.html

@@ -13,7 +13,7 @@
             <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
                 <TR>
                     <TD>
-                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
+                        <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
                             <TR>
                                 <TD><h1>Error</h1>
                                 </TD>

data/lib/Wiki2Go/Install/site/robots.txt

@@ -5,9 +5,18 @@ Disallow: /scripts/delete/
 Disallow: /scripts/edit.pl/
 Disallow: /scripts/edit.rb/
 Disallow: /scripts/edit/
+Disallow: /scripts/wikiedit.pl/
+Disallow: /scripts/wikiedit.rb/
+Disallow: /scripts/wikiedit/
 Disallow: /scripts/search.pl/
 Disallow: /scripts/search.rb/
 Disallow: /scripts/search/
 Disallow: /scripts/changes.pl/
 Disallow: /scripts/changes.rb/
-Disallow: /scripts/changes/
+Disallow: /scripts/changes/
+Disallow: /scripts/diff.pl/
+Disallow: /scripts/diff.rb/
+Disallow: /scripts/diff/
+Disallow: /scripts/sidebyside.pl/
+Disallow: /scripts/sidebyside.rb/
+Disallow: /scripts/sidebyside/

data/lib/Wiki2Go/Install/site/style.css

@@ -10,76 +10,77 @@ body
     text-align: justify;
 }
 
-ul 
-{
-    margin-left:0.5em; 
-    padding-top : 0.5em ;
-    padding-left : 0em ;
-    padding-right : 0em ;
-    padding-bottom : 0.5em ;
-    margin-right:1em
+/* Main structure */
+#container {
+    margin: 0;
+    margin-left: 2em;
+    margin-right: 2em;
+    background: #fff;
+    border-left: 1px solid #ccc;
+    border-right: 1px solid #ccc; 
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc; 
 }
 
-li 
+#menu
 {
-    margin-left:0.5em; 
-    margin-right:1em ;
-    padding : 0em 0em 0em 0em ;
+	border-right: black thin solid;
+	background-color: #F8F7F0;
+	padding-right : 0.5em ;
+
 }
 
-h1
+#body
 {
-    font-weight: bold;
-    font-size: 28pt;
-    color: black;
-    margin : 0em ;
+	padding-left : 0.5em ;
+	padding-right : 0.5em ;
+	width: 100%;
+	background-color: #FFFFFF;
 }
 
-h2,h3,h4,h5,h6 
+#header
 {
-    color:black 
+	padding-right: 1em;
+	padding-left: 1em;
+	padding-bottom: 0.5em;
+	margin: 0px;
+	padding-top: 0px;
+	background-color: #B82619;
+	border-bottom: grey thin solid;
+	color : White ;
 }
 
-h2,h3.frontpage {
-    text-align: center ;
-} 
-
-table.Header
+#header a:link
 {
-    padding-right: 0.1em;
-    padding-left: 0.5em;
-    padding-bottom: 0.1em;
-    padding-top: 0em;
-    color: black;
-    background-color: white;
-    text-align: left;
-    border-bottom: 1px solid #ccc;
+    color: White;
+    font-weight: bolder ;
+    text-decoration: none;
 }
 
-table.Footer 
-{
- 
-    clear: both;
-    margin: 100px 0 0 0;
-    padding: 6px;
-    color: #000;
-    background: #fff;
-    border-top: 1px solid #ccc;
+#header a:visited {
+    color: White;
+    text-decoration: none;
+    font-weight: normal ;
 }
 
-hr {
-    color: #ccc;
+#header a:hover
+{
+	color: cornsilk;
 }
 
-table.Body
+#header h1
 {
-    text-align: left;
+	color : White ;
 }
 
-td[class=search] {
-    text-align: right;
+#footer
+{
+	border-top: grey thin solid;
+	background-color : silver;
 }
 
+/* Links */
+
 a:link
 {
     color: #a50a11;
@@ -97,24 +98,70 @@ a:hover {
     text-decoration: underline;
 }
 
-#container {
-    width: 800px;
-    margin: 0;
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 40px;
-    margin-top: 5px;
-    padding-left: 15px;
-    padding-right: 15px;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    background: #fff;
-    border-left: 1px solid #ccc;
-    border-right: 1px solid #ccc; 
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc; 
+/* Headers */
+
+h1
+{
+    font-weight: bold;
+    font-size: 28pt;
+    color: black;
+    margin : 0em ;
+}
+
+h2,h3,h4,h5,h6 
+{
+    color:black 
+}
+
+h2,h3.frontpage {
+    text-align: center ;
+} 
+
+/* Style for tables drawn with --- and | in wiki markup */
+
+table.wikitable
+{
+	border-collapse: collapse;
+}
+
+table.wikitable tr
+{
+	padding-right: 0.4em;
+	padding-left: 0.4em;
+	padding-bottom: 0.4em;
+	margin: 0em;
+	padding-top: 0.4em;
 }
-    
+
+table.wikitable td
+{
+	border-right: 1px solid;
+	padding-right: 0.5em;
+	border-top: 1px solid;
+	padding-left: 0.5em;
+	padding-bottom: 0.5em;
+	border-left: 1px solid;
+	padding-top: 0.5em;
+	border-bottom: 1px solid;
+}
+
+/* Menu items */
+
+#menu ul
+{
+	margin-left : 0 ;
+	padding-left : 0.5em ;
+}
+
+#menu li
+{
+	list-style-type: none;
+	margin-left : 0 ;
+	padding-left : 0 ;
+}
+
+/* Style for lists of pages or versions (recent changes, search, versions */
+
 table.topiclist
 {
     width: 100%;
@@ -133,3 +180,21 @@ table.topiclist tr.odd
 table.topiclist tr.even
 {
 }
+
+/* Style for the display of differences */
+div.diff_kept
+{
+	display : block ;
+}
+
+div.diff_added
+{
+	background-color: #ffffcc;
+	display : block ;
+}
+
+div.diff_deleted
+{
+	background-color: #ffcc33;
+	display : block ;
+}

data/lib/Wiki2Go/Install/templates/admin.htm

@@ -32,6 +32,7 @@
                               <div class="menuheading"><%= formatter.admin_link("","Home")%></div>
                               <ul>
                                 <li><%= formatter.admin_link("regenerate","Regenerate&nbsp;HTML")%></li>
+                                <li><%= formatter.admin_link("format_for_fck","Prepare&nbsp;for&nbsp;FCKeditor")%></li>
                                 <li><%= formatter.admin_link("editfiles","Edit&nbsp;Files")%></li>
                                 <li><%= formatter.admin_link("passwords","Passwords")%></li>
                               </ul>
@@ -44,7 +45,6 @@
                               <ul>
                                 <li><%= formatter.admin_link("update_site","Update&nbsp;Site")%></li>
                                 <li><%= formatter.admin_link("commit_site","Commit&nbsp;Site")%></li>
-                                <li><%= formatter.admin_link("update_conflicts","Update&nbsp;Conflicts")%></li>
                               </ul>
                               <div class="menuheading">Logs</div>
                               <ul>

data/lib/Wiki2Go/Install/templates/admin_pages/edit.txt

@@ -1,5 +1,6 @@
 <%
    require 'Wiki2Go/WikiFormatter'
+   require 'cgi'
 
    def show_directory(dirname,label)
      "<a href=\"#{ @formatter.make_verb_url('admin','editfiles')}?dir=#{CGI::escape(dirname)}\">&gt;#{label}</a>"
@@ -37,7 +38,7 @@
 <%= show_directory(File.dirname(file),"Back to #{File.dirname(file)}") %> 
 <form action="<%= @formatter.make_verb_url('admin','edit')%>" method="post">
   <input type="hidden" name="file" value="<%= file %>">
-  <textarea name="text" rows="35" cols="96"><%= content %></textarea><br>
+  <textarea name="text" rows="35" cols="96"><%= CGI::escapeHTML(content) %></textarea><br>
   <button type="submit" name="update" value="update">
     Save file
   </button>&nbsp;<input type="reset" value=" Undo changes ">

data/lib/Wiki2Go/Install/templates/admin_pages/format_for_fck.txt

@@ -0,0 +1,31 @@
+<%
+  require 'Wiki2Go/Wiki2Go'
+  require 'Wiki2Go/WikiFormatter'
+   
+  formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
+
+  output = ''
+  subwiki = @request.params['wiki']
+  if !subwiki.nil? && subwiki.size > 0 then
+    subwiki = subwiki[0]
+    wiki = Wiki2Go::Wiki.new(@config)
+    pageweb = @web.clone
+    pageweb.name = subwiki
+    output = wiki.prepare_for_fckeditor(pageweb)
+  end
+
+  storage = @config.storage
+  if @config.multi_wiki then
+    subwikis = storage.wikis
+  else
+    subwikis = [ '' ]
+  end
+%>
+<ul>
+<% subwikis.each do |subwiki| %>
+<li><a href="<%= formatter.make_verb_url('admin','format_for_fck') %>?wiki=<%= subwiki %>">Generate FCKEditor HTML for '<%= (subwiki.empty? ? 'the whole site' : subwiki) %>'</a>
+<% end %>
+</ul>
+<hr>
+<%= output %>
+

data/lib/Wiki2Go/Install/templates/admin_pages/passwords.txt

@@ -64,7 +64,7 @@ end
 <form action="<%= formatter.make_verb_url('admin','passwords')%>" method="GET">
 <table>
 <tr><td>Name</td><td><input name="user" value="<%= user %>"></td></tr>
-<tr><td>Password</td><td><input name="password" value="<%= user_pwd %>"></td></tr>
+<tr><td>Password</td><td><input type="password" name="password" value="<%= user_pwd %>"></td></tr>
 <tr><td colspan=2><input type="submit" name="add" value="Add"></td></tr>
 </table>
 </form>

data/lib/Wiki2Go/Install/templates/edit.htm

@@ -4,52 +4,68 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
     <HEAD>
-<!-- include=header.htm -->
-                <TITLE>Edit
-                    <%= current.web.name %>
-                    -
-                    <%= current.web.current_page %>
-                </TITLE>
+        <!-- include=header.htm -->
+        <META name="robots" content="noindex,nofollow">
+        <TITLE>Edit
+            <%= current.web.name %>
+            -
+            <%= current.web.current_page %>
+        </TITLE>
+        <script type="text/javascript" src="/fckeditor/fckeditor.js"></script>
+        <script type="text/javascript">
+      window.onload = function()
+      {
+        var oFCKeditor = new FCKeditor( 'text','100%','400' ) ;
+        oFCKeditor.ReplaceTextarea() ;
+      }
+        </script>
     </HEAD>
     <BODY>
-        <div id="container">
-            <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
-                <TR>
-                    <TD>
-                        <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
-                            <TR>
-                                <TD><H1>Edit
-                                        <%= current.format.search_link(current.web.current_page) %>
-                                    </H1>
-                                </TD>
-                                <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home") %></td>
-                            </TR>
-                        </TABLE>
-                        <table border="0" cellpadding="0" cellspacing="0" width="100%" class="Body">
-                            <tr>
-                                <td width="100%">
-                                    <form action="<%= current.format.save_url %>" method="POST" id="form2" name="form2">
-                                        <p align="left">Edit the page in the text area.
-                                            <br>
-                                            To quit without changing the page,
-                                            <%= current.format.view_link(current.web.name,current.web.current_page,'click here to return to '+ current.web.current_page) %>
-                                        </p>
-<% if current.web.secure then %>
-                                        <p align="left">Page name: <input type="text" name="title" value="<%= CGI::escapeHTML(current.page.name) %>" size="64"></p>
-<% else %>                                        
-                                        <p align="left">Author name: <input type="text" name="author" value="<%= CGI::escapeHTML(current.web.alias) %>" size="64"><input type="checkbox" name="remember_me" value="on" checked>Remember me</p>
-<% end %>                                        
-                                        <p align="left"><textarea name="text" rows="35" cols="96">$TEXT$</textarea><br>
-                                            <input type="submit" value=" Save " name="save"><input type="reset" value=" Undo changes "> </p>
-                                    </form>
-                                    <p align="left"><em>Don't forget to follow the <a href="http://wiki2go.nayima.be/Wiki2Go/TextFormattingRules.html" target="_blank">TextFormatting rules</a></em></p>
-                                </td>
-                            </tr>
-                        </table>
-<!-- include=simple_footer.htm -->
-                  </TD> 
-       </TR> 
-     </TABLE> 
-    </div> 
-  </BODY> 
+        <table id="container">
+            <tr>
+                <td colspan="2" id="header">
+                    <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
+                        <TR>
+                            <TD><H1>Edit
+                                    <%= current.format.search_link(current.web.current_page) %>
+                                </H1>
+                            </TD>
+                            <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home") %></td>
+                        </TR>
+                    </TABLE>
+                </td>
+            </tr>
+            <tr>
+                <td id="menu" valign="top" nowrap>
+                    <!-- include=menu.htm -->
+                </td>
+                <td id="body" width="100%" valign="top">
+                    <form action="<%= current.format.save_url %>" method="POST" id="form2" name="form2">
+                        <input type="hidden" name="iznorobot" value="<%= current.page.checksum(current.config.checksum_salt) %>" />
+                        <p align="left">Edit the page in the text area.
+                            <br>
+                            To quit without changing the page,
+                            <%= current.format.view_link(current.web.name,current.web.current_page,'click here to return to '+ current.web.current_page) %>
+                        </p>
+                        <% if current.web.secure then %>
+                        <p align="left">Page name: <input type="text" name="title" value="<%= CGI::escapeHTML(current.page.name) %>" size="64"></p>
+                        <% else %>
+                        <p align="left">Author name: <input type="text" name="author" value="<%= CGI::escapeHTML(current.web.alias) %>" size="64"><input type="checkbox" name="remember_me" value="on" checked>Remember 
+                            me</p>
+                        <% end %>
+                        <p align="left"><textarea name="text" rows="35" cols="96">$TEXT$</textarea><br>
+                            <input type="submit" value=" Save " name="save"> <input type="reset" value=" Undo ">
+                        </p>
+                    </form>
+                    <p align="left"><em>Don't forget to follow the <a href="http://wiki2go.nayima.be/Wiki2Go/TextFormattingRules.html" target="_blank">
+                                TextFormatting rules</a></em></p>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" id="footer">
+                    <!-- include=full_footer.htm -->
+                </td>
+            </tr>
+        </table>
+    </BODY>
 </HTML>