Changeset 36

Show
Ignore:
Timestamp:
07/11/05 02:07:45
Author:
sjudge
Message:

PSCProject.py - added Popoll as default content (generated for each project)....
schemata.py - removed isOATS - now using getOats_Status
forge_product_view.pt - changed to display forgecustom.css
psc_project_view.pt - cosmetic changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/OATSPSC/content/PSCProject.py

    r28 r36  
    7676        if not self.objectIds('PSCReleaseFolder'): 
    7777            self.invokeFactory('PSCReleaseFolder', config.RELEASES_ID) 
    78          
     78 
     79        #SETUP the default content of the Project Folder 
     80 
     81        self.invokeFactory(id='Poll', type_name='PlonePopoll', title=self.title_or_id()+' Poll') 
     82        poll = getattr(self, 'Poll') 
     83        poll.setPollOptions(question='How would you rate '+self.title_or_id()+' ?', choices=['1', '2', '3', '4', '5'], choices_number=1, check_multi=1) 
     84        poll.enable() 
     85        poll.setVisible() 
     86  
    7987        # if not self.objectIds('PSCImprovementProposalFolder'): 
    8088        #     self.invokeFactory('PSCImprovementProposalFolder', 

  • trunk/OATSPSC/content/schemata.py

    r33 r36  
    498498     ),     
    499499 
     500  BooleanField( 
     501        name='request_oats', 
     502        searchable=1, 
     503        default=0, 
     504        index='KeywordIndex:schema', 
     505         widget=BooleanWidget( 
     506            label="Would you like this project to be hosted on the OATS server?", 
     507            label_msgid="label_oats_project", 
     508            description="This would allow you access to: code versioning store (Subversion), project development tools (Trac) and a high visibility on this site.", 
     509            description_msgid="help_oats_project", 
     510            i18n_domain="plonesoftwarecenter", 
     511        ), 
     512     ),  
     513 
    500514   BooleanField( 
    501515        name='recommended', 
    …… 
    546560        ), 
    547561    ), 
    548  
    549   BooleanField( 
    550         name='request_oats', 
    551         searchable=1, 
    552         default=0, 
    553         index='KeywordIndex:schema', 
    554          widget=BooleanWidget( 
    555             label="Would you like this project to be hosted on the OATS server?", 
    556             label_msgid="label_oats_project", 
    557             description="This would allow you access to: code versioning store (Subversion), project development tools (Trac) and a high visibility on this site.", 
    558             description_msgid="help_oats_project", 
    559             i18n_domain="plonesoftwarecenter", 
    560         ), 
    561      ),  
    562  
    563 # Probably ditch this for the multivalued version (oats_status) 
    564  
    565    BooleanField( 
    566         name='oats', 
    567 #        accessor="isOats", 
    568         searchable=1, 
    569         default=0, 
    570         index='KeywordIndex:schema', 
    571         write_permission=CMFCorePermissions.ReviewPortalContent, 
    572         widget=BooleanWidget( 
    573             label="{REVIEWER ONLY} - Is this project hosted on the OATS server?", 
    574             label_msgid="label_oats_project", 
    575             description="If so, create the appropriate resources.", 
    576             description_msgid="help_oats_project", 
    577             i18n_domain="plonesoftwarecenter", 
    578         ), 
    579      ), 
    580562 
    581563    LinesField( 

  • trunk/OATSPSC/skins/plonesoftwarecenter/forge_product_view.pt

    r31 r36  
    99      <style type="text/css" media="all" 
    1010             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/customforge.css);"></style> 
    1113    </metal:css> 
     14     
    1215</head> 
    1316 
    1417<body> 
    1518 
     19 
     20 
    1621<div metal:fill-slot="main"> 
    1722 
    1823  <div metal:define-macro="main" tal:define="latestrelease here/getLatestRelease"> 
     24 
     25        <p class="portalMessage" 
     26           i18n:translate="description_cannot_add_before_approved" 
     27           tal:condition="python: is_editable and wtool.getInfoFor(here, 'review_state')!='published'"> 
     28           Thanks for submitting the project details, if a software release is avaliable for this project, please submit it. 
     29           When you have completed editing it, you must SUBMIT this project using the button above.  This project will then be reviewed by the OATS team before being published. 
     30        </p> 
    1931 
    2032        <h1 class="documentFirstHeading"> 
    …… 
    3345                This is a recommended project. 
    3446        </span> 
    35         <span class = "discreet" tal:condition="here/isOats"> 
     47         <span class = "discreet" tal:condition="python:here.getOats_status() == ('OATSProject',)"> 
     48 
    3649        <img tal:replace="structure here/forge_icon.gif" /> 
    3750                This is an OATS project. 
    38         </span></div> 
     51        </span> 
     52        </div> 
    3953 
    4054        <div style="float:right; margin: 1em 0 1em 1em; border: 1px solid black;" 
    …… 
    5266         
    5367        <div class="visualClear"></div> 
    54  
    55         <p class="portalMessage" 
    56            i18n:translate="description_cannot_add_before_approved" 
    57            tal:condition="python: is_editable and wtool.getInfoFor(here, 'review_state')!='published'"> 
    58            Thanks for submitting the project details, if a software release is avaliable for this project, please submit it. 
    59            When you have completed editing it, you must SUBMIT this project using the button above.  This project will then be reviewed by the OATS team before being published. 
    60         </p> 
    6168 
    6269        <tal:noreleases tal:condition="not:latestrelease"> 

  • trunk/OATSPSC/skins/plonesoftwarecenter/psc_project_view.pt

    r34 r36  
    1818  <div metal:define-macro="main" tal:define="latestrelease here/getLatestRelease"> 
    1919 
     20       <p class="portalMessage" 
     21           i18n:translate="description_cannot_add_before_approved" 
     22           tal:condition="python: is_editable and wtool.getInfoFor(here, 'review_state')!='published'"> 
     23           Thanks. For this project to be considered you <b>must SUBMIT it</b> using the 'submit' button above. 
     24           If a software release is avaliable for this project, please add it first, using the 'add release' button. 
     25           This project will then be reviewed by the OATS team before being published. 
     26        </p> 
     27 
    2028        <h1 class="documentFirstHeading"> 
    2129            <img tal:replace="structure here/product_icon.gif" /> 
    …… 
    2735        </div> 
    2836 
     37       <div class="discreet"> 
     38            Category: <span tal:replace="python: ', '.join(here.getCategoryTitles())" /> 
     39        </div> 
     40 
    2941        <div> 
    3042        <span class = "discreet" tal:condition="here/isRecommended"> 
    3143        <img tal:replace="structure here/recommend_icon.gif" /> 
    3244                This is a recommended project. 
    33         </span></div> 
     45<<<<<<< .mine 
     46        </span> 
     47        <span class = "discreet" tal:condition="python:here.getOats_status() == ('OATSProject',)"> 
     48 
     49        <img tal:replace="structure here/forge_icon.gif" /> 
     50                This is an OATS project. 
     51======= 
     52>>>>>>> .r35 
     53        </span> 
     54 
     55        </div> 
    3456 
    3557        <div style="float:right; margin: 1em 0 1em 1em; border: 1px solid black;" 
    …… 
    4870        <div class="visualClear"></div> 
    4971 
    50         <p class="portalMessage" 
    51            i18n:translate="description_cannot_add_before_approved" 
    52            tal:condition="python: is_editable and wtool.getInfoFor(here, 'review_state')!='published'"> 
    53            Thanks for submitting the project details, if a software release is avaliable for this project, please submit it. 
    54            When you have completed editing it, you must SUBMIT this project using the button above.  This project will then be reviewed by the OATS team before being published. 
    55         </p> 
    56  
    57          <tal:noreleases tal:condition="not:latestrelease"> 
     72            <tal:noreleases tal:condition="not:latestrelease"> 
    5873 
    5974            <p class="discreet" 
    6075               tal:condition="python:is_editable and wtool.getInfoFor(here, 'review_state')=='published'"> 
    6176                 <tal:noreleases i18n:translate="description_no_available_releases"> 
    62                     There are no published releases in this project yet. 
     77                    Sorry - there are no software releases for this project yet. 
    6378                 </tal:noreleases> 
    6479            </p> 
    …… 
    6782                <a i18n:translate="label_goto_release_folder" 
    6883                   tal:attributes="href string:$here_url/releases"> 
    69                   Go to the release folder to add or publish a release. 
     84                  Go to the spoftware release folder to add or publish a software release. 
    7085                </a> 
    7186            </p> 
    …… 
    123138 
    124139        <div class="visualClear"></div> 
    125  
    126         <h2>Project Description</h2> 
    127  
    128         <div class="discreet"> 
    129             Category: <span tal:replace="python: ', '.join(here.getCategoryTitles())" /> 
    130         </div> 
     140  
    131141         
    132142        <fieldset style="float: right; margin-left: 0.5em; margin-top: 0;"> 
    133             <legend>Additional resources</legend> 
     143            <legend>Help, Support & Additional resources</legend> 
    134144 
    135145            <ul style="list-style-type: none; list-style-image: none; margin-left: 0;"> 
    …… 
    187197                       class="link-plain" 
    188198                       title="A place to submit bug reports and feature requests for this project" 
    189                        tal:attributes="href here/getTracker">Issue tracker</a> 
     199                       tal:attributes="href here/getTracker">Bug Tracker</a> 
    190200                </li> 
    191201 
    …… 
    196206                       class="link-plain" 
    197207                       title="Support options for this product" 
    198                        tal:attributes="href here/getMailingList">Support</a> 
     208                       tal:attributes="href here/getMailingList">Online Support</a> 
    199209                </li> 
    200210     
    …… 
    206216        <div tal:replace="structure here/getText" /> 
    207217 
    208        <div class="visualClear"></div> 
    209  
    210         <h2>Need help, support, want to contribute?</h2> 
    211  
    212          <p>If you would like support, you can contact the MAILING LIST (LINK), if you have found a problem (bug) then you can SUBMIT IT.....   </p>     
    213  
    214           
    215218 
    216219<tal:comment replace="nothing"> 

  • trunk/OATSPSC/version.txt

    r33 r36  
    1 1.0 beta 7 - OATS beta 33 
    2  
    3 Changes to schema and plonesoftwarecentre in order to sort out viewing Forge projects... using oats_status 
     11.0 beta 7 - OATS beta 36