Changeset 80

Show
Ignore:
Timestamp:
05/01/07 15:59:00
Author:
sjudge
Message:

Integrated changes made on the server (custom skin folder).

Started changes to add downloadPage field and display this as download. Not yet complete.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/OATSOFT/skins/oatsoft_forge_styles

    • Property svn:ignore set to *.bak

  • trunk/OATSOFT/skins/oatsoft_forge_styles/base_properties_forge.props

    r78 r80  
    1 # Please note that this approach will gradually be phased out, probably in 
    2 # Plone 3.0 or 3.5. Using DTML in CSS is something we want to stop doing. 
    3  
    41DEPRECATED:string=This approach is deprecated and will be phased out in Plone 3.0 or 3.5 
    5  
    6 title:string=Plone's color, font, logo and border defaults 
    7  
    8 plone_skin:string=Plone Default 
    9  
    10 logoName:string=Forgelogo.jpg 
    11  
    12 fontFamily:string="Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif 
     2OatsBackgroundColor:string=#eedddd 
     3OatsTabSize:string=150% 
     4backgroundColor:string=White 
     5borderStyle:string=solid 
     6borderStyleAnnotations:string=dashed 
     7borderWidth:string=1px 
     8columnOneWidth:string=16em 
     9columnTwoWidth:string=16em 
     10contentViewBackgroundColor:string=#d2b3bb 
     11contentViewBorderColor:string=#884455 
     12contentViewFontColor:string=#884455 
     13discreetColor:string=#884455 
     14evenRowBackgroundColor:string=#eedddd 
    1315fontBaseSize:string=69% 
    1416fontColor:string=#884455 
     17fontFamily:string="Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif 
    1518fontSmallSize:string=85% 
    16  
    17 backgroundColor:string=White 
    18  
     19globalBackgroundColor:string=#d2b3bb 
     20globalBorderColor:string=#884455 
     21globalFontColor:string=#884455 
     22headingFontFamily:string="Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif 
     23helpBackgroundColor:string=#eedddd 
     24inputFontColor:string=Black 
     25linkActiveColor:string=Blue 
    1926linkColor:string=#436976 
    20 linkActiveColor:string=Blue 
    2127linkVisitedColor:string=Purple 
    22  
    23 borderWidth:string=1px 
    24 borderStyle:string=solid 
    25 borderStyleAnnotations:string=dashed 
    26  
    27 globalBorderColor:string=#eedddd 
    28 globalBackgroundColor:string=#eedddd 
    29 globalFontColor:string=#884455 
    30  
    31 headingFontFamily:string="Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif 
    32  
    33 contentViewBorderColor:string=#eedddd 
    34 contentViewBackgroundColor:string=#eedddd 
    35 contentViewFontColor:string=#884455 
    36  
    37 inputFontColor:string=Black 
    38  
     28logoName:string=Forgelogo.jpg 
     29notifyBackgroundColor:string=#eedddd 
     30notifyBorderColor:string=#eedddd 
     31oddRowBackgroundColor:string=transparent 
     32plone_skin:string=Plone Default 
     33portalMinWidth:string=70em 
    3934textTransform:string=lowercase 
    40  
    41 evenRowBackgroundColor:string=#eedddd 
    42 oddRowBackgroundColor:string=transparent 
    43  
    44 notifyBorderColor:string=#eedddd 
    45 notifyBackgroundColor:string=#eedddd 
    46  
    47 discreetColor:string=#884455 
    48 helpBackgroundColor:string=#eedddd 
    49  
    50 portalMinWidth:string=70em 
    51 columnOneWidth:string=16em 
    52 columnTwoWidth:string=16em 
    53  
    54 OatsBackgroundColor:string=White 
    55 OatsTabSize:string=150% 
    56  
    57  
    58  
     35title:string=Plone's color, font, logo and border defaults 

  • trunk/OATSOFT/skins/oatsoft_styles/base_properties.props

    r78 r80  
    1 # Please note that this approach will gradually be phased out, probably in 
    2 # Plone 3.0 or 3.5. Using DTML in CSS is something we want to stop doing. 
    3  
    41DEPRECATED:string=This approach is deprecated and will be phased out in Plone 3.0 or 3.5 
    5  
    6 title:string=Plone's color, font, logo and border defaults 
    7  
    8 plone_skin:string=Plone Default 
    9  
    10 logoName:string=OATSlogo.jpg 
    11  
    12 fontFamily:string="Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif 
    13 fontBaseSize:string=69% 
    14 fontColor:string=#333333  
    15 fontSmallSize:string=85% 
    16  
     2OatsBackgroundColor:string=#D3E4DC 
     3OatsTabSize:string=150% 
    174backgroundColor:string=White 
    18  
    19 linkColor:string=#436976 
    20 linkActiveColor:string=Red 
    21 linkVisitedColor:string=Purple 
    22  
    23 borderWidth:string=1px 
    245borderStyle:string=solid 
    256borderStyleAnnotations:string=dashed 
    26  
    27 globalBorderColor:string=#8cacbb 
    28 globalBackgroundColor:string=#A3C6BD  
    29 globalFontColor:string=#436976 
    30  
    31 headingFontFamily:string="Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif 
    32  
    33 contentViewBorderColor:string=#436976 
    34 contentViewBackgroundColor:string=#A3C6BD 
    35 contentViewFontColor:string=#436976 
    36  
    37 inputFontColor:string=Black 
    38  
    39 textTransform:string=lowercase 
    40  
    41 evenRowBackgroundColor:string=#f7f9fa 
    42 oddRowBackgroundColor:string=transparent 
    43  
    44 notifyBorderColor:string=#ffa500 
    45 notifyBackgroundColor:string=#ffce7b 
    46  
    47 discreetColor:string=#76797c 
    48 helpBackgroundColor:string=#ffffe1 
    49  
    50 portalMinWidth:string=70em 
     7borderWidth:string=1px 
    518columnOneWidth:string=16em 
    529columnTwoWidth:string=16em 
    53  
    54 OatsBackgroundColor:string=#D3E4DC 
    55 OatsTabSize:string=150% 
    56  
    57  
    58  
     10contentViewBackgroundColor:string=#A3C6BD 
     11contentViewBorderColor:string=#436976 
     12contentViewFontColor:string=#436976 
     13discreetColor:string=#76797c 
     14evenRowBackgroundColor:string=#D3E4DC 
     15fontBaseSize:string=69% 
     16fontColor:string=#333333 
     17fontFamily:string="Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif 
     18fontSmallSize:string=85% 
     19globalBackgroundColor:string=#A3C6BD 
     20globalBorderColor:string=#8cacbb 
     21globalFontColor:string=#436976 
     22headingFontFamily:string="Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif 
     23helpBackgroundColor:string=#ffffe1 
     24inputFontColor:string=Black 
     25linkActiveColor:string=Red 
     26linkColor:string=#436976 
     27linkVisitedColor:string=Purple 
     28logoName:string=OATSlogo.jpg 
     29notifyBackgroundColor:string=#ffce7b 
     30notifyBorderColor:string=#ffa500 
     31oddRowBackgroundColor:string=transparent 
     32plone_skin:string=Plone Default 
     33portalMinWidth:string=70em 
     34textTransform:string=lowercase 
     35title:string=Plone's color, font, logo and border defaults 

  • trunk/OATSOFT/skins/oatsoft_styles/colophon.pt

    r47 r80  
    3333 
    3434      <p i18n:translate="text_conforms_to_standards" class="discreet"> 
    35         This site conforms to the Web Accessibility Initiative's Double <b>AA</b> standard, and other <span i18n:name="Standards"><a href="/Info/Project/Standards/">accessibility and design standards</a></span>. 
     35        This site conforms to the Web Accessibility Initiative's Double <b>AA</b> standard, and other <span i18n:name="Standards"><a href="/Info/Project/website/Standards/">accessibility and design standards</a></span>. 
    3636      </p> 
    3737 
    3838      <div id="hitcounter"> 
    39         <span class="hitcounter" 
    40               tal:define="count python:here.mxm_counter.count(here)"  > 
    41          <span class="hitcounter" 
    42               tal:condition="python:'Reviewer' in member.getRolesInContext(here) or 'Manager' in member.getRoles() or 'Owner' in member.getRolesInContext(here)"> 
    43               Hits: 
     39        <span class="hitcounter" tal:define="count python:here.mxm_counter.count(here)"  > 
     40         <span class="hitcounter" > 
     41              Hits: 
    4442         </span>       
    45          <span class="hitcounter" 
    46               tal:condition="python:'Reviewer' in member.getRolesInContext(here) or 'Manager' in member.getRoles() or 'Owner' in member.getRolesInContext(here)" 
    47               tal:content="python:'%06i' % count"> 
     43         <span class="hitcounter" tal:content="python:'%06i' % count"> 
    4844              0000001 
    4945         </span> 

  • trunk/OATSOFT/skins/oatsoft_styles/document_view.pt

    r44 r80  
    1313        </div> 
    1414 
    15        <div metal:use-macro="here/local_navigation/macros/navigationtop"> 
    16           up/next/previous links 
    17         </div> 
    18      
    1915        <h1 tal:content="object_title" class="documentFirstHeading"> 
    2016          Title or id 
    2117        </h1> 
    22      
    23         <div metal:use-macro="here/document_byline/macros/byline"> 
    24           Get the byline - contains details about author and modification date. 
    25         </div> 
    2618 
    2719        <p class="documentDescription" 
    …… 
    3022            Description 
    3123        </p> 
     24 
     25      <p/> 
    3226     
    3327        <p tal:condition="python: not text and is_editable" 
    …… 
    4842        </div> 
    4943     
    50        <div metal:use-macro="here/local_navigation/macros/navigation"> 
    51           up/next/previous links 
    52        </div> 
    53        <p/> 
    54        <div metal:use-macro="here/document_byline/macros/byline"> 
     44 
     45        <div metal:use-macro="here/document_byline/macros/byline"> 
    5546          Get the byline - contains details about author and modification date. 
    56        </div> 
     47        </div> 
     48 
    5749    </tal:main-macro> 
    5850</metal:main> 
    …… 
    6052</body> 
    6153</html> 
    62  

  • trunk/OATSOFT/skins/oatsoft_styles/footer.pt

    r44 r80  
    99<span i18n:translate="description_copyright" tal:omit-tag=""> 
    1010This website is and its visual design is Copyright &copy; 2004-<span i18n:name="current_year" tal:define="now modules/DateTime/DateTime" tal:content="now/year" /> 
    11 by <span i18n:name="OATS_Group"><a href="/">The OATS Project Consortium</a></span>. 
     11by <span i18n:name="OATS_Group"><a href="/Info/Project/OatsConsortium">The OATS Project Consortium</a></span>. 
     12</span> 
     13 
     14<br/> 
     15<span i18n:translate="description_ACE" tal:omit-tag=""> 
     16The OATS project is a collaborative project coordinated by the <a href="http://www.ace-centre.org.uk">ACE Centre</a>. 
    1217</span> 
    1318  

  • trunk/OATSOFT/skins/oatsoft_styles/global_searchbox.pt

    r44 r80  
    88    <form name="searchform" 
    99          action="search" 
    10           tal:define="livesearch site_properties/enable_livesearch|nothing" 
     10          tal:define="livesearch site_properties/enable_livesearch" 
    1111          tal:attributes="action string:${portal_url}/search; 
    1212                          onsubmit python:test(livesearch==True,'return liveSearchSubmit()','')" 
    …… 
    3333               type="submit" 
    3434               tabindex="" 
    35                value="Search" 
     35               value="Search Site" 
    3636               tal:attributes="tabindex tabindex/next" 
    3737               i18n:attributes="value label_search;" /> 

  • trunk/OATSOFT/skins/oatsoft_styles/local_navigation.pt

    r44 r80  
    55<a style="float:right" 
    66   href="#" 
    7    tal:condition="python:here.hasNext(here)" 
     7   tal:condition="python:here.hasNext(here) and here.nextTitle(here)" 
    88   tal:attributes="href python:here.nextUrl(here)" 
    99   tal:content="python:'>> '+here.nextTitle(here)+' >>'"> 
     10   tal:attributes="title python: here.nextTitle(here)" 
    1011   Next 
    1112</a> 
    1213 
    1314<a href="#" 
    14    tal:condition="python:here.hasPrevious(here)" 
     15   tal:condition="python:here.hasPrevious(here) and here.previousTitle(here)" 
    1516   tal:attributes="href python:here.previousUrl(here)" 
    1617   tal:content="python:'<< '+here.previousTitle(here)+' <<'"> 
     18   tal:attributes="title python: here.previousTitle(here)" 
    1719   Previous 
    1820</a> 
    …… 
    3335<a style="float:right" 
    3436   href="#" 
    35    tal:condition="python:here.hasNext(here)" 
     37   tal:condition="python:here.hasNext(here) and here.nextTitle(here)" 
    3638   tal:attributes="href python:here.nextUrl(here)" 
    3739   tal:content="python:'>> '+here.nextTitle(here)+' >>'"> 
     40   tal:attributes="title python: here.nextTitle(here)" 
    3841   Next 
    3942</a> 
    4043 
    4144<a href="#" 
    42    tal:condition="python:here.hasPrevious(here)" 
     45   tal:condition="python:here.hasPrevious(here) and here.previousTitle(here)" 
    4346   tal:attributes="href python:here.previousUrl(here)" 
    4447   tal:content="python:'<< '+here.previousTitle(here)+' <<'"> 
     48   tal:attributes="title python: here.previousTitle(here)" 
    4549   Previous 
    4650</a>