Ignore:
Timestamp:
28 May 2013, 13:45:59 (11 years ago)
Author:
uli
Message:

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

Location:
main/ngren.theme/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/ngren.theme/trunk

  • main/ngren.theme/trunk/ngren/theme/ngren_theme/rules.xml

    r10191 r10240  
    66    xmlns:xi="http://www.w3.org/2001/XInclude">
    77
    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" />
    1719
    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" />
    3020
    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
    6387</rules>
Note: See TracChangeset for help on using the changeset viewer.