r9425 - in apps/gobi/trunk: code/Page code/Page/skins code/TypeDefinition extensions/weblog/WeblogPosting

Author: hannes
Date: 2008-12-12 21:24:12 +0100 (Fri, 12 Dec 2008)
New Revision: 9425

Modified:
   apps/gobi/trunk/code/Page/PageCore.js
   apps/gobi/trunk/code/Page/skins/embed.skin
   apps/gobi/trunk/code/Page/skins/navigation.skin
   apps/gobi/trunk/code/Page/skins/stylesheet.skin
   apps/gobi/trunk/code/TypeDefinition/TypeDefinition.js
   apps/gobi/trunk/extensions/weblog/WeblogPosting/body.skin
   apps/gobi/trunk/extensions/weblog/WeblogPosting/weblogview.skin
Log:
Unify and improve rendering of embedded and listed pages.

Details at http://dev.helma.org/trac/helma/changeset/9425

Modified: apps/gobi/trunk/code/Page/PageCore.js
===================================================================
--- apps/gobi/trunk/code/Page/PageCore.js	2008-12-12 18:59:19 UTC (rev 9424)
+++ apps/gobi/trunk/code/Page/PageCore.js	2008-12-12 20:24:12 UTC (rev 9425)
@@ -811,6 +811,8 @@
         if (prop) {
             if (param.render) {
                 return WikiMarkup.renderAsString(prop, this, param);
+            } else if (param.as == "link") {
+                return this.getHtmlLink({text: prop});
             } else {
                 return prop;
             }

Modified: apps/gobi/trunk/code/Page/skins/embed.skin
===================================================================
--- apps/gobi/trunk/code/Page/skins/embed.skin	2008-12-12 18:59:19 UTC (rev 9424)
+++ apps/gobi/trunk/code/Page/skins/embed.skin	2008-12-12 20:24:12 UTC (rev 9425)
@@ -1,13 +1,19 @@
-<h3><% this.name
-  suffix=<% this.actionlink action="edit" 
-    prefix=" <span style='font-size: small; font-weight: normal;'>[" 
-    suffix="]</span>" %> %></h3>
+<h3>
+<% this.link %>
+<span class="editlink">
+<% this.actionlink action="edit" prefix=" [" suffix="]" %>
+</span>
+</h3>
+
 <% this.body format="plain" %>
 
 <% #sidebar --- subskin for embedding in sidebar ------------------- %>
 
-<div class="boxheader"><% this.name
-  suffix=<% this.actionlink action="edit"
-    prefix=" <span style='font-size: small; font-weight: normal;'>["
-    suffix="]</span>" %> %></div>
-<div class="box"><% this.body format="plain" size="small" %></div>
\ No newline at end of file
+<div class="boxheader">
+<% this.link %>
+<span class="editlink">
+<% this.actionlink action="edit" prefix=" [" suffix="]" %>
+</div>
+<div class="box">
+<% this.body format="plain" size="small" %>
+</div>
\ No newline at end of file

Modified: apps/gobi/trunk/code/Page/skins/navigation.skin
===================================================================
--- apps/gobi/trunk/code/Page/skins/navigation.skin	2008-12-12 18:59:19 UTC (rev 9424)
+++ apps/gobi/trunk/code/Page/skins/navigation.skin	2008-12-12 20:24:12 UTC (rev 9425)
@@ -12,3 +12,7 @@
         <% user userprefix="Logged in as " as="link" anonymous="" suffix=".<br />" %>
         <% this.loginlink login="Log in." logout="Log out." %>
        </div>
+
+<% #link ----------- navigation link ---------- %>
+
+       <a href="<% this.href %>" class="navlink-0"><% this.name %></a>
\ No newline at end of file

Modified: apps/gobi/trunk/code/Page/skins/stylesheet.skin
===================================================================
--- apps/gobi/trunk/code/Page/skins/stylesheet.skin	2008-12-12 18:59:19 UTC (rev 9424)
+++ apps/gobi/trunk/code/Page/skins/stylesheet.skin	2008-12-12 20:24:12 UTC (rev 9425)
@@ -16,8 +16,16 @@
   }
 
   h1, h2, h3 {
-      color: #669;
+      color: #333;
+      font-weight: bold;
   }
+
+  h1 a, h1 a:link, h1 a:visited,
+  h2 a, h2 a:link, h2 a:visited,
+  h3 a, h3 a:link, h3 a:visited {
+      color: #336;
+      text-decoration: none;      
+  }
   
   div.header {
       padding: 0;
@@ -247,8 +255,8 @@
   }
 
   .calSelected {
-    background-color: #dddddd;
-    border: 1px solid #dddddd;
+    background-color: #ddd;
+    border: 1px solid #ddd;
   }
 
   .calTable {
@@ -266,12 +274,18 @@
     border-style: none;
   }
   
-  .boxheader {
-    color: #000000;
+  .boxheader, .boxheader a {
+    color: #000;
     font-weight: bold;
     padding: 0;
-    border-bottom: 1px solid #dddddd;
+    text-decoration: none;
+    border-bottom: 1px solid #ddd;
   }
+
+  .editlink, .editlink a {
+    font-size: x-small;
+    font-weight: normal;
+  }
   
   .box a {
     text-decoration: none;  

Modified: apps/gobi/trunk/code/TypeDefinition/TypeDefinition.js
===================================================================
--- apps/gobi/trunk/code/TypeDefinition/TypeDefinition.js	2008-12-12 18:59:19 UTC (rev 9424)
+++ apps/gobi/trunk/code/TypeDefinition/TypeDefinition.js	2008-12-12 20:24:12 UTC (rev 9425)
@@ -6,6 +6,7 @@
     this.label = name;
     this.editor = editor;
     this.permission = permission;
-    if (defaultvalue != undefined && defaultvalue != "")
+    if (defaultvalue != undefined && defaultvalue != "") {
         this.defaultvalue = defaultvalue;
+    }
 }

Modified: apps/gobi/trunk/extensions/weblog/WeblogPosting/body.skin
===================================================================
--- apps/gobi/trunk/extensions/weblog/WeblogPosting/body.skin	2008-12-12 18:59:19 UTC (rev 9424)
+++ apps/gobi/trunk/extensions/weblog/WeblogPosting/body.skin	2008-12-12 20:24:12 UTC (rev 9425)
@@ -1,4 +1,4 @@
-<% this.form name="title" prefix="<h2>" suffix="</h2>" %>
+<h3><% this.form name="title" %></h3>
 
 <% this.body %>
 

Modified: apps/gobi/trunk/extensions/weblog/WeblogPosting/weblogview.skin
===================================================================
--- apps/gobi/trunk/extensions/weblog/WeblogPosting/weblogview.skin	2008-12-12 18:59:19 UTC (rev 9424)
+++ apps/gobi/trunk/extensions/weblog/WeblogPosting/weblogview.skin	2008-12-12 20:24:12 UTC (rev 9425)
@@ -1,9 +1,11 @@
-<% this.form name="title" prefix="<h3>" suffix="</h3>" %>
+<h3><% this.form name="title" as="link" %>
+<span class="editlink">
+<% this.actionlink action="edit" prefix="[" suffix="]" %>
+</span>
+</h3>
 
 <% this.body %>
 
 <div class="weblogFooter">
-  <% this.link action="main" text="link" suffix=" | " %>
-  <% this.link action="edit" text="edit" suffix=" | " %>
   <% this.creator %> <% this.createtime format="ago" %>
 </div>