Changeset 17124


Ignore:
Timestamp:
02/16/12 13:55:12 (2 years ago)
Author:
trs22
Message:
  • Brought portlet homepage in line with other homepages
  • Additional CSS tweaks
  • Extension homepage css tweaks.
Location:
agSciencesCollege/agCommon/branches/3.0.1
Files:
1 deleted
9 edited
1 moved

Legend:

Unmodified
Added
Removed
  • agSciencesCollege/agCommon/branches/3.0.1/__init__.py

    r17123 r17124  
    249249         
    250250                var homepageImage = jq('<div id="panorama-homepage-image"><!-- --></div>'); 
    251                  
     251                                 
    252252                homepageImage.insertBefore(portalColumns); 
    253253                 
     
    256256                homepageImage.css("paddingTop", backgroundHeights[randomnumber] + 'px'); 
    257257         
    258                 if (breadcrumbs) 
     258                if (breadcrumbs.length) 
    259259                { 
    260260                    breadcrumbs.detach(); 
    261261                    breadcrumbs.insertBefore(homepageImage); 
     262                } 
     263                else 
     264                { 
     265                    homepageImage.addClass("nobreadcrumbs"); 
    262266                } 
    263267            } 
  • agSciencesCollege/agCommon/branches/3.0.1/browser/configure.zcml

    r17123 r17124  
    181181    <browser:viewlet 
    182182        name="agcommon.homepageimage" 
    183         manager="plone.app.layout.viewlets.interfaces.IBelowContentTitle" 
     183        manager="plone.app.layout.viewlets.interfaces.IAboveContent" 
    184184        class=".viewlets.HomepageImageViewlet" 
    185185        layer=".interfaces.IThemeSpecific" 
     
    411411    /> 
    412412 
     413    <!-- Portlet Homepage View --> 
     414    <browser:page 
     415        for="*" 
     416        name="portlet_homepage_view" 
     417        class=".views.HomepageView" 
     418        template="templates/portlet_homepage_view.pt" 
     419        layer=".interfaces.IThemeSpecific" 
     420        permission="zope2.View" 
     421    /> 
     422 
     423    <browser:menuItem 
     424        for="Products.ATContentTypes.interface.IATDocument" 
     425        menu="plone_displayviews" 
     426        title="Portlet Homepage View" 
     427        action="@@portlet_homepage_view" 
     428        layer=".interfaces.IThemeSpecific" 
     429        description="Homepage View with contentwell portlets in the center." 
     430    /> 
     431 
    413432    <!-- Agenda View --> 
    414433    <browser:page 
  • agSciencesCollege/agCommon/branches/3.0.1/browser/templates/document_homepage_view.pt

    r17123 r17124  
    2222        <metal:js fill-slot="javascript_head_slot"> 
    2323            <!-- Homepage JavaScript --> 
    24             <script type = "text/javascript" src = "background-images/getHomepageImage.js"></script> 
     24            <script tal:condition="python:'background-images' in context.keys()"  
     25                    type="text/javascript"  
     26                    src="background-images/getHomepageImage.js"></script> 
    2527        </metal:js> 
    2628         
  • agSciencesCollege/agCommon/branches/3.0.1/browser/templates/portlet_homepage_view.pt

    r17097 r17124  
    66      metal:use-macro="here/main_template/macros/master" 
    77      i18n:domain="plone"> 
    8 <body> 
     8    <body> 
    99 
    10 <metal:css fill-slot="style_slot"> 
    11     <!-- Panorama Homepage CSS --> 
    12         <style type="text/css" media="all"  
    13                tal:content="string:@import url($portal_url/panorama_homepage.css);"> 
    14         </style> 
    15     <!-- Portlet Homepage CSS --> 
    16         <style type="text/css" media="all"  
    17                tal:content="string:@import url($portal_url/portlet_homepage.css);"> 
    18         </style> 
    19 </metal:css> 
     10        <metal:css fill-slot="style_slot"> 
    2011 
    21 <metal:main fill-slot="content-core"> 
    22     <tal:main-macro metal:define-macro="content-core" 
    23            tal:define="kssClassesView context/@@kss_field_decorator_view; 
    24                        getKssClasses nocall:kssClassesView/getKssClassesInlineEditable; 
    25                        templateId template/getId; 
    26                        text here/getText;"> 
     12            <!-- Common Homepage CSS --> 
     13            <style type="text/css" media="all"  
     14                    tal:content="string:@import url($portal_url/common-homepage.css);"> 
     15            </style> 
     16         
     17            <!-- Subsite CSS --> 
     18            <style type="text/css" media="all"  
     19                    tal:content="string:@import url($portal_url/subsite.css);"> 
     20            </style> 
     21             
     22            <!-- Panorama Homepage CSS --> 
     23            <style type="text/css" media="all"  
     24                   tal:content="string:@import url($portal_url/panorama_homepage.css);"> 
     25            </style> 
     26             
     27            <!-- Portlet Homepage CSS --> 
     28            <style type="text/css" media="all"  
     29                   tal:content="string:@import url($portal_url/portlet_homepage.css);"> 
     30            </style> 
     31        </metal:css> 
    2732 
    28         <tal:bodytext tal:condition="context/getText|nothing" tal:content="structure context/getText" /> 
     33        <metal:js fill-slot="javascript_head_slot"> 
     34            <!-- Panorama Homepage JavaScript --> 
     35            <script tal:condition="python:'background-images' in context.keys()"  
     36                    type="text/javascript"  
     37                    src="background-images/getPortletHomepageImage.js"></script> 
     38        </metal:js> 
    2939 
    30         <script tal:condition="python:'background-images' in context.keys()" type="text/javascript" src="background-images/getPortletHomepageImage.js"></script> 
     40        <metal:title fill-slot="content-title" tal:condition="not:view/hasDescriptionOrText"> 
    3141         
    32     </tal:main-macro> 
    33 </metal:main> 
     42            <h1 class="documentFirstHeading hiddenStructure">  
     43                <metal:field use-macro="python:context.widget('title', mode='view')"> 
     44                Title 
     45                </metal:field> 
     46            </h1> 
     47             
     48        </metal:title> 
     49         
     50        <metal:description fill-slot="content-description" tal:condition="not:view/hasDescriptionOrText">     
     51         
     52            <p class="documentDescription hiddenStructure" tal:condition="context/Description"> 
     53                <metal:field use-macro="python:context.widget('description', mode='view')"> 
     54                    Description 
     55                </metal:field> 
     56            </p> 
     57         
     58        </metal:description> 
    3459 
    35 </body> 
     60    </body> 
    3661</html> 
  • agSciencesCollege/agCommon/branches/3.0.1/browser/viewlets.py

    r17123 r17124  
    363363            self.link_mime_type = None 
    364364 
    365         # FB config %%% 
     365        # FB config 
    366366        self.fbadmins = ['100001031380608','9324502','9370853','1485890864'] 
    367367 
  • agSciencesCollege/agCommon/branches/3.0.1/profiles/default/viewlets.xml

    r17058 r17124  
    5151    <order manager="plone.abovecontent" skinname="agCommon"> 
    5252        <viewlet name="plone.path_bar" insert-before="*"/> 
    53         <viewlet name="collective.contentleadimage.header" insert-after="plone.path_bar"/> 
     53        <viewlet name="agcommon.homepageimage" insert-after="plone.path_bar" /> 
    5454    </order> 
    5555     
     
    6464 
    6565    <order manager="plone.belowcontenttitle" skinname="agCommon"> 
    66         <viewlet name="agcommon.homepageimage" insert-before="plone.belowcontenttitle.documentbyline"/> 
    6766        <viewlet name="plone.belowcontenttitle.keywords" insert-after="plone.belowcontenttitle.documentbyline"/> 
    6867    </order> 
     
    7271        <viewlet name="collective.contentleadimage.full" insert-after="contentwellportlets.portletsabovecontent"/> 
    7372        <viewlet name="agcommon.rightcolumn" insert-after="collective.contentleadimage.full" /> 
    74         <viewlet name="agcommon.centercolumn" insert-after="agcommon.rightcolumn" /> 
     73        <viewlet name="agcommon.homepage_text" insert-after="agcommon.rightcolumn" /> 
     74        <viewlet name="agcommon.centercolumn" insert-after="agcommon.homepage_text" /> 
    7575        <viewlet name="agcommon.tableofcontents" insert-after="*" /> 
    7676    </order> 
     
    110110    <hidden manager="plone.abovecontent" skinname="agCommon"> 
    111111        <viewlet name="plone.app.i18n.locales.languageselector" /> 
     112        <viewlet name="collective.contentleadimage.header"/> 
    112113    </hidden> 
    113114 
  • agSciencesCollege/agCommon/branches/3.0.1/skins/agcommon_styles/common-homepage.css.dtml

    r17123 r17124  
    8686#content #homepage-text { 
    8787    display: block; 
    88     margin: 0.6875em 0.9375em 0.375em 0.9375em; 
     88    margin: 0 0.9375em; 
     89    padding: 0.375em 0; 
    8990} 
    9091 
    9192#content #homepage-text .documentFirstHeading { 
    9293    font-size: 1.6875em; 
    93     margin-top: 0.25em; 
     94    margin-top: 0.1875em; 
    9495} 
    9596 
     
    197198} 
    198199 
    199 .agCommonPortlet .portletItem span.summary { 
     200.agCommonPortlet .portletItem .summary { 
    200201        color: #333333; 
    201202        font-size: 0.92em; 
     
    205206} 
    206207 
    207 .agCommonPortlet .portletItem span.date  { 
     208.agCommonPortlet .portletItem .date  { 
    208209        color: #76797C; 
    209210        font-size: 0.88em; 
     
    392393        font-weight: normal; 
    393394        font-size: 0.9375em; 
     395        text-align: right; 
    394396} 
    395397 
     
    414416} 
    415417 
    416 #rightcolumn dl.portletfeedmixer span.summary { 
     418#rightcolumn dl.portletfeedmixer .summary { 
    417419    line-height: 1.5em; 
    418420} 
  • agSciencesCollege/agCommon/branches/3.0.1/skins/agcommon_styles/extension.css.dtml

    r16817 r17124  
    4444body.section-front-page #portlets-above .portlet { 
    4545    min-height: 32em; 
     46    font-size: 0.84375em; 
    4647} 
    4748 
     
    5455} 
    5556 
    56 body.section-front-page #content div.documentDescription { 
    57     font-size: 1.5em; 
     57body.section-front-page #content #homepage-text { 
     58    margin: 0; 
     59    padding: 0; 
     60} 
     61 
     62body.section-front-page #content #homepage-text p.documentDescription { 
     63    font-size: 1.25em; 
    5864    margin: 0 0 0.25em 0; 
     65} 
     66 
     67body.section-front-page #content, 
     68body.section-front-page #portal-column-content.sr #content { 
     69    padding: 0.8125em 1.25em 0 1.25em !important; 
    5970} 
    6071 
  • agSciencesCollege/agCommon/branches/3.0.1/skins/agcommon_styles/homepage.css.dtml

    r17123 r17124  
    2020#homepageimage.nobreadcrumbs { 
    2121        margin-top: 0.1875em; 
    22 } 
    23  
    24 body.icons-on #homepageimage { 
    25     margin-top: 0; 
    2622} 
    2723 
  • agSciencesCollege/agCommon/branches/3.0.1/skins/agcommon_styles/panorama_homepage.css.dtml

    r17123 r17124  
    5454    border-style: solid; 
    5555    border-color: #808080; 
    56     margin-top: -1.75em; 
     56    margin-top: -1.6875em; 
     57} 
     58 
     59#panorama-homepage-image.nobreadcrumbs { 
     60    margin-top: 0; 
    5761} 
    5862 
Note: See TracChangeset for help on using the changeset viewer.