r9419 - apps/gobi/trunk/code/Page/skins
[email protected] Fri, 12 Dec 2008 15:17:51 +0100
Newsgroups
gmane.comp.java.helma.cvs
Message-ID
<[email protected] >
Author: hannes
Date: 2008-12-12 15:17:51 +0100 (Fri, 12 Dec 2008)
New Revision: 9419
Modified:
apps/gobi/trunk/code/Page/skins/controlbar.skin
apps/gobi/trunk/code/Page/skins/embed.skin
apps/gobi/trunk/code/Page/skins/navigation.skin
apps/gobi/trunk/code/Page/skins/page.skin
apps/gobi/trunk/code/Page/skins/stylesheet.skin
Log:
Design and style updates: Add embed#sidebar subskin for embedding pages into sidebar, embed navigation and updates pages in sidebar, move breadcrumb navigation into header again, remove unused calendar styles.
Details at http://dev.helma.org/trac/helma/changeset/9419
Modified: apps/gobi/trunk/code/Page/skins/controlbar.skin
===================================================================
--- apps/gobi/trunk/code/Page/skins/controlbar.skin 2008-12-12 14:15:17 UTC (rev 9418)
+++ apps/gobi/trunk/code/Page/skins/controlbar.skin 2008-12-12 14:17:51 UTC (rev 9419)
@@ -14,8 +14,3 @@
</table>
</div>
</div>
- <div class="body">
- <div class="breadcrumb">
- <% path as="link" separator=" › " minlength="2" maxlength="8" %>
- </div>
- </div>
Modified: apps/gobi/trunk/code/Page/skins/embed.skin
===================================================================
--- apps/gobi/trunk/code/Page/skins/embed.skin 2008-12-12 14:15:17 UTC (rev 9418)
+++ apps/gobi/trunk/code/Page/skins/embed.skin 2008-12-12 14:17:51 UTC (rev 9419)
@@ -3,3 +3,11 @@
prefix=" <span style='font-size: small; font-weight: normal;'>["
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
Modified: apps/gobi/trunk/code/Page/skins/navigation.skin
===================================================================
--- apps/gobi/trunk/code/Page/skins/navigation.skin 2008-12-12 14:15:17 UTC (rev 9418)
+++ apps/gobi/trunk/code/Page/skins/navigation.skin 2008-12-12 14:17:51 UTC (rev 9419)
@@ -1,7 +1,6 @@
- <div class="boxheader">navigation</div>
- <div class="box">
- <% include name="navigation" %>
- </div>
+ <% include name="/navigation" skin="embed#sidebar" %>
+
+ <% include name="/updates" skin="embed#sidebar" %>
<% services
prefix='<div class="boxheader">services</div>
Modified: apps/gobi/trunk/code/Page/skins/page.skin
===================================================================
--- apps/gobi/trunk/code/Page/skins/page.skin 2008-12-12 14:15:17 UTC (rev 9418)
+++ apps/gobi/trunk/code/Page/skins/page.skin 2008-12-12 14:17:51 UTC (rev 9419)
@@ -15,7 +15,7 @@
<% response.message prefix='<div class="message">' suffix='</div>' %>
<div class="body">
<div class="headerContent">
- <% root.name as="link" %>
+ <% path as="link" separator=" › " maxlength="6" %>
</div>
</div>
</div>
Modified: apps/gobi/trunk/code/Page/skins/stylesheet.skin
===================================================================
--- apps/gobi/trunk/code/Page/skins/stylesheet.skin 2008-12-12 14:15:17 UTC (rev 9418)
+++ apps/gobi/trunk/code/Page/skins/stylesheet.skin 2008-12-12 14:17:51 UTC (rev 9419)
@@ -34,14 +34,15 @@
.headerContent {
margin: auto;
- padding: 1.4em 0 0.7em 20px;
- font-size: 16px;
+ padding: 1.8em 0 1em 20px;
+ font-size: 1.1em;
font-weight: bold;
color: #669;
}
- .headerContent a, .headerContent a:visited, .breadcrumb a, .breadcrumb a:visited {
- color: #669;
+ .headerContent a, .headerContent a:visited, .headerContent a:link,
+ .breadcrumb a, .breadcrumb a:visited, .breadcrumb a:link {
+ color: #448;
text-decoration: none;
}
@@ -253,53 +254,12 @@
}
.calTable {
- float: left;
- margin-right: 2em;
}
.calDefault {
border: 1px solid #ffffff;
}
- .cal2Table {
- width: 100%;
- }
-
- .cal2Table th {
- font-size: 1.1em;
- padding-bottom: 0.4em;
- width: 14%;
- }
-
- .cal2Header {
- text-align: center;
- width: 14%;
- color: #666666;
- padding-bottom: 0.4em;
- }
-
- .cal2DayHeader {
- text-align: center;
- background-color: #cccccc;
- padding: 2px;
- width: 14%;
- }
-
- .cal2Highlighted {
- text-align: center;
- background-color: #999999;
- padding: 2px;
- width: 14%;
- }
-
- .cal2Default {
- vertical-align: top;
- background-color: #f0f0f0;
- height: 2.6em;
- padding: 3px;
- width: 14%;
- }
-
.box {
padding: 0.4em;
padding-left: 8px;