Wiki2Go 1.17.5 → 1.22.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (108) hide show
  1. data/bin/Wiki2Go_firewall_blacklist.rb +8 -0
  2. data/bin/Wiki2Go_make_cvs_repository.rb +1 -0
  3. data/bin/Wiki2Go_make_site.rb +1 -2
  4. data/bin/Wiki2Go_update_site.rb +1 -2
  5. data/lib/Web2Go/CGIRequest.rb +8 -2
  6. data/lib/Web2Go/CGIResponse.rb +17 -14
  7. data/lib/Web2Go/MockRequest.rb +12 -2
  8. data/lib/Web2Go/MockResponse.rb +10 -7
  9. data/lib/Web2Go/WebrickRequest.rb +106 -101
  10. data/lib/Web2Go/WebrickResponse.rb +4 -8
  11. data/lib/Wiki2Go/BlackList.rb +48 -25
  12. data/lib/Wiki2Go/DotGraphics.rb +1 -1
  13. data/lib/Wiki2Go/FileStorage.rb +266 -266
  14. data/lib/Wiki2Go/HTMLFormatter.rb +28 -0
  15. data/lib/Wiki2Go/Install/config/chonqed_blacklist.txt +418 -0
  16. data/lib/Wiki2Go/Install/config/passwords +1 -1
  17. data/lib/Wiki2Go/Install/config/url_blacklist.txt +3855 -0
  18. data/lib/Wiki2Go/Install/make_repository.rb +32 -26
  19. data/lib/Wiki2Go/Install/make_site.rb +197 -111
  20. data/lib/Wiki2Go/Install/site/error.html +1 -1
  21. data/lib/Wiki2Go/Install/site/robots.txt +10 -1
  22. data/lib/Wiki2Go/Install/site/style.css +129 -64
  23. data/lib/Wiki2Go/Install/templates/admin.htm +1 -1
  24. data/lib/Wiki2Go/Install/templates/admin_pages/edit.txt +2 -1
  25. data/lib/Wiki2Go/Install/templates/admin_pages/format_for_fck.txt +31 -0
  26. data/lib/Wiki2Go/Install/templates/admin_pages/passwords.txt +1 -1
  27. data/lib/Wiki2Go/Install/templates/edit.htm +62 -46
  28. data/lib/Wiki2Go/Install/templates/full_footer.htm +31 -33
  29. data/lib/Wiki2Go/Install/templates/header.htm +0 -1
  30. data/lib/Wiki2Go/Install/templates/menu.htm +29 -0
  31. data/lib/Wiki2Go/Install/templates/pagelist.htm +46 -43
  32. data/lib/Wiki2Go/Install/templates/simple_footer.htm +20 -16
  33. data/lib/Wiki2Go/Install/templates/versionlist.htm +52 -40
  34. data/lib/Wiki2Go/Install/templates/view.htm +46 -29
  35. data/lib/Wiki2Go/Install/templates/wikiedit.htm +63 -0
  36. data/lib/Wiki2Go/Install/wiki/delete.png +0 -0
  37. data/lib/Wiki2Go/Install/wiki/style.css +133 -63
  38. data/lib/Wiki2Go/LineFormatter.rb +345 -197
  39. data/lib/Wiki2Go/Page.rb +16 -3
  40. data/lib/Wiki2Go/PrivateWikiConfig.rb +5 -5
  41. data/lib/Wiki2Go/PublicWikiConfig.rb +83 -37
  42. data/lib/Wiki2Go/ReadWriteWikiConfig.rb +8 -8
  43. data/lib/Wiki2Go/Server.rb +6 -1
  44. data/lib/Wiki2Go/SpamFilter.rb +32 -41
  45. data/lib/Wiki2Go/Web.rb +10 -3
  46. data/lib/Wiki2Go/Wiki2Go.rb +301 -94
  47. data/lib/Wiki2Go/Wiki2GoConfig.rb +87 -6
  48. data/lib/Wiki2Go/Wiki2GoServlet.rb +66 -12
  49. data/lib/Wiki2Go/WikiFormatter.rb +60 -30
  50. data/lib/Wiki2Go/cgi/diff.rb +20 -0
  51. data/lib/Wiki2Go/cgi/secure/log_rss.rb +21 -0
  52. data/lib/Wiki2Go/cgi/sidebyside.rb +20 -0
  53. data/lib/Wiki2Go/cgi/wikiedit.rb +20 -0
  54. data/lib/Wiki2Go/firewall_blacklist.rb +88 -0
  55. data/test/All.rb +5 -2
  56. data/test/TestBlackList.rb +70 -14
  57. data/test/TestConfig.rb +5 -5
  58. data/test/TestDiff.rb +95 -0
  59. data/test/TestFormatter.rb +14 -16
  60. data/test/TestHTMLFormatter.rb +37 -0
  61. data/test/TestInstall.rb +70 -27
  62. data/test/TestLineFormatter.rb +71 -15
  63. data/test/TestRSS.rb +8 -7
  64. data/test/TestRepository.rb +50 -0
  65. data/test/TestServer.rb +3 -8
  66. data/test/TestSpamFilter.rb +33 -1
  67. data/test/TestStorage.rb +11 -0
  68. data/test/TestWeb.rb +2 -2
  69. data/test/TestWiki2Go.rb +766 -166
  70. data/test/TestWiki2GoServlet.rb +1122 -524
  71. data/test/UnitTestFiles.rb +7 -3
  72. data/test/Wiki2GoConfigForTest.rb +40 -6
  73. data/test/checksite.rb +17 -50
  74. data/test/test_firewall_blacklist.rb +131 -0
  75. data/test/test_page.rb +45 -0
  76. data/test/testdata/Registration.rbl.txt +7 -0
  77. data/test/testdata/config/url_blacklist.txt +38822 -0
  78. data/test/testdata/expected_changes.html +1 -2
  79. data/test/testdata/expected_edit.html +108 -59
  80. data/test/testdata/expected_full_rss.xml +2 -2
  81. data/test/testdata/expected_out.html +97 -61
  82. data/test/testdata/expected_put.html +88 -53
  83. data/test/testdata/expected_save.html +88 -52
  84. data/test/testdata/expected_savehtml.html +88 -52
  85. data/test/testdata/expected_search.html +68 -53
  86. data/test/testdata/expected_upload.html +88 -53
  87. data/test/testdata/expected_versions.html +97 -82
  88. data/test/testdata/expected_view.html +97 -61
  89. data/test/testdata/firewall/iptables.config +37 -0
  90. data/test/testdata/firewall/user_blacklist.txt +162 -0
  91. data/test/testdata/logs/wiki.log +652 -0
  92. data/test/testdata/logs/wiki.log.0 +113 -0
  93. data/test/testdata/logs/wiki.log.1 +113 -0
  94. data/test/testdata/logs/wiki.log.2 +113 -0
  95. data/test/testdata/logs/wiki.log.3 +115 -0
  96. data/test/testdata/logs/wiki.log.4 +5 -0
  97. data/test/testdata/logs/wiki.log.5 +7 -0
  98. data/test/testdata/logs/wiki.log.6 +5 -0
  99. data/test/testdata/logs/wiki.log.7 +118 -0
  100. data/test/testdata/logs/wiki.log.8 +12 -0
  101. data/test/testdata/site/html/Xpday/rss.xml +53 -103
  102. data/test/testdata/texts/Bugs/FrontPage.txt +6 -0
  103. data/test/testdata/texts/Bugs/NoHidden.spam +17850 -0
  104. data/test/testdata/texts/Bugs/PairProgrammingParties.spam +102 -0
  105. data/test/testdata/texts/Bugs/PairProgrammingParties.txt +99 -0
  106. metadata +53 -7
  107. data/test/TestMail.rb +0 -29
  108. data/test/gc.log +0 -2
data/lib/Wiki2Go/Install/templates/full_footer.htm CHANGED
@@ -1,35 +1,33 @@
1
1
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
2
- <TR>
3
- <TD width="50%"><%= current.format.changes_link('Recent changes')%></TD>
4
- <TD width="50%"><%= current.format.edit_this_link(current.web.name,current.web.current_page,'Edit this page')%></TD>
5
- </TR>
6
- <TR>
7
- <TD width="50%">
8
- <FORM action="<%= current.format.search_url %>" method="post" id="form1" name="form1">
9
- Search: <INPUT name="text" size="30" ID="Text1">
10
- </FORM>
11
- </TD>
12
- <TD width="50%">
13
- <% if current.web.secure %>
14
- <FORM METHOD="POST" ACTION="<%= current.format.verb_url('upload') %>" ENCTYPE="multipart/form-data">
15
- File: <INPUT TYPE="FILE" NAME="FILE" ID="File">
16
- <INPUT TYPE="SUBMIT" VALUE="Send" ID="SendFile" NAME="SendFile">
17
- </FORM>
18
- <% end %>
19
- </TD>
20
- </TR>
21
- <TR>
22
- <TD colspan="2"></TD>
23
- </TR>
24
- <TR>
25
- <td>Changed on <%= current.page.lastmodified.strftime("%d/%m/%Y") %> by <%= current.page.alias%>
26
- <a href="<%= current.format.resource_url('rss.xml')%>"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
27
- </td>
28
- <TD align="right">
29
- Contact the site administrator: <%= current.format.encodeMailTo(current.config.site_admin) %>
30
- <a target="_blank" href="http://validator.w3.org/check?uri=<%= current.format.absolute_url %>">
31
- <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
32
- </TD>
33
- </TR>
2
+ <TR>
3
+ <TD width="50%">
4
+ <%if current.page.nil? then %>
5
+ &nbsp;
6
+ <% else %>
7
+ <%= current.format.sidebyside_link(current.web.name,current.web.current_page,'Changed',current.from,current.to) %>
8
+ on
9
+ <%= current.page.lastmodified.strftime("%d/%m/%Y") %>
10
+ by
11
+ <%= current.format.search_link2(current.page.author,current.page.alias) %>
12
+ <% end %>
13
+ </TD>
14
+ <TD width="50%" align="right">
15
+ Contact the site administrator:
16
+ <%= current.format.encodeMailTo(current.config.site_admin) %>
17
+ </TD>
18
+ </TR>
19
+ <tr><td colspan="2"><hr></td></tr>
20
+ <tr>
21
+ <td><FORM action="<%= current.format.search_url %>" method="post" id="search" name="search">
22
+ Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
23
+ </FORM>
24
+ </td>
25
+ <td>
26
+ <% if current.web.secure && !current.page.nil? %>
27
+ <FORM METHOD="POST" ACTION="<%= current.format.verb_url('upload') %>" ENCTYPE="multipart/form-data" ID="upload">
28
+ File: <INPUT TYPE="FILE" NAME="FILE" ID="File"> <INPUT TYPE="SUBMIT" VALUE="Send" ID="SendFile" NAME="SendFile">
29
+ </FORM>
30
+ <% end %>
31
+ </td>
32
+ </tr>
34
33
  </TABLE>
35
-
data/lib/Wiki2Go/Install/templates/header.htm CHANGED
@@ -1,4 +1,3 @@
1
- <BASE href="<%= current.web.base_url %>">
2
1
  <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
3
2
  <META http-equiv="Pragma" content="no-cache">
4
3
  <META name="Author" content="Pascal Van Cauwenberghe">
data/lib/Wiki2Go/Install/templates/menu.htm ADDED
@@ -0,0 +1,29 @@
1
+ <% if !current.page.nil? then %>
2
+ <ul>
3
+ <li>
4
+ <%= current.format.versions_link(current.web.current_page,'Page&nbsp;History') %>
5
+ </li>
6
+ <% if !current.page.is_dynamic? then %>
7
+ <li>
8
+ <%= current.format.sidebyside_link(current.web.name,current.web.current_page,'What&nbsp;changed?',current.from,current.to) %>
9
+ </li>
10
+ <% end %>
11
+ <li>
12
+ <%= current.format.diff_link(current.web.name,current.web.current_page,'Diff',current.from,current.to) %>
13
+ </li>
14
+ <% if current.config.editable?(current.web) %>
15
+ <li>
16
+ <%= current.format.editor_this_link(current.web.name,current.web.current_page,'Edit&nbsp;this&nbsp;page')%>
17
+ </li>
18
+ <% end%>
19
+ </ul>
20
+ <hr>
21
+ <% end %>
22
+ <ul>
23
+ <li>
24
+ <%= current.format.changes_link('Recent&nbsp;changes')%>
25
+ </li>
26
+ <li>
27
+ <a href="<%= current.format.resource_url('rss.xml')%>"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
28
+ </li>
29
+ </ul>
data/lib/Wiki2Go/Install/templates/pagelist.htm CHANGED
@@ -1,60 +1,63 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
2
  <HTML>
3
3
  <HEAD>
4
- <!-- include=header.htm -->
5
- <TITLE><%= current.title %></TITLE>
4
+ <!-- include=header.htm -->
5
+ <TITLE>
6
+ <%= current.title %>
7
+ </TITLE>
6
8
  </HEAD>
7
9
  <BODY>
8
- <div id="container">
9
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
10
- <TR>
11
- <TD>
12
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
13
- <TR>
14
- <TD><H1><%= current.title %></H1></TD>
15
- <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
16
- </TR>
17
- </TABLE>
18
- <TABLE border="0" cellpadding="0" cellspacing="8" width="100%" class="Body">
19
- <TR>
20
- <TD width="100%">
21
- <TABLE border="0" width="100%">
22
- <TR>
23
- <td>
24
- <table class="topiclist">
25
- <%
10
+ <table id="container">
11
+ <TR>
12
+ <TD colspan="2" id="header">
13
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
14
+ <TR>
15
+ <TD><H1><%= current.title %></H1>
16
+ </TD>
17
+ <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
18
+ </TR>
19
+ </TABLE>
20
+ </TD>
21
+ </TR>
22
+ <tr>
23
+ <td id="menu" valign="top" nowrap>
24
+ <!-- include=menu.htm -->
25
+ </td>
26
+ <td id="body" width="100%" valign="top">
27
+ <table class="topiclist">
28
+ <%
26
29
  odd = false
27
30
  lastdate = ""
28
31
  current.pages.each do | topic |
29
32
  style = (odd ? "odd" : "even")
30
33
  odd = !odd
31
34
  thisdate = topic.lastmodified.strftime("%d/%m/%Y")
35
+ author = topic.alias + (topic.author != topic.alias ? ' (' + topic.author + ')' : '')
32
36
  %>
33
- <tr class="<%= style %>">
34
- <td class="date"><%= (thisdate != lastdate ? thisdate : '&nbsp;') %></td>
35
- <td class="topic"><%= current.format.view_link(current.web.name,topic.title,topic.name)%></td>
36
- <td class="author"><%= topic.alias %><%= topic.author != topic.alias ? ' (' + topic.author + ')' : '' %></td>
37
- <% if current.web.secure %>
38
- <td class="topic">
39
- <a href="<%= current.format.removespam_url(topic.author) %>">SPAM!</a>
40
- </td>
41
- <% end %>
42
- </tr>
43
- <%
37
+ <tr class="<%= style %>">
38
+ <td class="date"><%= (thisdate != lastdate ? thisdate : '&nbsp;') %></td>
39
+ <td class="topic"><%= current.format.view_link(current.web.name,topic.title,topic.name)%></td>
40
+ <td class="author"><%= current.format.search_link2(topic.author,author) %></td>
41
+ <td class="author"><%= current.format.versions_link(topic.title,'History')%></td>
42
+ <% if current.web.secure && current.config.delete_spam %>
43
+ <td class="topic">
44
+ <form action="<%= current.format.removespam_url(topic.author) %>" method="post">
45
+ <input type="hidden" name="user" value="<%= topic.author%>"><input onclick="return confirm('Are you sure you want to delete this persons posts?');" src="<%= current.format.resource_url('delete.png')%>" type="image" /></form>
46
+ </td>
47
+ <% end %>
48
+ </tr>
49
+ <%
44
50
  lastdate = thisdate
45
51
  end
46
52
  %>
47
- </table>
48
- </td>
49
- </TR>
50
- </TABLE>
51
- </TD>
52
- </TR>
53
- </TABLE>
54
- <!-- include=simple_footer.htm -->
55
- </TD>
56
- </TR>
57
- </TABLE>
58
- </div>
53
+ </table>
54
+ </td>
55
+ </tr>
56
+ <tr>
57
+ <td colspan="2" id="footer">
58
+ <!-- include=full_footer.htm -->
59
+ </td>
60
+ </tr>
61
+ </table>
59
62
  </BODY>
60
63
  </HTML>
data/lib/Wiki2Go/Install/templates/simple_footer.htm CHANGED
@@ -1,17 +1,21 @@
1
1
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer" ID="Table1">
2
- <TR>
3
- <TD width="50%"><%= current.format.changes_link('Recent changes')%></TD>
4
- <TD width="50%">
5
- <FORM action="<%= current.format.search_url %>" method="post" id="form1" name="form1">
6
- Search: <INPUT name="text" size="30" ID="Text1">
7
- </FORM>
8
- </TD>
9
- </TR>
10
- <TR>
11
- <td><a href="<%= current.format.resource_url('rss.xml')%>"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
12
- <TD align="right">
13
- Contact the site administrator: <%= current.format.encodeMailTo(current.config.site_admin) %>
14
- </TD>
15
- </TR>
16
- </TABLE>
17
-
2
+ <TR>
3
+ <TD width="50%">
4
+ <FORM action="<%= current.format.search_url %>" method="post" id="form1" name="form1">
5
+ Search: <INPUT name="text" size="30" ID="Text1">
6
+ </FORM>
7
+ </TD>
8
+ <TD width="50%">
9
+ </TD>
10
+ </TR>
11
+ <TR>
12
+ <td>
13
+ <%= current.format.changes_link('Recent changes')%>
14
+ <a href="<%= current.format.resource_url('rss.xml')%>"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
15
+ </td>
16
+ <TD align="right">
17
+ Contact the site administrator:
18
+ <%= current.format.encodeMailTo(current.config.site_admin) %>
19
+ </TD>
20
+ </TR>
21
+ </TABLE>
data/lib/Wiki2Go/Install/templates/versionlist.htm CHANGED
@@ -1,28 +1,35 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
2
  <HTML>
3
3
  <HEAD>
4
- <!-- include=header.htm -->
5
- <TITLE><%= current.title %></TITLE>
4
+ <!-- include=header.htm -->
5
+ <META name="robots" content="noindex,nofollow">
6
+ <TITLE>
7
+ <%= current.title %>
8
+ </TITLE>
6
9
  </HEAD>
7
10
  <BODY>
8
- <div id="container">
9
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
10
- <TR>
11
- <TD>
12
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
13
- <TR>
14
- <TD><H1><%= current.title %></H1></TD>
15
- <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
16
- </TR>
17
- </TABLE>
18
- <TABLE border="0" cellpadding="0" cellspacing="8" width="100%" class="Body">
19
- <TR>
20
- <TD width="100%">
21
- <TABLE border="0" width="100%">
22
- <TR>
23
- <td>
24
- <table class="topiclist">
25
- <%
11
+ <table id="container">
12
+ <tr>
13
+ <td colspan="2" id="header">
14
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
15
+ <TR>
16
+ <TD><H1><%= current.title %></H1>
17
+ </TD>
18
+ <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
19
+ </TR>
20
+ </TABLE>
21
+ </td>
22
+ </tr>
23
+ <tr>
24
+ <td id="menu" valign="top" nowrap>
25
+ <!-- include=menu.htm -->
26
+ </td>
27
+ <td id="body" width="100%" valign="top">
28
+ <TABLE border="0" width="100%">
29
+ <TR>
30
+ <td>
31
+ <table class="topiclist">
32
+ <%
26
33
  odd = false
27
34
  lastdate = ""
28
35
  version_id = current.pages.length
@@ -31,32 +38,37 @@
31
38
  style = (odd ? "odd" : "even")
32
39
  odd = !odd
33
40
  thisdate = topic.lastmodified.strftime("%d/%m/%Y")
41
+ author = topic.alias + (topic.author != topic.alias ? ' (' + topic.author + ')' : '' )
34
42
  %>
35
43
  <tr class="<%= style %>">
36
44
  <td class="date"><%= (thisdate != lastdate ? thisdate : '&nbsp;') %></td>
37
- <td class="author"><%= topic.author %></td>
38
- <td><%= current.format.view_version_link(current.web.name,topic.title,"view",{'version' => version_id.to_s})%></td>
39
- <% if current.web.secure %>
40
- <td class="topic">
41
- <a href="<%= current.format.removespam_url(topic.author) %>">SPAM!</a>
42
- </td>
43
- <% end %>
45
+ <td class="topic"><%= current.format.view_version_link(current.web.name,topic.title,topic.name,version_id.to_s)%></td>
46
+ <td class="author"><%= current.format.search_link2(topic.author,author) %></td>
47
+ <td class="topic"><%= current.format.sidebyside_link(current.web.name,current.web.current_page,'compare',version_id-1,version_id) %></td>
48
+ <td class="topic"><%= current.format.diff_link(current.web.name,current.web.current_page,'diff',version_id-1,version_id) %></td>
49
+ <% if current.web.secure && current.config.delete_spam %>
50
+ <td class="topic">
51
+ <form action="<%= current.format.removespam_url(topic.author) %>" method="post">
52
+ <input type="hidden" name="user" value="<%= topic.author%>"><input onclick="return confirm('Are you sure you want to delete this persons posts?');" src="<%= current.format.resource_url('delete.png')%>" type="image" /></form>
53
+ </td>
54
+ <% end %>
44
55
  </tr>
45
- <%
56
+ <%
46
57
  lastdate = thisdate
47
58
  end
48
59
  %>
49
- </table>
50
- </td>
51
- </TR>
52
- </TABLE>
53
- </TD>
54
- </TR>
55
- </TABLE>
56
- <!-- include=simple_footer.htm -->
57
- </TD>
58
- </TR>
59
- </TABLE>
60
- </div>
60
+ </table>
61
+ </td>
62
+ </TR>
63
+ </TABLE>
64
+ </td>
65
+ </tr>
66
+ <tr>
67
+ <td colspan="2" id="footer">
68
+ <!-- include=full_footer.htm -->
69
+ </td>
70
+ </tr>
71
+
72
+ </table>
61
73
  </BODY>
62
74
  </HTML>
data/lib/Wiki2Go/Install/templates/view.htm CHANGED
@@ -1,32 +1,49 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
2
  <HTML>
3
- <HEAD>
4
- <!-- include=header.htm -->
5
- <TITLE><%= current.web.name %>-<%= current.page.name %></TITLE>
6
- </HEAD>
7
- <BODY>
8
- <div id="container">
9
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
10
- <TR>
11
- <TD>
12
- <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
13
- <TR>
14
- <TD><h1><%= current.format.search_link2(current.web.current_page,current.page.name) %></h1>
15
- </TD>
16
- <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
17
- </TR>
18
- </TABLE>
19
- <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
20
- <TR>
21
- <TD width="100%">
22
- <%= current.text %>
23
- </TD>
24
- </TR>
25
- </TABLE>
26
- <!-- include=full_footer.htm -->
27
- </TD>
28
- </TR>
29
- </TABLE>
30
- </div>
31
- </BODY>
3
+ <HEAD>
4
+ <!-- include=header.htm -->
5
+ <TITLE>
6
+ <% if current.web.name.length > 0 then %>
7
+ <%= current.web.name %>
8
+ -
9
+ <% end%>
10
+ <%= current.page.name %>
11
+ </TITLE>
12
+ </HEAD>
13
+ <BODY>
14
+ <table id="container">
15
+ <tr>
16
+ <td colspan="2" id="header">
17
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
18
+ <TR>
19
+ <TD><h1><%= current.format.search_link2(current.web.current_page,current.page.name) %>
20
+ <% if current.to >= 0 %>
21
+ <%= current.format.view_link(current.web.name,current.web.current_page,'v.'+current.to.to_s)%>
22
+ <% end %>
23
+ </h1>
24
+ </TD>
25
+ <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home")%></td>
26
+ </TR>
27
+ </TABLE>
28
+ </td>
29
+ </tr>
30
+ <tr>
31
+ <td id="menu" valign="top" nowrap>
32
+ <!-- include=menu.htm -->
33
+ </td>
34
+ <td id="body" width="100%" valign="top">
35
+ <%= current.text %>
36
+ </td>
37
+ </tr>
38
+ <tr>
39
+ <td colspan="2" id="footer">
40
+ <!-- include=full_footer.htm -->
41
+ </td>
42
+ </tr>
43
+ </table>
44
+ <span style="float:right">
45
+ <a target="_blank" href="http://validator.w3.org/check?uri=<%= current.format.absolute_url %>">
46
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
47
+ </span>
48
+ </BODY>
32
49
  </HTML>
data/lib/Wiki2Go/Install/templates/wikiedit.htm ADDED
@@ -0,0 +1,63 @@
1
+ <%
2
+ require 'cgi'
3
+ %>
4
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
5
+ <HTML>
6
+ <HEAD>
7
+ <!-- include=header.htm -->
8
+ <meta name="robots" content="noindex,nofollow">
9
+ <TITLE>Edit
10
+ <%= current.web.name %>
11
+ -
12
+ <%= current.web.current_page %>
13
+ </TITLE>
14
+ </HEAD>
15
+ <BODY>
16
+ <table id="container">
17
+ <tr>
18
+ <td colspan="2" id="header">
19
+ <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
20
+ <TR>
21
+ <TD><H1>Edit
22
+ <%= current.format.search_link(current.web.current_page) %>
23
+ </H1>
24
+ </TD>
25
+ <td align="right"><%= current.format.view_link(current.web.name,"FrontPage","Home") %></td>
26
+ </TR>
27
+ </TABLE>
28
+ </td>
29
+ </tr>
30
+ <tr>
31
+ <td id="menu" valign="top" nowrap>
32
+ <!-- include=menu.htm -->
33
+ </td>
34
+ <td id="body" width="100%" valign="top">
35
+ <form action="<%= current.format.save_url %>" method="POST" id="form2" name="form2">
36
+ <input type="hidden" name="iznorobot" value="<%= current.page.checksum(current.config.checksum_salt) %>" />
37
+ <p align="left">Edit the page in the text area.
38
+ <br>
39
+ To quit without changing the page,
40
+ <%= current.format.view_link(current.web.name,current.web.current_page,'click here to return to '+ current.web.current_page) %>
41
+ </p>
42
+ <% if current.web.secure then %>
43
+ <p align="left">Page name: <input type="text" name="title" value="<%= CGI::escapeHTML(current.page.name) %>" size="64"></p>
44
+ <% else %>
45
+ <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
46
+ me</p>
47
+ <% end %>
48
+ <p align="left"><textarea name="text" rows="35" cols="96">$TEXT$</textarea><br>
49
+ <input type="submit" value=" Save " name="save"> <input type="reset" value=" Undo ">
50
+ </p>
51
+ </form>
52
+ <p align="left"><em>Don't forget to follow the <a href="http://wiki2go.nayima.be/Wiki2Go/TextFormattingRules.html" target="_blank">
53
+ TextFormatting rules</a></em></p>
54
+ </td>
55
+ </tr>
56
+ <tr>
57
+ <td colspan="2" id="footer">
58
+ <!-- include=full_footer.htm -->
59
+ </td>
60
+ </tr>
61
+ </table>
62
+ </BODY>
63
+ </HTML>