Changeset 10240 for main/ngren.theme/trunk/ngren/theme/browser

Timestamp:

28 May 2013, 13:45:59 (12 years ago)

Author:

uli

Message:

Merge changes from filip-fixes and ulif-user-dropdown back into trunk.

Location:

main/ngren.theme/trunk

Files:

• . (modified) (1 prop)
• ngren/theme/browser/configure.zcml (modified) (5 diffs)
• ngren/theme/browser/frontpageview.py (copied) (copied from main/ngren.theme/branches/filip-fixes/ngren/theme/browser/frontpageview.py)
• ngren/theme/browser/stylesheets/main.css (modified) (1 diff)
• ngren/theme/browser/templates/frontpageview.pt (copied) (copied from main/ngren.theme/branches/filip-fixes/ngren/theme/browser/templates/frontpageview.pt)

main/ngren.theme/trunk/ngren/theme/browser/configure.zcml

@@ -4 +4 @@
     xmlns:plone="http://namespaces.plone.org/plone"
     i18n_domain="ngren.theme">
-
+    
+  <include package="plone.app.contentmenu" />
+  
   <interface
       interface=".interfaces.IThemeSpecific"
@@ -55 +57 @@
    <browser:viewlet
         name="plone.slides_viewlet"
+        for="Products.CMFCore.interfaces.ISiteRoot"
         manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle"
         class=".slide.SlideViewlet"
@@ -62 +65 @@
    <browser:viewlet
         name="plone.featured_viewlet"
+        for="Products.CMFCore.interfaces.ISiteRoot"
         manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle"
         class=".featured.FeaturedViewlet"
@@ -69 +73 @@
    <browser:viewlet
         name="plone.banner_viewlet"
+        for="Products.CMFCore.interfaces.ISiteRoot"
         manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle"
         class=".banner.BannerViewlet"
@@ -96 +101 @@
         permission="zope2.View"
         /> 
+        
+ <browser:page
+    for="Products.CMFCore.interfaces.ISiteRoot"
+    name="frontpageview"
+    title="Frontpage View"
+    menu="plone_displayviews"
+    class=".frontpageview.FrontpageView"
+    permission="zope2.View"
+    layer=".interfaces.IThemeSpecific"
+    />        
+        
 </configure>

main/ngren.theme/trunk/ngren/theme/browser/stylesheets/main.css

@@ -80 +80 @@
 
 
+#viewlet-below-content{
+        display:block;
+        clear:both;
+}
+#user-options{
+        max-width:330px;
+        text-align:right;
+}
+
+
+.label:empty, .badge:empty {
+        display:inline-block;
+}
+
+#content div.newsImageContainer p.discreet {
+    background-color: rgba(40, 40, 40, 0.7);
+    color: White;
+    font-weight: bold;
+    left: 5px;
+    margin: 0;
+    padding: 0.5em;
+    position: relative;
+    top: -38px;
+    width: 189px;
+}
+
 
 /** responsive Banners **/
+@media(min-width:768px) and (max-width:979px){
+#user-options{
+                max-width:100%;
+                width:auto;
+                text-align:right;
+        }
+
+}
 @media(max-width:767px){
+        #user-options{
+                max-width:100%;
+                width:auto;
+                text-align:right;
+        }
         #partners-tile td {
                 display: block;