Changeset 10240
- Timestamp:
- 28 May 2013, 13:45:59 (12 years ago)
- Location:
- main/ngren.theme/trunk
- Files:
-
- 7 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
main/ngren.theme/trunk
-
Property
svn:mergeinfo
set to
/main/ngren.theme/branches/filip-fixes merged eligible /main/ngren.theme/branches/ulif-user-dropdown merged eligible
-
Property
svn:mergeinfo
set to
-
main/ngren.theme/trunk/ngren/theme/browser/configure.zcml
r10190 r10240 4 4 xmlns:plone="http://namespaces.plone.org/plone" 5 5 i18n_domain="ngren.theme"> 6 6 7 <include package="plone.app.contentmenu" /> 8 7 9 <interface 8 10 interface=".interfaces.IThemeSpecific" … … 55 57 <browser:viewlet 56 58 name="plone.slides_viewlet" 59 for="Products.CMFCore.interfaces.ISiteRoot" 57 60 manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle" 58 61 class=".slide.SlideViewlet" … … 62 65 <browser:viewlet 63 66 name="plone.featured_viewlet" 67 for="Products.CMFCore.interfaces.ISiteRoot" 64 68 manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle" 65 69 class=".featured.FeaturedViewlet" … … 69 73 <browser:viewlet 70 74 name="plone.banner_viewlet" 75 for="Products.CMFCore.interfaces.ISiteRoot" 71 76 manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle" 72 77 class=".banner.BannerViewlet" … … 96 101 permission="zope2.View" 97 102 /> 103 104 <browser:page 105 for="Products.CMFCore.interfaces.ISiteRoot" 106 name="frontpageview" 107 title="Frontpage View" 108 menu="plone_displayviews" 109 class=".frontpageview.FrontpageView" 110 permission="zope2.View" 111 layer=".interfaces.IThemeSpecific" 112 /> 113 98 114 </configure> -
main/ngren.theme/trunk/ngren/theme/browser/stylesheets/main.css
r10190 r10240 80 80 81 81 82 #viewlet-below-content{ 83 display:block; 84 clear:both; 85 } 86 #user-options{ 87 max-width:330px; 88 text-align:right; 89 } 90 91 92 .label:empty, .badge:empty { 93 display:inline-block; 94 } 95 96 #content div.newsImageContainer p.discreet { 97 background-color: rgba(40, 40, 40, 0.7); 98 color: White; 99 font-weight: bold; 100 left: 5px; 101 margin: 0; 102 padding: 0.5em; 103 position: relative; 104 top: -38px; 105 width: 189px; 106 } 107 82 108 83 109 /** responsive Banners **/ 110 @media(min-width:768px) and (max-width:979px){ 111 #user-options{ 112 max-width:100%; 113 width:auto; 114 text-align:right; 115 } 116 117 } 84 118 @media(max-width:767px){ 119 #user-options{ 120 max-width:100%; 121 width:auto; 122 text-align:right; 123 } 85 124 #partners-tile td { 86 125 display: block; -
main/ngren.theme/trunk/ngren/theme/ngren_theme/full.html
r10234 r10240 60 60 <h1><a href="home.html">Nigerian Research and<br/>Education Network</a></h1> 61 61 </div> 62 <div id="user-options"> 63 <ul> 64 <li><a href="example.html">Login</a></li> 65 <li><span class="separator">|</span></li> 66 <li><a href="example.html">Register</a></li> 67 </ul> 68 </div> 62 <div class="btn-group pull-right btn-small" 63 id="user-options"> 64 <a class="btn btn-small btn-primary" 65 href="#"> 66 <i class="icon-user icon-white"></i> 67 <span id="user-options-name"> 68 Username 69 </span> 70 </a> 71 <a class="btn btn-small btn-primary 72 dropdown-toggle" 73 data-toggle="dropdown" 74 href="#"> 75 <span class="caret"></span> 76 </a> 77 <ul class="dropdown-menu btn-small"> 78 <li><a href="#">Dashboard</a></li> 79 <li><a href="#">Logout</a></li> 80 </ul> 81 </div><!-- user-options --> 69 82 <form class="navbar-form pull-right"> 70 83 <input type="text" /> -
main/ngren.theme/trunk/ngren/theme/ngren_theme/rules.xml
r10191 r10240 6 6 xmlns:xi="http://www.w3.org/2001/XInclude"> 7 7 8 <theme href="home.html" css:if-content="body.section-front-page" /> 9 <theme href="example.html"/> 10 <notheme if="$ajax_load" /> 11 <!--<notheme if="contains($path, 'manage')"/>--> 12 <notheme if="contains($path, 'plugins')"/> 13 <notheme if="contains($path, 'querybuilder')"/> 14 <notheme if="contains($path, 'advanced/anchor.htm')"/> 15 <notheme if="contains($path, 'advanced/source_editor.htm')"/> 16 <notheme if-path="@@manage-viewlets" /> 8 <theme href="home.html" css:if-content="body.template-frontpageview" /> 9 <theme href="full.html" css:if-content="#portal-column-content.width-full"/> 10 <theme href="example.html"/> 11 <notheme if="$ajax_load" /> 12 <!--<notheme if="contains($path, 'manage')"/>--> 13 <notheme if="contains($path, 'plugins')"/> 14 <notheme if="contains($path, 'querybuilder')"/> 15 <notheme if="contains($path, 'advanced/anchor.htm')"/> 16 <notheme if="contains($path, 'advanced/source_editor.htm')"/> 17 <notheme if="contains($path, 'image_view_fullscreen')"/> 18 <notheme if-path="@@manage-viewlets" /> 17 19 18 19 <!-- Head -->20 <before content="/html/head/meta" css:theme="meta" />21 <replace theme="/html/head/title" content="/html/head/title"22 if-not-path="/" />23 <replace theme="/html/head/base" content="/html/head/base" />24 <append theme="/html/head" content="/html/head/script" />25 <append theme="/html/head" content="/html/head/link | /html/head/style" />26 27 28 <!-- Top / Header -->29 <copy attributes="href" css:content='#portal-logo' css:theme="#logo-container a" />30 20 31 <copy css:theme="#user-options ul"> 32 <xsl:for-each css:select="#portal-personaltools li"> 33 <xsl:if test="not(position()=last())"> 34 <xsl:copy-of select="." /> 35 </xsl:if> 36 </xsl:for-each> 37 </copy> 38 39 <replace css:theme=".navbar-form" css:content="#portal-searchbox form"/> 40 <drop css:content=".searchSection"/> 41 <drop css:content="#LSResult"/> 42 43 44 <replace css:theme-children="#menu-collapse .nav" css:content-children="#portal-globalnav"/> 45 <!-- Frontpage Content --> 46 <replace css:theme=".full-col" css:content=".full-col" css:if-content="body.section-front-page"/> 47 <replace css:theme=".rslides" css:content=".rslides"/> 48 <replace css:theme=".left-col" css:content=".left-col" css:if-content="body.section-front-page"/> 49 50 51 <replace css:theme-children=".right-col" css:content-children="#portal-column-two" css:if-not-content="body.section-front-page"/> 52 <replace css:theme-children=".right-col" css:content-children="#newsportlet" css:if-content="body.section-front-page"/> 53 54 55 <!-- Content --> 56 <before css:theme=".rslides_container" css:content="#edit-bar"/> 57 58 <copy css:theme=".content-container" css:content-children="#portal-column-content"/> 59 60 <!-- Footer --> 61 <replace css:theme=".section" css:content=".section"/> 62 21 <!-- Head --> 22 <before content="/html/head/meta" css:theme="meta" /> 23 <replace theme="/html/head/title" content="/html/head/title" 24 if-not-path="/" /> 25 <replace theme="/html/head/base" content="/html/head/base" /> 26 <append theme="/html/head" content="/html/head/script" /> 27 <append theme="/html/head" content="/html/head/link | /html/head/style" /> 28 29 30 <!-- Top / Header --> 31 <copy attributes="href" css:content='#portal-logo' css:theme="#logo-container a" /> 32 33 <!-- User options (upper right) --> 34 <!-- user name in options menu --> 35 <replace css:theme-children="#user-options-name" 36 css:content-children="#portal-personaltools li:nth-child(1) a" /> 37 <!-- href of username link --> 38 <copy attributes="href" 39 css:content="#portal-personaltools li:nth-child(1) a" 40 css:theme="#user-options a:nth-child(1)" /> 41 42 <!-- 2nd to last link of user options (separators filtered out) 43 These go into user options dropdown 44 --> 45 <copy css:theme="#user-options ul"> 46 <xsl:for-each css:select="#portal-personaltools li"> 47 <xsl:if test="not(position() mod 2 = 0)"> 48 <xsl:if test="not(position() = 1)"> 49 <xsl:copy-of select="." /> 50 </xsl:if> 51 </xsl:if> 52 </xsl:for-each> 53 </copy> 54 55 <replace css:theme=".navbar-form" css:content="#portal-searchbox form"/> 56 <drop css:content=".searchSection"/> 57 <drop css:content="#LSResult"/> 58 59 60 <replace css:theme-children="#menu-collapse .nav" 61 css:content-children="#portal-globalnav"/> 62 <!-- Frontpage Content --> 63 <replace css:theme=".full-col" css:content=".full-col" 64 css:if-content="body.template-frontpageview"/> 65 <replace css:theme=".rslides" css:content=".rslides"/> 66 <replace css:theme=".left-col" css:content=".left-col" 67 css:if-content="body.template-frontpageview"/> 68 69 70 <replace css:theme-children=".right-col" 71 css:content-children="#portal-column-two" 72 css:if-not-content="body.template-frontpageview"/> 73 <replace css:theme-children=".right-col" 74 css:content-children="#newsportlet" 75 css:if-content="body.template-frontpageview"/> 76 77 <!-- Content --> 78 <before css:theme=".rslides_container" css:content="#edit-bar"/> 79 80 <copy css:theme=".content-container" 81 css:content-children="#portal-column-content"/> 82 83 <!-- Footer --> 84 <replace css:theme=".footer .section" 85 css:content="#portal-footer-wrapper .section"/> 86 63 87 </rules> -
main/ngren.theme/trunk/ngren/theme/profiles/default/cssregistry.xml
r10190 r10240 10 10 enabled="1" expression=""/> 11 11 12 13 12 </object> -
main/ngren.theme/trunk/ngren/theme/profiles/default/types.xml
r10190 r10240 5 5 <object name="Featured" meta_type="Dexterity FTI" /> 6 6 <object name="Banner" meta_type="Dexterity FTI" /> 7 <object name="Plone_Site" meta_type="Factory-based Type Information with dynamic views"/> 7 8 </object> -
main/ngren.theme/trunk/ngren/theme/skins/ngren_theme_styles/public.css
r10190 r10240 480 480 font-weight: normal; 481 481 } 482 .suppressVisualEditor{ 483 margin-top:-1.8em !important; 484 padding-left:5px; 485 } 482 486 483 487 #content .visualHighlight { … … 1253 1257 select{ 1254 1258 width:170px; 1259 min-height: 30px; 1255 1260 } 1256 1261 .optionsToggle {
Note: See TracChangeset for help on using the changeset viewer.