Changeset 63

Show
Ignore:
Timestamp:
06/02/06 03:35:17
Author:
sjudge
Message:

Fixed skin switching. Also need bindForgeSkin.py from other folder to be set as an external method... will document this.

Also added related software section to project view.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/PloneSoftwareCenter/skins/plonesoftwarecenter/browse.pt

    r61 r63  
    66 
    77<head> 
    8     <metal:css fill-slot="css_slot" tal:define="Forge python:request.traverse_subpath and request.traverse_subpath[0] or nothing;"> 
     8 
     9   <metal:top fill-slot="top_slot" tal:define="Forge python:request.traverse_subpath and request.traverse_subpath[0] or nothing;"> 
     10        <tal:forge condition="python:Forge=='Forge'"> 
     11             <tal:bind define="dummy python:here.bindForgeSkin()"/> 
     12        </tal:forge> 
     13 
     14        <tal:noborder condition="python:not user.has_permission('Modify portal content', context)"> 
     15            <tal:noborderset tal:define="dummy python:request.set('disable_border', 1)" /> 
     16        </tal:noborder> 
     17         
     18    </metal:top> 
     19 
     20    <metal:css fill-slot="css_slot" > 
    921      <style type="text/css" media="all" 
    1022             tal:content="string: @import url($portal_url/plonesoftwarecenter.css);"></style> 
    11       <style type="text/css" media="all" 
    12              tal:condition="python:Forge=='Forge'" 
    13              tal:content="string: @import url($portal_url/forge.css);"></style> 
    1423    </metal:css> 
    1524 
    1625    <metal:override fill-slot="column_two_slot" /> 
    1726 
    18     <metal:block fill-slot="top_slot"> 
    19       <tal:noborder condition="python:not user.has_permission('Modify portal content', context)"> 
    20         <tal:noborderset tal:define="dummy python:request.set('disable_border', 1)" /> 
    21       </tal:noborder> 
    22     </metal:block> 
    2327</head> 
    2428 
  • trunk/PloneSoftwareCenter/skins/plonesoftwarecenter/by-category.pt

    r61 r63  
    66 
    77<head> 
    8     <metal:top fill-slot="top_slot"> 
     8 
     9    <metal:top fill-slot="top_slot" tal:define="Forge python:request.traverse_subpath and request.traverse_subpath[0] or nothing;"> 
     10        <tal:forge condition="python:Forge=='Forge'"> 
     11             <tal:bind define="dummy python:here.bindForgeSkin()"/> 
     12        </tal:forge> 
     13 
    914        <tal:border define="dummy python:request.set('disable_border', 1)"/> 
    1015    </metal:top> 
    1116     
    12     <metal:css fill-slot="css_slot" tal:define="Forge python:request.traverse_subpath and request.traverse_subpath[0] or nothing;"
     17    <metal:css fill-slot="css_slot"
    1318      <style type="text/css" media="all" 
    1419             tal:content="string: @import url($portal_url/plonesoftwarecenter.css);"></style> 
    15       <style type="text/css" media="all" 
    16              tal:condition="python:Forge=='Forge'" 
    17              tal:content="string: @import url($portal_url/forge.css);"></style> 
    1820    </metal:css> 
    1921     
  • trunk/PloneSoftwareCenter/skins/plonesoftwarecenter/forge_product_view.pt

    r61 r63  
    66 
    77<head> 
     8 
     9   <metal:top fill-slot="top_slot"> 
     10        <tal:bind define="dummy python:here.bindForgeSkin()"/> 
     11    </metal:top> 
     12     
    813    <metal:css fill-slot="css_slot"> 
    914      <style type="text/css" media="all" 
    1015             tal:content="string: @import url($portal_url/plonesoftwarecenter.css);"></style> 
    11       <style type="text/css" media="all" 
    12              tal:content="string: @import url($portal_url/forge.css);"></style> 
    1316    </metal:css> 
     17 
    1418     
    1519</head> 
  • trunk/PloneSoftwareCenter/skins/plonesoftwarecenter/forge_view.pt

    r61 r63  
    66 
    77<head> 
     8 
     9    <metal:top fill-slot="top_slot"> 
     10        <tal:bind define="dummy python:here.bindForgeSkin()"/> 
     11 
     12      <tal:noborder condition="python:not user.has_permission('Modify portal content', context)"> 
     13        <tal:noborderset tal:define="dummy python:request.set('disable_border', 1)" /> 
     14      </tal:noborder> 
     15       
     16    </metal:top> 
     17 
    818    <metal:css fill-slot="css_slot"> 
    919      <style type="text/css" media="all" 
    1020             tal:content="string: @import url($portal_url/plonesoftwarecenter.css);"></style> 
    11       <style type="text/css" media="all" 
    12              tal:content="string: @import url($portal_url/forge.css);"></style> 
    13     </metal:css> 
     21     </metal:css> 
     22 
    1423    <metal:override fill-slot="column_two_slot" /> 
    1524 
    16     <metal:block fill-slot="top_slot"> 
    17       <tal:noborder condition="python:not user.has_permission('Modify portal content', context)"> 
    18         <tal:noborderset tal:define="dummy python:request.set('disable_border', 1)" /> 
    19       </tal:noborder> 
    20     </metal:block> 
    2125</head> 
    2226 
  • trunk/PloneSoftwareCenter/skins/plonesoftwarecenter/listing.pt

    r61 r63  
    66 
    77<head> 
    8     <metal:top fill-slot="top_slot"> 
     8    <metal:top fill-slot="top_slot" tal:define="Forge python:request.traverse_subpath and request.traverse_subpath[0] or nothing;"> 
     9        <tal:forge condition="python:Forge=='Forge'"> 
     10             <tal:bind define="dummy python:here.bindForgeSkin()"/> 
     11        </tal:forge> 
     12 
    913        <tal:border define="dummy python:request.set('disable_border', 1)"/> 
     14         
    1015    </metal:top> 
    11     <metal:css fill-slot="css_slot" tal:define="Forge python:request.traverse_subpath and request.traverse_subpath[0] or nothing;"
     16    <metal:css fill-slot="css_slot"
    1217      <style type="text/css" media="all" 
    1318             tal:content="string: @import url($portal_url/plonesoftwarecenter.css);"></style> 
    14       <style type="text/css" media="all" 
    15              tal:condition="python:Forge=='Forge'" 
    16              tal:content="string: @import url($portal_url/forge.css);"></style> 
    1719    </metal:css> 
     20 
    1821    <metal:override fill-slot="column_two_slot" /> 
    1922</head> 
  • trunk/PloneSoftwareCenter/skins/plonesoftwarecenter/psc_project_view.pt

    r61 r63  
    165165        <div class="visualClear"></div> 
    166166 
    167         <div:related tal:define="relatedSoftware here/getResourceSoftware" 
     167        <div tal:replace="structure here/getText" /> 
     168 
     169<tal:comment replace="nothing"> 
     170 XXX: FIXME 
     171 
     172        <h2 i18n:translate="heading_documentation">Documentation</h2> 
     173</tal:comment> 
     174 
     175        <div class="visualClear"></div> 
     176         
     177        <fieldset:related tal:define="relatedSoftware here/getResourceSoftware" 
    168178                     tal:condition="relatedSoftware"> 
    169179 
    170         <dl> 
    171             <dt class="portletHeader"><span i18n:translate="box_related_software">Related Software</span></dt> 
    172  
    173                 <dd class="portletItem odd" > 
     180        <h3 i18n:translate="box_related_software">Related OATS Software</h3> 
    174181                    <ul class="visualNoMarker"> 
    175182                        <li tal:repeat="related relatedSoftware"> 
    176183                            <a href="" 
    177                                tal:attributes="href string:${related/url}"> 
     184                               tal:attributes="href string:${related/absolute_url}"> 
    178185                               <img src="" alt="" 
    179                                     tal:attributes="src string:$portal_url/${related/icon};alt here/Title" /> 
    180                                &nbsp;<span tal:replace="related/title">Object related by keyword</span> 
     186                                    tal:attributes="src string:$portal_url/${related/icon};alt related/Title" /> 
     187                               &nbsp;<span tal:replace="related/Title">Object related by keyword</span> 
    181188                            </a> 
    182189                        </li> 
    183190                    </ul> 
    184                 </dd> 
    185         </dl> 
    186          
    187         </div:related> 
    188   
    189   
    190         <div tal:replace="structure here/getText" /> 
    191  
    192 <tal:comment replace="nothing"> 
    193  XXX: FIXME 
    194  
    195         <h2 i18n:translate="heading_documentation">Documentation</h2> 
    196 </tal:comment> 
     191        </fieldset:related> 
    197192 
    198193        <div class="visualClear"></div>