Changeset 35 for waeup_cms/trunk/skins

Timestamp:

3 Oct 2005, 07:22:01 (19 years ago)

Author:

Henrik Bettermann

Message:

 

Location:

waeup_cms/trunk/skins/WAEUP

Files:

• base_properties.props (modified) (1 diff)
• favicon.ico (added)
• global_logo.pt (added)
• logo.gif (added)
• logo_left.gif (added)
• logo_old.jpg (added)
• logo_right.gif (added)
• main_template.pt (modified) (4 diffs)
• recentchangesdtml.dtml (added)
• revision_workflow.py (added)
• waeup.css.dtml (modified) (2 diffs)

waeup_cms/trunk/skins/WAEUP/base_properties.props

@@ -23 +23 @@
 linkColor:string=#00097C
 linkVisitedColor:string=#00097C
-logoName:string=logo.jpg
+logoName:string=logo.gif
+logoNameLeft:string=logo_left.gif
+logoNameRight:string=logo_right.gif
 notifyBackgroundColor:string=#ffce7b
 notifyBorderColor:string=#ffa500

waeup_cms/trunk/skins/WAEUP/main_template.pt

@@ -57 +57 @@
              i18n:translate="label_skiptonavigation">Skip to navigation</a>
 
-             <div metal:use-macro="here/global_siteactions/macros/site_actions">
-               Site-wide actions (Contact, Sitemap, Help, Style Switcher etc)
-             </div>
-
-             <div metal:use-macro="here/global_searchbox/macros/quick_search">
-               The quicksearch box, normally placed at the top right
-             </div>
-
-             <a metal:use-macro="here/global_logo/macros/portal_logo">
-               The portal logo, linked to the portal root
-             </a>
-
           </div>
 
-           <div metal:use-macro="here/global_pathbar/macros/path_bar">
-             The breadcrumb navigation ("you are here")
-           </div>
+
       </div>
 
@@ -91 +77 @@
                 metal:define-slot="column_one_slot"
                 tal:condition="sl">
+
+             <div class="LogoLeft">
+             <a metal:use-macro="here/global_logo/macros/portal_logo_left">
+               The portal logo, linked to the portal root
+             </a>
+             </div>
+
+             <div class="visualClear" id="portal-breadcrumbs">
+               &nbsp;
+             </div>
+
               <div class="visualPadding">
                 <metal:portlets define-slot="portlets_one_slot">
@@ -106 +103 @@
                 tal:define="tabindex python:Iterator(pos=0)">
 
+             <div class="LogoRight">
+             <a metal:use-macro="here/global_logo/macros/portal_logo_right">
+               The portal logo, linked to the portal root
+             </a>
+             </div>
+
+             <div class="visualClear">
+               <div metal:use-macro="here/global_pathbar/macros/path_bar">
+                 The breadcrumb navigation ("you are here")
+               </div>
+             </div>
+
+             <div metal:use-macro="here/global_siteactions/macros/site_actions">
+               Site-wide actions (Contact, Sitemap, Help, Style Switcher etc)
+             </div>
+
+             <div metal:use-macro="here/global_searchbox/macros/quick_search">
+               The quicksearch box, normally placed at the top right
+             </div>
+
+
               <metal:block define-slot="content">
                 <div id="content"
@@ -154 +172 @@
                 metal:define-slot="column_two_slot"
                 tal:condition="sr">
+
               <div class="visualPadding">
                 <metal:portlets define-slot="portlets_two_slot">

waeup_cms/trunk/skins/WAEUP/waeup.css.dtml

@@ -17 +17 @@
 /* In public.css */
 
+
+#portal-logo_left {
+    background: url(&dtml-portal_url;/&dtml-logoNameLeft;) no-repeat;
+    border: 0;
+    margin: 0;
+    padding: 0;
+    float: right;
+}
+
+#portal-logo_left a {
+    display: block;
+    text-decoration: none;
+    overflow: hidden;
+    border: 0;
+    margin: 0;
+    padding: 0;
+    padding-top: <dtml-var "_[logoNameLeft].height">px;
+    height: 0px !important;
+    height /**/: <dtml-var "_[logoNameLeft].height">px;
+    width: <dtml-var "_[logoNameLeft].width">px;
+    cursor: pointer;
+}
+
+#portal-logo_right {
+    background: url(&dtml-portal_url;/&dtml-logoNameRight;) no-repeat;
+    border: 0;
+    margin: 0;
+    padding: 0;
+    float: left;
+}
+
+#portal-logo_right a {
+    display: block;
+    text-decoration: none;
+    overflow: hidden;
+    border: 0;
+    margin: 0;
+    padding: 0;
+    padding-top: <dtml-var "_[logoNameRight].height">px;
+    height: 0px !important;
+    height /**/: <dtml-var "_[logoNameRight].height">px;
+    width: <dtml-var "_[logoNameRight].width">px;
+    cursor: pointer;
+}
+
+.LogoLeft {
+    margin-top: 0.75em;
+}
+
+.LogoRight {
+    margin-top: 0.75em;
+    margin-left: 1.6em;
+}
+
+#portal-searchbox {
+    float: right;
+    clear: right;
+    background-color: transparent;
+    margin: 1.5em 0 0 0;
+    padding: 0 2em 0 0;
+    text-align: right;
+    text-transform: &dtml-textTransform;;
+    white-space: nowrap;
+    z-index: 2;
+    position  :absolute;
+    right    : 12px;
+    top: 20px
+}
+
+#portal-siteactions {
+    background-color: transparent;
+    white-space: nowrap;
+    list-style-image: none;
+    list-style-type: none;
+    margin: 1px 0 0 0;
+    height: auto;
+    line-height: normal;
+    float: right;
+    padding: 3px 2em 3px 0;
+    position  :absolute;
+    right    : 10px;
+    top: 0px
+}
+
+
 #portal-breadcrumbs {
     /* The path bar, including breadcrumbs and add to favorites */
@@ -23 +108 @@
     border-bottom-width: &dtml-borderWidth;;
     border-bottom: none;
-    padding-left: 3em;
-    padding-right: 2em;
+    padding: 0em;
+    margin-left: 2.2em;
     text-transform: &dtml-textTransform;;
     line-height: 1.6em;