webgen 0.5.2 → 0.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (85) hide show
  1. data/Rakefile +15 -4
  2. data/VERSION +1 -1
  3. data/data/webgen/webgui/controller/main.rb +1 -1
  4. data/data/webgen/website_skeleton/ext/init.rb +6 -0
  5. data/data/webgen/website_styles/1024px/src/default.css +188 -188
  6. data/data/webgen/website_styles/1024px/src/default.template +51 -51
  7. data/data/webgen/website_styles/andreas00/src/default.template +1 -1
  8. data/data/webgen/website_styles/andreas01/src/default.css +8 -8
  9. data/data/webgen/website_styles/andreas01/src/default.template +1 -1
  10. data/data/webgen/website_styles/andreas03/src/default.css +3 -3
  11. data/data/webgen/website_styles/andreas03/src/default.template +2 -2
  12. data/data/webgen/website_styles/andreas04/src/default.css +1 -1
  13. data/data/webgen/website_styles/andreas05/src/default.css +3 -3
  14. data/data/webgen/website_styles/andreas05/src/default.template +26 -26
  15. data/data/webgen/website_styles/andreas06/src/default.css +6 -6
  16. data/data/webgen/website_styles/andreas06/src/default.template +1 -1
  17. data/data/webgen/website_styles/andreas07/src/default.css +6 -6
  18. data/data/webgen/website_styles/andreas08/src/default.css +7 -7
  19. data/data/webgen/website_styles/andreas08/src/default.template +2 -2
  20. data/data/webgen/website_styles/andreas09/src/default.css +3 -3
  21. data/data/webgen/website_styles/andreas09/src/default.template +1 -1
  22. data/data/webgen/website_styles/simple/src/default.css +84 -84
  23. data/data/webgen/website_styles/simple/src/default.template +1 -1
  24. data/doc/index.page +27 -12
  25. data/doc/manual.page +52 -10
  26. data/doc/reference_configuration.page +108 -52
  27. data/doc/reference_metainfo.page +77 -2
  28. data/doc/sourcehandler/feed.page +82 -0
  29. data/doc/sourcehandler/metainfo.page +3 -2
  30. data/doc/sourcehandler/sitemap.page +46 -0
  31. data/doc/tag.template +2 -3
  32. data/doc/tag/breadcrumbtrail.page +11 -3
  33. data/doc/tag/menu.page +6 -4
  34. data/doc/tag/sitemap.page +31 -0
  35. data/doc/upgrading.page +67 -0
  36. data/lib/webgen/cli/utils.rb +4 -4
  37. data/lib/webgen/cli/webgui_command.rb +2 -1
  38. data/lib/webgen/common.rb +10 -0
  39. data/lib/webgen/common/sitemap.rb +76 -0
  40. data/lib/webgen/configuration.rb +64 -1
  41. data/lib/webgen/contentprocessor.rb +1 -1
  42. data/lib/webgen/contentprocessor/builder.rb +1 -1
  43. data/lib/webgen/contentprocessor/erb.rb +1 -1
  44. data/lib/webgen/contentprocessor/haml.rb +1 -1
  45. data/lib/webgen/contentprocessor/maruku.rb +1 -1
  46. data/lib/webgen/contentprocessor/sass.rb +1 -1
  47. data/lib/webgen/coreext.rb +10 -0
  48. data/lib/webgen/default_config.rb +35 -4
  49. data/lib/webgen/node.rb +12 -6
  50. data/lib/webgen/page.rb +1 -1
  51. data/lib/webgen/path.rb +1 -1
  52. data/lib/webgen/sourcehandler.rb +11 -6
  53. data/lib/webgen/sourcehandler/base.rb +5 -2
  54. data/lib/webgen/sourcehandler/feed.rb +121 -0
  55. data/lib/webgen/sourcehandler/metainfo.rb +22 -13
  56. data/lib/webgen/sourcehandler/page.rb +5 -3
  57. data/lib/webgen/sourcehandler/sitemap.rb +60 -0
  58. data/lib/webgen/sourcehandler/template.rb +5 -1
  59. data/lib/webgen/sourcehandler/virtual.rb +1 -0
  60. data/lib/webgen/tag.rb +1 -0
  61. data/lib/webgen/tag/breadcrumbtrail.rb +42 -10
  62. data/lib/webgen/tag/langbar.rb +1 -1
  63. data/lib/webgen/tag/menu.rb +10 -14
  64. data/lib/webgen/tag/sitemap.rb +42 -0
  65. data/lib/webgen/tree.rb +1 -1
  66. data/lib/webgen/version.rb +1 -1
  67. data/lib/webgen/website.rb +5 -6
  68. data/misc/default.css +6 -2
  69. data/test/helper.rb +13 -0
  70. data/test/test_common_sitemap.rb +56 -0
  71. data/test/test_configuration.rb +24 -0
  72. data/test/test_contentprocessor_maruku.rb +4 -1
  73. data/test/test_node.rb +4 -1
  74. data/test/test_page.rb +11 -5
  75. data/test/test_path.rb +10 -10
  76. data/test/test_sourcehandler_feed.rb +74 -0
  77. data/test/test_sourcehandler_metainfo.rb +26 -12
  78. data/test/test_sourcehandler_page.rb +1 -0
  79. data/test/test_sourcehandler_sitemap.rb +47 -0
  80. data/test/test_sourcehandler_template.rb +3 -0
  81. data/test/test_sourcehandler_virtual.rb +4 -1
  82. data/test/test_tag_breadcrumbtrail.rb +33 -23
  83. data/test/test_tag_menu.rb +24 -25
  84. data/test/test_tag_sitemap.rb +44 -0
  85. metadata +37 -4
@@ -2,59 +2,59 @@
2
2
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3
3
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{lang:}">
4
4
  <head>
5
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
6
- <meta name="description" content="Your description goes here..." />
7
- <meta name="keywords" content="your,keywords,goes,here" />
8
- <meta name="author" content="Your Name / Design by Andreas Viklund - http://andreasviklund.com/" />
9
- <meta name="generator" content="webgen - http://webgen.rubyforge.com/" />
10
- <link rel="stylesheet" type="text/css" href="{relocatable: default.css}" media="screen,projection" />
11
- <title>{title: }</title>
5
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
6
+ <meta name="description" content="Your description goes here..." />
7
+ <meta name="keywords" content="your,keywords,goes,here" />
8
+ <meta name="author" content="Your Name / Design by Andreas Viklund - http://andreasviklund.com/" />
9
+ <meta name="generator" content="webgen - http://webgen.rubyforge.com/" />
10
+ <link rel="stylesheet" type="text/css" href="{relocatable: default.css}" media="screen,projection" />
11
+ <title>{title: }</title>
12
12
  </head>
13
13
 
14
14
  <body>
15
- <div id="wrap">
16
-
17
- <div id="header">
18
- <p id="toplinks">Skip to: <a href="#content">Content</a> | <a href="#sidebar">Navigation</a> | <a href="#footer">Footer</a><br />
19
- Location: {breadcrumb_trail: }<br />
20
- Language: {langbar: }
21
- </p>
22
- <h1><a href="{relocatable: /index.page}">Title<span class="fade">appendix</span></a></h1>
23
- <p id="slogan">the slogan of the site...</p>
24
- </div>
25
-
26
- <div id="content">
27
- <webgen:block name="content" />
28
-
29
- <p class="readmore"><a href="styles.html">Example "Read more" link</a> &raquo;</p>
30
- <p class="box"><strong>Example Note:</strong>This is a note! Check out the CSS file for other CSS classes and styles included!</p>
31
- </div>
32
-
33
- <div id="sidebar">
34
- <h2>Welcome!</h2>
35
- <p>Write a short presentation of yourself or the site right here!</p>
36
-
37
- <h2>Pages:</h2>
38
- {menu: {max_levels: 2}}
39
-
40
- <h2>Site news:</h2>
41
- <p><strong>09.09.2009</strong><br />
42
- Something will have happened by then.</p>
43
-
44
- <h2>Links:</h2>
45
- <ul class="links">
46
- <li><a href="http://webgen.rubyforge.org/">webgen homepage</a></li>
47
- <li><a href="http://andreasviklund.com/templates/">Free templates</a></li>
48
- <li><a href="http://openwebdesign.org">Open Webdesign</a></li>
49
- <li><a href="http://oswd.org">OSWD.org</a></li>
50
- </ul>
51
- </div>
52
-
53
- <div id="footer">
54
- <p><a href="#">Contact us</a> | <a href="#">Privacy policy</a> | <a href="#">Sitemap</a> | <a href="#">RSS</a> | <a href="#header">Back to top</a><br />
55
- &copy; 2006 Your Name | Generated by <a href="http://webgen.rubyforge.org">webgen</a> | Design by <a href="http://andreasviklund.com/">Andreas Viklund</a></p>
56
- </div>
57
-
58
- </div>
15
+ <div id="wrap">
16
+
17
+ <div id="header">
18
+ <p id="toplinks">Skip to: <a href="#content">Content</a> | <a href="#sidebar">Navigation</a> | <a href="#footer">Footer</a><br />
19
+ Location: {breadcrumb_trail: }<br />
20
+ Language: {langbar: }
21
+ </p>
22
+ <h1><a href="{relocatable: /index.html}">Title<span class="fade">appendix</span></a></h1>
23
+ <p id="slogan">the slogan of the site...</p>
24
+ </div>
25
+
26
+ <div id="content">
27
+ <webgen:block name="content" />
28
+
29
+ <p class="readmore"><a href="styles.html">Example "Read more" link</a> &raquo;</p>
30
+ <p class="box"><strong>Example Note:</strong>This is a note! Check out the CSS file for other CSS classes and styles included!</p>
31
+ </div>
32
+
33
+ <div id="sidebar">
34
+ <h2>Welcome!</h2>
35
+ <p>Write a short presentation of yourself or the site right here!</p>
36
+
37
+ <h2>Pages:</h2>
38
+ <div id="menu">{menu: {max_levels: 2}}</div>
39
+
40
+ <h2>Site news:</h2>
41
+ <p><strong>09.09.2009</strong><br />
42
+ Something will have happened by then.</p>
43
+
44
+ <h2>Links:</h2>
45
+ <ul class="links">
46
+ <li><a href="http://webgen.rubyforge.org/">webgen homepage</a></li>
47
+ <li><a href="http://andreasviklund.com/templates/">Free templates</a></li>
48
+ <li><a href="http://openwebdesign.org">Open Webdesign</a></li>
49
+ <li><a href="http://oswd.org">OSWD.org</a></li>
50
+ </ul>
51
+ </div>
52
+
53
+ <div id="footer">
54
+ <p><a href="#">Contact us</a> | <a href="#">Privacy policy</a> | <a href="#">Sitemap</a> | <a href="#">RSS</a> | <a href="#header">Back to top</a><br />
55
+ &copy; 2006 Your Name | Generated by <a href="http://webgen.rubyforge.org">webgen</a> | Design by <a href="http://andreasviklund.com/">Andreas Viklund</a></p>
56
+ </div>
57
+
58
+ </div>
59
59
  </body>
60
60
  </html>
@@ -14,7 +14,7 @@
14
14
  <body>
15
15
  <div id="wrap">
16
16
  <div id="header">
17
- <h1><a href="{relocatable: /index.page}">Title of website</a></h1>
17
+ <h1><a href="{relocatable: /index.html}">Title of website</a></h1>
18
18
  <p><strong>Your slogan here...</strong></p>
19
19
  </div>
20
20
 
@@ -110,21 +110,21 @@ padding:0;
110
110
  }
111
111
 
112
112
  /***** Main menu *****/
113
- .webgen-menu ul {
113
+ #menu ul {
114
114
  width:140px;
115
115
  margin:0 0 18px;
116
116
  padding:0;
117
117
  list-style:none;
118
118
  }
119
119
 
120
- .webgen-menu ul li {
120
+ #menu ul li {
121
121
  width:140px;
122
122
  padding:0;
123
123
  line-height:1.4em;
124
124
  display:inline;
125
125
  }
126
126
 
127
- .webgen-menu ul li a, .webgen-menu ul li span {
127
+ #menu ul li a, #menu ul li span {
128
128
  background-color:#f4f4f4;
129
129
  color:#505050;
130
130
  font-weight:bold;
@@ -136,29 +136,29 @@ border-left:4px solid #cccccc;
136
136
  text-decoration:none;
137
137
  }
138
138
 
139
- .webgen-menu ul li a:hover, .webgen-menu ul li.webgen-menu-item-selected a, .webgen-menu ul li.webgen-menu-item-selected span {
139
+ #menu ul li a:hover, #menu ul li.webgen-menu-item-selected a, #menu ul li.webgen-menu-item-selected span {
140
140
  background-color:#eaeaea;
141
141
  border-left:4px solid #286ea0;
142
142
  color:#505050;
143
143
  }
144
144
 
145
- .webgen-menu ul ul {
145
+ #menu ul ul {
146
146
  margin:0 0 0 15px;
147
147
  padding:0 0 5px 0;
148
148
  font-size:0.9em;
149
149
  width:125px;
150
150
  }
151
151
 
152
- .webgen-menu ul ul a, .webgen-menu ul ul span {
152
+ #menu ul ul a, #menu ul ul span {
153
153
  padding:3px 1px 3px 5px;
154
154
  width:115px;
155
155
  }
156
156
 
157
- .webgen-menu ul ul ul {
157
+ #menu ul ul ul {
158
158
  width:113px;
159
159
  }
160
160
 
161
- .webgen-menu ul ul ul a {
161
+ #menu ul ul ul a {
162
162
  width:100px;
163
163
  }
164
164
 
@@ -24,7 +24,7 @@
24
24
 
25
25
  <div id="leftside">
26
26
  <h2 class="hide">Menu:</h2>
27
- {menu: }
27
+ <div id="menu">{menu: }</div>
28
28
 
29
29
  <div class="announce">
30
30
  <h2>Latest news:</h2>
@@ -123,13 +123,13 @@ margin: 0px;
123
123
  padding: 5px 0px 5px 8px;
124
124
  }
125
125
 
126
- #sidebar .webgen-menu ul {
126
+ #sidebar #menu ul {
127
127
  list-style-type: none;
128
128
  margin: 0px;
129
129
  padding: 0px;
130
130
  }
131
131
 
132
- #sidebar .webgen-menu li a, #sidebar .webgen-menu li span, .sidelink{
132
+ #sidebar #menu li a, #sidebar #menu li span, .sidelink{
133
133
  display:block;
134
134
  width:140px;
135
135
  margin:3px 10px 2px 0;
@@ -145,7 +145,7 @@ border-bottom:1px solid #bbb;
145
145
  border-left:1px solid #ddd;
146
146
  }
147
147
 
148
- #sidebar .webgen-menu li a:hover, #sidebar li.webgen-menu-item-selected a, #sidebar li.webgen-menu-item-selected span, .sidelink:hover, .menuheader {
148
+ #sidebar #menu li a:hover, #sidebar li.webgen-menu-item-selected a, #sidebar li.webgen-menu-item-selected span, .sidelink:hover, .menuheader {
149
149
  background:#fff url(images/gradient2.png) repeat-x;
150
150
  color:#222;
151
151
  border-top:1px solid #ddd;
@@ -21,7 +21,7 @@
21
21
  <div id="main">
22
22
 
23
23
  <div id="logo">
24
- <h1>[<a href="{relocatable: /index.page}" accesskey="4">your site title</a>]</h1>
24
+ <h1>[<a href="{relocatable: /index.html}" accesskey="4">your site title</a>]</h1>
25
25
  <span id="tagline">Your striking site slogan!</span>
26
26
  </div>
27
27
 
@@ -37,7 +37,7 @@
37
37
  <div id="sidebar">
38
38
 
39
39
  <h2 class="sidelink menuheader"><a id="sitemenu"></a>Menu:</h2>
40
- {menu: {max_levels: 1}}
40
+ <div id="menu">{menu: {max_levels: 1}}</div>
41
41
  <a class="hide" href="#top" accesskey="1">Top of page</a>
42
42
 
43
43
  <h3>Regular links</h3>
@@ -95,7 +95,7 @@ padding-top:35px;
95
95
  text-align: right;
96
96
  }
97
97
 
98
- #menu .webgen-menu ul, #menu .webgen-menu li {
98
+ #menu ul, #menu li {
99
99
  display: inline;
100
100
  margin: 0px;
101
101
  padding: 0px;
@@ -24,9 +24,9 @@ h2{font-size:1.6em; font-weight:normal; letter-spacing:-1px; margin:5px 0 10px;}
24
24
  #footer{clear:both;}
25
25
 
26
26
  /* Menu */
27
- #sidebar .webgen-menu ul {list-style-type: none; margin: 0px; padding: 0px;}
28
- #sidebar .webgen-menu a, #sidebar .webgen-menu span {border:1px solid #ffffff; color:#286ea0; display:block; font-size:1.1em; font-weight:bold; padding:4px 2px 4px 10px; width:110px;}
29
- #sidebar .webgen-menu a:hover, #sidebar .webgen-menu-item-selected a, #sidebar .webgen-menu-item-selected span {background-color:#f8f8f8; border:1px solid #dadada; color:#286ea0; text-decoration:none;}
27
+ #sidebar #menu ul {list-style-type: none; margin: 0px; padding: 0px;}
28
+ #sidebar #menu a, #sidebar #menu span {border:1px solid #ffffff; color:#286ea0; display:block; font-size:1.1em; font-weight:bold; padding:4px 2px 4px 10px; width:110px;}
29
+ #sidebar #menu a:hover, #sidebar .webgen-menu-item-selected a, #sidebar .webgen-menu-item-selected span {background-color:#f8f8f8; border:1px solid #dadada; color:#286ea0; text-decoration:none;}
30
30
 
31
31
  /* Various classes */
32
32
  .credits{color:#888; font-size:0.9em; margin-bottom:0;}
@@ -2,39 +2,39 @@
2
2
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3
3
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4
4
  <head>
5
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
6
- <meta name="description" content="your description goes here" />
7
- <meta name="keywords" content="your,keywords,goes,here" />
8
- <meta name="author" content="Your Name / Original design: Andreas Viklund - http://andreasviklund.com/" />
9
- <meta name="generator" content="webgen - http://webgen.rubyforge.org" />
10
- <link rel="stylesheet" type="text/css" href="{relocatable: default.css}" />
11
- <title>{title:}</title>
5
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
6
+ <meta name="description" content="your description goes here" />
7
+ <meta name="keywords" content="your,keywords,goes,here" />
8
+ <meta name="author" content="Your Name / Original design: Andreas Viklund - http://andreasviklund.com/" />
9
+ <meta name="generator" content="webgen - http://webgen.rubyforge.org" />
10
+ <link rel="stylesheet" type="text/css" href="{relocatable: default.css}" />
11
+ <title>{title:}</title>
12
12
  </head>
13
13
 
14
14
  <body>
15
- <div id="title"><h1>Site Title</h1></div>
16
- <div id="container">
17
- <div id="sidebar">
15
+ <div id="title"><h1>Site Title</h1></div>
16
+ <div id="container">
17
+ <div id="sidebar">
18
18
 
19
- <h2>Site menu</h2>
20
- {menu: {max_levels: 1}}
19
+ <h2>Site menu</h2>
20
+ <div id="menu">{menu: {max_levels: 1}}</div>
21
21
 
22
- <p class="sidenote">
23
- Links:<br />
24
- <a href="http://webgen.rubyforge.org">webgen homepage</a><br />
25
- <a href="http://andreasviklund.com/templates">More templates</a><br />
26
- <a href="http://openwebdesign.org">OWD</a><br />
27
- <a href="http://oswd.org">OSWD</a>
28
- </p>
22
+ <p class="sidenote">
23
+ Links:<br />
24
+ <a href="http://webgen.rubyforge.org">webgen homepage</a><br />
25
+ <a href="http://andreasviklund.com/templates">More templates</a><br />
26
+ <a href="http://openwebdesign.org">OWD</a><br />
27
+ <a href="http://oswd.org">OSWD</a>
28
+ </p>
29
29
 
30
- </div>
30
+ </div>
31
31
 
32
- <div id="main">
33
- <webgen:block name="content" />
34
- <p class="credits"><strong>&copy; 2005 Your name</strong> | Generated by <a href="http://webgen.rubyforge.org">webgen</a> | Design by <a href="http://andreasviklund.com/">Andreas Viklund</a></p>
35
- </div>
32
+ <div id="main">
33
+ <webgen:block name="content" />
34
+ <p class="credits"><strong>&copy; 2005 Your name</strong> | Generated by <a href="http://webgen.rubyforge.org">webgen</a> | Design by <a href="http://andreasviklund.com/">Andreas Viklund</a></p>
35
+ </div>
36
36
 
37
- <div id="footer"></div>
38
- </div>
37
+ <div id="footer"></div>
38
+ </div>
39
39
  </body>
40
40
  </html>
@@ -248,18 +248,18 @@ text-decoration:underline;
248
248
  margin-bottom:10px;
249
249
  }
250
250
 
251
- #leftside .webgen-menu ul {
251
+ #leftside #submenu ul {
252
252
  margin: 0px;
253
253
  padding: 0px;
254
254
  list-style-type: none;
255
255
  }
256
256
 
257
- #leftside .webgen-menu li {
257
+ #leftside #submenu li {
258
258
  margin: 0px;
259
259
  padding: 0px;
260
260
  }
261
261
 
262
- .nav, #leftside .webgen-menu ul a {
262
+ .nav, #leftside #submenu ul a {
263
263
  color:#d04a10;
264
264
  display:block;
265
265
  font-size:1.1em;
@@ -271,20 +271,20 @@ text-decoration:none;
271
271
  width:125px;
272
272
  }
273
273
 
274
- .nav:hover, #leftside .webgen-menu ul a:hover {
274
+ .nav:hover, #leftside #submenu ul a:hover {
275
275
  border:1px solid #fa9035;
276
276
  color:#505050;
277
277
  padding:1px 1px 1px 9px;
278
278
  }
279
279
 
280
- .sub, #leftside .webgen-menu ul ul a {
280
+ .sub, #leftside #submenu ul ul a {
281
281
  font-size:0.9em;
282
282
  margin-left:20px;
283
283
  padding:1px 1px 1px 6px;
284
284
  width:105px;
285
285
  }
286
286
 
287
- .sub:hover, #leftside .webgen-menu ul ul a {
287
+ .sub:hover, #leftside #submenu ul ul a {
288
288
  border:1px solid #fa9035;
289
289
  color:#505050;
290
290
  padding:0 0 0 5px;
@@ -39,7 +39,7 @@
39
39
  <p class="soft">Some text here, maybe a website description</p>
40
40
  <% if node.level > 1 %>
41
41
  <h1>Site menu:</h1>
42
- {menu: {start_level: 2, max_levels: 2}}
42
+ <div id="submenu">{menu: {start_level: 2, max_levels: 2}}</div>
43
43
  <% end %>
44
44
  </div>
45
45
 
@@ -59,22 +59,22 @@ body > #sidebar
59
59
 
60
60
  /**************** Navigation menu styles ****************/
61
61
 
62
- #menu .webgen-menu ul
62
+ #menu ul
63
63
  {list-style-type: none; margin: 0px; padding: 0px; font-size: 1.0em;}
64
64
 
65
- #menu .webgen-menu li
65
+ #menu li
66
66
  {margin: 0px; padding: 0px}
67
67
 
68
- #menu .webgen-menu a, #menu .webgen-menu span
68
+ #menu a, #menu span
69
69
  {display:block; width:202px; padding:5px 18px 5px 0; color:#606060; background:#e0e0e0 url(images/sidebarbg.gif) top right repeat-y; font-size:1.8em; font-weight:normal; text-decoration:none; letter-spacing:-2px;}
70
70
 
71
- #menu .webgen-menu a:hover, #menu .webgen-menu span:hover
71
+ #menu a:hover, #menu span:hover
72
72
  {color:#303030; background:#f0f0f0 url(images/sidebarbg.gif) top right repeat-y;}
73
73
 
74
- #menu .webgen-menu li.webgen-menu-item-selected a, #menu .webgen-menu li.webgen-menu-item-selected span
74
+ #menu li.webgen-menu-item-selected a, #menu li.webgen-menu-item-selected span
75
75
  {padding:5px 18px 5px 0; background:#fafafa; border-top:2px solid #c0c0c0; border-bottom:2px solid #c0c0c0;}
76
76
 
77
- #menu .webgen-menu li.webgen-menu-item-selected a:hover, #menu .webgen-menu li.webgen-menu-item-selected span:hover
77
+ #menu li.webgen-menu-item-selected a:hover, #menu li.webgen-menu-item-selected span:hover
78
78
  {color:#505050; background:#fafafa;}
79
79
 
80
80
  /**************** Content area styles ****************/
@@ -159,13 +159,13 @@ background-color:inherit;
159
159
 
160
160
  /**************** Menublock styles ****************/
161
161
 
162
- #subcontent .webgen-menu ul, .linkblock {margin:0 0 20px 8px; font-size:0.9em;}
163
- #subcontent .webgen-menu ul li, .linkblock li {list-style:none; display:block; padding:2px; margin-bottom:2px;}
164
- #subcontent .webgen-menu ul li a, .linkblock li a {font-weight:bold; text-decoration:none;}
165
- #subcontent .webgen-menu ul li a:hover, .linkblock li a:hover {text-decoration:none;}
166
- #subcontent .webgen-menu ul li ul, .linkblock li ul {margin:3px 0 3px 15px; font-size:1em; font-weight:normal;}
167
- #subcontent .webgen-menu ul li ul li, .linkblock li ul li {margin-bottom:0;}
168
- #subcontent .webgen-menu ul li ul a, .linkblock li ul a {font-weight:normal;}
162
+ #subcontent #submenu ul, .linkblock {margin:0 0 20px 8px; font-size:0.9em;}
163
+ #subcontent #submenu ul li, .linkblock li {list-style:none; display:block; padding:2px; margin-bottom:2px;}
164
+ #subcontent #submenu ul li a, .linkblock li a {font-weight:bold; text-decoration:none;}
165
+ #subcontent #submenu ul li a:hover, .linkblock li a:hover {text-decoration:none;}
166
+ #subcontent #submenu ul li ul, .linkblock li ul {margin:3px 0 3px 15px; font-size:1em; font-weight:normal;}
167
+ #subcontent #submenu ul li ul li, .linkblock li ul li {margin-bottom:0;}
168
+ #subcontent #submenu ul li ul a, .linkblock li ul a {font-weight:normal;}
169
169
 
170
170
  /**************** Searchbar styles ****************/
171
171
 
@@ -14,7 +14,7 @@
14
14
  <div id="container" >
15
15
 
16
16
  <div id="header">
17
- <h1><a href="{relocatable: /index.page}">website title</a></h1>
17
+ <h1><a href="{relocatable: /index.html}">website title</a></h1>
18
18
  <h2>space reserved for your website slogan!</h2>
19
19
  </div>
20
20
 
@@ -30,7 +30,7 @@
30
30
  <div class="small box"><strong>Note: </strong>This is a box. It can be used for special messages both in the sidebar and the content section. You could use it for special notes and announcements, but also as a frame for photos. This space can be used for a short website presentation!</div>
31
31
 
32
32
  <h2>Nested Menu</h2>
33
- {menu: }
33
+ <div id="submenu">{menu: }</div>
34
34
 
35
35
  <h2>Links</h2>
36
36
  <ul class="linkblock">