webgen 0.4.1 → 0.4.2

data/TODO

@@ -1,13 +1,10 @@
 ---- CURRENT ----
 
 * modify WebSite to allow better use (factor out loading of plugins into own method, do not call init in #render method, ...)
-* fix TreeWalker (call it!)
 * show error message when configuration file is invalid (Webgen::WebSite)
-* fix website styles menus to have a style for current menu item with <span> instead of <a>
 * add a common class to the menu element (either a or span, depending on Fil/DefaultFileHandler:linkToCurrentPage) for easier referencing in CSS styles (update menu CSS style afterwards for horiz-dd, vert-dd, ...)
 * add parameters startLevel, minLevels, maxLevels to horizontal menu style
 * make linking to image galleries possible by specifing the gallery file
-* change namespace of tag plugins from tags to tag
 * send bug report to rdoc maintainer (rdoc does not handle nested method defintions correctly)
 * make source installation work again (because of help forum entry)?
 * rethink plugin config handling (maybe all in a list which is traversed and stopped when one item returns a value)
@@ -24,7 +21,6 @@
 * document how to create gallery styles
 * documentation: add info about what webgen does during a run (read files, create nodes, write nodes)
 * documentation: add a page about YAML and basic use
-* documentation: add a resource reference file with the table of resources
 * document: check for consistent naming (page files, tags,...)
 * document homepage structure (where is plugin docu, api docu,...)
 * document tag @processOutput changed to @process_output
@@ -374,3 +370,6 @@ W do not allow two or more page files in the same language, print warn
 * create a rake task for running webgen (like the rdoc task)
 * documentation: split getting started into basics and tutorial pages
 * make it possible to set meta information template to nil
+* check styles for correct selected menu items (due to new <span> element, e.g. andreas07)
+* change namespace of tag plugins from tags to tag
+* fix website styles menus to have a style for current menu item with <span> instead of <a>

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/data/webgen/gallery_styles/slides/collage.rb

@@ -1,10 +1,12 @@
-load_plugin 'webgen/plugins/filehandlers/filehandler'
-
 require 'rubygems'
 require 'RMagick'
 
+REF = self
+
 module Collage
 
+  include REF
+
   class Layouter < Webgen::Plugin
 
     infos( :name => 'GalleryLayouter/slides',
@@ -61,8 +63,7 @@ module Collage
 .thumb-#{collage_title(ginfo)} img:hover {
   border: 1px solid black;
 }
-
-}")
+")
     end
 
     #######
@@ -226,6 +227,7 @@ module Collage
 
     def write_node( node )
       return if File.exists?( node.full_path ) #TODO always create? what settings to check?
+      return if node.node_info[:data][:ginfo].galleries.length == 1
       create_collage( node )
       node.node_info[:collage].write( node.full_path )
     end
@@ -321,6 +323,7 @@ module Collage
 
     def write_node( node )
       return if File.exists?( node.full_path ) #TODO always create? what settings to check?
+      return if node.node_info[:data][:ginfo].galleries.length == 1
       ginfo = node.node_info[:data][:ginfo]
       ginfo[:collage_node].create_collage
       collage = ginfo[:collage_node].node_info[:collage]

data/data/webgen/sipttra_styles/default/README

@@ -0,0 +1,7 @@
+description:
+  This is the default style for layouting sipttra files. The design is similar
+  to the design of roadmap pages on trac installations. Make sure that
+  you have linked to the .css and .js files in your default.template!
+
+author:
+  Thomas Leitner

data/data/webgen/sipttra_styles/default/css/sipttra.rcss

@@ -0,0 +1,71 @@
+<%
+copen = "#e0baba"
+cclosed = "#bae0ba"
+%>
+
+div.milestone h2.milestone-name {
+  padding-bottom: 0px;
+  margin-bottom: 0px;
+  border-bottom: 1px solid gray;
+}
+
+div.milestone h2.milestone-name span {
+  font-size: 110%;
+}
+
+div.milestone p.milestone-info {
+  padding-top: 0px;
+  margin-top: 0px;
+}
+
+div.milestone div.milestone-summary {
+}
+
+div.milestone div.milestone-description {
+  padding-left: 20px;
+}
+
+div.milestone div.progress-info {
+  padding-left: 20px;
+}
+
+div.milestone div.progress-bar {
+  margin-top: 10px;
+  height: 20px;
+  width: 400px;
+  background-color: <%= copen %>;
+}
+
+div.milestone div.progress-indicator {
+  background-color: <%= cclosed %>;
+  height: 100%;
+  width: 0px;
+}
+
+div.milestone p.progress-text {
+  font-size: 60%;
+}
+
+div.milestone ul.assigned-tickets, div.milestone ul.sub-milestones {
+  display: none;
+}
+
+div.ticket table.tickets {
+  width: 100%;
+}
+
+div.ticket table.tickets tr {
+  background-color: <%= copen %>;
+}
+
+div.ticket table.tickets tr.header {
+  background-color: inherit;
+}
+
+div.ticket table.tickets tr.closed {
+  background-color: <%= cclosed %>;
+}
+
+div.ticket table.tickets div.ticket-description {
+  display: none;
+}

data/data/webgen/sipttra_styles/default/js/sipttra.js

@@ -0,0 +1,7 @@
+function toogle( element ) {
+  if (document.getElementById(element).style.display == "block") {
+    document.getElementById(element).style.display = "none";
+  } else {
+    document.getElementById(element).style.display = "block";
+  }
+}

data/data/webgen/sipttra_styles/default/sipttra.template

@@ -0,0 +1,105 @@
+--- content, html
+<% sipttra = node.node_info[:sipttra] %>
+
+<div class="sipttra">
+
+
+<h1>Milestones</h1>
+
+<% sipttra.milestones.each do |ms| %>
+
+<div class="milestone">
+
+<h2 class="milestone-name" id="ticket-<%= ms.name %>">Milestone: <span><%= ms.name %></span></h2>
+<p class="milestone-info">
+<% if ms.due_date %>Due on: <span class="date"><%= ms.due_date %></span><% else %>No due date<% end %>
+<% if ms.belongs_to %> | <% end %>
+<% if ms.belongs_to %>Belongs to milestone: <span class="belongs-to"><%= ms.belongs_to %></span><% end %>
+</p>
+
+
+<%
+  if ms.all_assigned_tickets.length > 0
+    closed = ms.all_assigned_tickets( :closed ).length
+    all = ms.all_assigned_tickets.length
+    percent = "%.2f" % (100 * closed.to_f / all)
+%>
+<div class="progress-info">
+<div class="progress-bar">
+  <div class="progress-indicator" style="width: <%= percent %>%"></div>
+</div>
+<p class="progress-text"><%= closed %> out of <%= all %> tickets (= <%= percent %>%) closed (including tickets in sub milestones)</p>
+</div>
+<% end %>
+
+
+<div class="milestone-summary"><%= CGI.escapeHTML(ms.summary) %></div>
+<% if !ms.description.to_s.empty? %>
+<p><b>Detailed description:</b></p>
+<div class="milestone-description"><%= sipttra.htmlize(ms.description) %></div>
+<% end %>
+
+<% if ms.assigned_tickets.length > 0 %>
+<p>Tickets directly assigned to milestone (<a href="javascript: toogle('assigned-tickets_<%= ms.name %>')">show/hide</a>):</p>
+<ul id="assigned-tickets_<%= ms.name %>" class="assigned-tickets">
+<% ms.assigned_tickets.each do |ticket| %>
+  <li>
+    <% if ticket.name.to_s.empty? %>
+    <a href='#category-<%= ticket.category.name %>'><%= CGI.escapeHTML(ticket.summary) %></a>
+    <% else %>
+    <a href='#ticket-<%= ticket.name %>'><%= ticket.name %>: <%= CGI.escapeHTML(ticket.summary) %></a>
+    <% end %>
+    <% if ticket.closed? %>(closed)<% end %>
+  </li>
+<% end %>
+</ul>
+<% end %>
+
+
+<% if ms.sub_milestones.length > 0 %>
+<p>Sub milestones (<a href="javascript: toogle('sub-milestones-<%= ms.name %>')">show/hide</a>):</p>
+<ul id="sub-milestones_<%= ms.name %>" class="sub-milestones">
+<% ms.sub_milestones.each do |sms| %>
+<li><a href='#ticket-<%= sms.name %>'><%= sms.name %></a> <% if sms.closed? %>(closed)<% end %></li>
+<% end %>
+</ul>
+<% end %>
+
+</div>
+
+<% end %>
+
+
+<h1>Tickets</h1>
+
+<% sipttra.category_names.each do |cat_name| %>
+
+<div class="ticket">
+
+<h2 id="category-<%= cat_name %>">Category: <%= cat_name %></h2>
+
+<table class='tickets'>
+  <tr class='header'><th>Name</th><th>Due&nbsp;Date</th><th>Belongs&nbsp;To</th><th>Text</th><th>Type</th></tr>
+
+<% sipttra.tickets_for_category( cat_name ).each do |ticket| %>
+  <tr class='<%= ticket.category.type %>'>
+    <td class='name'<%= ticket.name ? ' id="ticket-' + ticket.name + '"' : '' %>><%= ticket.name %></td>
+    <td class='due_date'><%= ticket.due_date %></td>
+    <td class='belongs_to'><a href='#ticket-<%= ticket.belongs_to %>'><%= ticket.belongs_to %></a></td>
+    <td class='text'>
+      <% if !ticket.description.empty? %><span style="float:right">(<a href="javascript: toogle('ticket-description-<%= ticket.hash.abs %>')">details</a>)</span><% end %>
+      <%= CGI.escapeHTML(ticket.summary) %>
+      <% if !ticket.description.empty? %><div class="ticket-description" id="ticket-description-<%= ticket.hash.abs %>"><%= BlueCloth.new(ticket.description).to_html %></div><% end %>
+    </td>
+    <td class='type'><%= ticket.category.type %></td>
+  </tr>
+<% end %>
+
+</table>
+
+</div>
+
+<% end %>
+
+
+</div>

data/data/webgen/website_styles/1024px/README

@@ -6,5 +6,8 @@ description:
 author:
   Andreas Viklund (adapted for webgen by Thomas Leitner)
 
+copyright:
+  http://andreasviklund.com/about/copyright/
+
 homepage:
   http://andreasviklund.com/templates

data/data/webgen/website_styles/1024px/default.css

@@ -12,7 +12,7 @@ margin:0 auto;
 padding:0;
 }
 
-a{
+a, #sidebar .webgen-menu span {
 text-decoration:none;
 color:#4088b8;
 font-weight:bold;
@@ -102,7 +102,7 @@ margin:0 0 4px 0;
 padding:0;
 }
 
-#sidebar li a{
+#sidebar li a, #sidebar li span {
 font-size:1.2em;
 font-weight:bold;
 padding:2px;
@@ -114,7 +114,7 @@ line-height:1.2em;
 padding:0;
 }
 
-#sidebar ul ul li a{font-weight:normal;}
+#sidebar ul ul li a, #sidebar ul ul li span {font-weight:normal;}
 #sidebar h2{margin:3px 0px 8px 0px;}
 
 /******** Content variations ********/

data/data/webgen/website_styles/andreas00/README

@@ -1,10 +1,13 @@
 description:
   Open source web design template by Andreas Viklund. Features a one-, two- or three-column
-  interface in white and grey with many predefined styles for menus, tables, forms, ... Have 
+  interface in white and grey with many predefined styles for menus, tables, forms, ... Have
   a look at the homepage to see the original template and what can be done with it.
 
 author:
   Andreas Viklund (adapted for webgen by Thomas Leitner)
 
+copyright:
+  http://andreasviklund.com/about/copyright/
+
 homepage:
   http://andreasviklund.com/templates

data/data/webgen/website_styles/andreas00/default.css

@@ -43,11 +43,11 @@ list-style:none;width:150px;margin:0 0 20px 0;padding:0;
 margin-bottom:5px;
 }
 
-#avmenu li a {
+#avmenu li a, #avmenu li span {
 font-weight:bold;height:20px;text-decoration:none;color:#505050;display:block;padding:6px 0 0 10px;background:#f4f4f4 url(images/menubg.gif) bottom left repeat-x;border-top:1px solid #d8d8d8;border-right:1px solid #d8d8d8;border-bottom:1px solid #d8d8d8;border-left:4px solid #cccccc;
 }
 
-#avmenu li a:hover, #avmenu li a.current, #avmenu li.webgen-menu-item-selected a {
+#avmenu li a:hover, #avmenu li a.current, #avmenu li.webgen-menu-item-selected a, #avmenu li.webgen-menu-item-selected span {
 background:#eaeaea url(images/menubg2.gif) bottom left repeat-x;color:#505050;border-top:1px solid #b0b0b0;border-right:1px solid #b0b0b0;border-bottom:1px solid #b0b0b0;border-left:4px solid #505050;
 }
 

data/data/webgen/website_styles/andreas01/README

@@ -7,5 +7,8 @@ description:
 author:
   Andreas Viklund (adapted for webgen by Thomas Leitner)
 
+copyright:
+  http://andreasviklund.com/about/copyright/
+
 homepage:
   http://andreasviklund.com/templates

data/data/webgen/website_styles/andreas01/default.css

@@ -124,7 +124,7 @@ line-height:1.4em;
 display:inline;
 }
 
-.webgen-menu ul li a {
+.webgen-menu ul li a, .webgen-menu ul li span {
 background-color:#f4f4f4;
 color:#505050;
 font-weight:bold;
@@ -136,7 +136,7 @@ border-left:4px solid #cccccc;
 text-decoration:none;
 }
 
-.webgen-menu ul li a:hover, .webgen-menu ul li.webgen-menu-item-selected a {
+.webgen-menu ul li a:hover, .webgen-menu ul li.webgen-menu-item-selected a, .webgen-menu ul li.webgen-menu-item-selected span {
 background-color:#eaeaea;
 border-left:4px solid #286ea0;
 color:#505050;
@@ -149,7 +149,7 @@ font-size:0.9em;
 width:125px;
 }
 
-.webgen-menu ul ul a {
+.webgen-menu ul ul a, .webgen-menu ul ul span {
 padding:3px 1px 3px 5px;
 width:115px;
 }

data/data/webgen/website_styles/andreas03/README

@@ -1,5 +1,5 @@
 description:
-  Open source web design template by Andreas Viklund. An accessible 2-column template in blue, grey 
+  Open source web design template by Andreas Viklund. An accessible 2-column template in blue, grey
   and white which loads fast and works in all common browsers. Would be a good one for a blog!
   Have a look at the available styles in the CSS file and visit the homepage to see the original
   template and what can be done with it.
@@ -7,5 +7,8 @@ description:
 author:
   Andreas Viklund (adapted for webgen by Thomas Leitner)
 
+copyright:
+  http://andreasviklund.com/about/copyright/
+
 homepage:
   http://andreasviklund.com/templates

data/data/webgen/website_styles/andreas03/default.css

@@ -129,7 +129,7 @@ margin: 0px;
 padding: 0px;
 }
 
-#sidebar .webgen-menu li a, .sidelink{
+#sidebar .webgen-menu li a, #sidebar .webgen-menu li span, .sidelink{
 display:block;
 width:140px;
 margin:3px 10px 2px 0;
@@ -145,7 +145,7 @@ border-bottom:1px solid #bbb;
 border-left:1px solid #ddd;
 }
 
-#sidebar .webgen-menu li a:hover, .sidelink:hover, .menuheader {
+#sidebar .webgen-menu li a:hover, #sidebar li.webgen-menu-item-selected a, #sidebar li.webgen-menu-item-selected span, .sidelink:hover, .menuheader {
 background:#fff url(images/gradient2.png) repeat-x;
 color:#222;
 border-top:1px solid #ddd;

data/data/webgen/website_styles/andreas04/README

@@ -8,5 +8,8 @@ description:
 author:
   Andreas Viklund (adapted for webgen by Thomas Leitner)
 
+copyright:
+  http://andreasviklund.com/about/copyright/
+
 homepage:
   http://andreasviklund.com/templates

data/data/webgen/website_styles/andreas04/default.css

@@ -101,7 +101,7 @@ margin: 0px;
 padding: 0px;
 }
 
-#menu a {
+#menu a, #menu span {
 margin:0;
 height:100px;
 padding:35px 6px 41px 6px;
@@ -111,7 +111,7 @@ letter-spacing:-1px;
 color: #888;
 }
 
-#menu a:hover {
+#menu a:hover, #menu li.webgen-menu-item-selected span, #menu li.webgen-menu-item-selected a {
 color:#269;
 text-decoration:none;
 background: #fff url(images/menuhover.png) repeat-x;

data/data/webgen/website_styles/andreas05/README

@@ -7,5 +7,8 @@ description:
 author:
   Andreas Viklund (adapted for webgen by Thomas Leitner)
 
+copyright:
+  http://andreasviklund.com/about/copyright/
+
 homepage:
   http://andreasviklund.com/templates

data/data/webgen/website_styles/andreas05/default.css

@@ -25,8 +25,8 @@ h2{font-size:1.6em; font-weight:normal; letter-spacing:-1px; margin:5px 0 10px;}
 
 /* Menu */
 #sidebar .webgen-menu ul {list-style-type: none; margin: 0px; padding: 0px;}
-#sidebar .webgen-menu a{border:1px solid #ffffff; color:#286ea0; display:block; font-size:1.1em; font-weight:bold; padding:4px 2px 4px 10px; width:110px;}
-#sidebar .webgen-menu a:hover{background-color:#f8f8f8; border:1px solid #dadada; color:#286ea0; text-decoration:none;}
+#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;}
+#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;}
 
 /* Various classes */
 .credits{color:#888; font-size:0.9em; margin-bottom:0;}