Changeset 888


Ignore:
Timestamp:
05/16/12 00:54:57 (12 months ago)
Author:
brent
Message:

Updated version number, fixed colophon and footer, removed openocw cruft

Location:
4.0/enpraxis.educommons/trunk
Files:
1 deleted
8 edited
4 moved

Legend:

Unmodified
Added
Removed

  • 4.0/enpraxis.educommons/trunk/docs/HISTORY.txt

    r871 r888  
    11CHANGELOG 
    22========= 
     3 
     44.1.0 
     5----- 
     6  * Fixed bug where sometimes course materials would not re-order properly  
     7    [blambert555] 
     8  * Refactored collective.oaiintercom to bring it up to date and fix several  
     9    bugs [blambert555] 
     10  * Updated to most recent version of collective.contentlicensing [blambert555] 
     11  * Updated to most recent version of collective.zipfiletransport [blambert555] 
     12  * Fixed issue with zip file export so that ids rather than titles are used  
     13    as filenames by default. [blambert555] 
     14  * Refactored footer and colophon to have their own action lists, making  
     15    them easily configurable [blambert555] 
     16  * Moved login and personal tools to the footer, to make them less prominent  
     17    for end users, who don't benefit from looging in anyway [blambert555] 
    318 
    4194.0.2 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/colophon.pt

    r887 r888  
    22     metal:define-macro="colophon" 
    33     i18n:domain="plone"> 
    4 <metal:slot define-slot="colophon" /> 
    5 <div class="colophonWrapper"> 
    6 <ul id="portal-colophon-items"> 
    7   <li>Welcome Brent (manager)</li> 
    8   <li tal:repeat="action view/colophon_actions"> 
    9     <a href="" 
    10        tal:attributes="href action/url;" 
    11        tal:content="action/title">action title</a> 
    12   </li> 
    13 </ul> 
     4  <metal:slot define-slot="colophon" /> 
     5  <div class="colophonWrapper"> 
     6    <ul id="portal-colophon-items"> 
     7      <li tal:condition="not:view/anonymous">Welcome  
     8        <a href="" 
     9           tal:attributes="href view/homelink;" 
     10           tal:content="view/username">Bob</a></li> 
     11      <li tal:repeat="action view/colophon_actions"> 
     12        <a href="" 
     13           tal:attributes="href action/url;" 
     14           tal:content="action/title">action title</a> 
     15      </li> 
     16    </ul> 
     17    <tal:block 
     18       tal:replace="structure string:<!-- eduCommons version: ${view/version} -->" /> 
     19  </div> 
    1420</div> 
    15 </div> 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/colophon.py

    r887 r888  
    44from zope.component import getMultiAdapter 
    55from AccessControl import getSecurityManager 
     6from zope.component import getMultiAdapter 
     7from Products.CMFCore.utils import getToolByName 
    68 
    79 
    … …  
    911    """ Viewlet for eduCommons """ 
    1012 
    11     index = ViewPageTemplateFile('educommonscolophon.pt') 
     13    index = ViewPageTemplateFile('colophon.pt') 
    1214 
    1315    def update(self): 
    … …  
    1517                             name=u'plone_context_state') 
    1618        self.colophon_actions = cs.actions('eccolophon_actions') 
     19        self.portal_state = getMultiAdapter((self.context, self.request), 
     20                                            name=u'plone_portal_state') 
     21        qi = getToolByName(self.context, 'portal_quickinstaller') 
     22        self.version = qi.getProductVersion('enpraxis.educommons') 
     23        self.anonymous = self.portal_state.anonymous() 
     24        if self.anonymous: 
     25            self.username = None 
     26        else: 
     27            member = self.portal_state.member() 
     28            uname = self.getUserName(member) 
     29            roles = self.getRoles(member) 
     30            if roles: 
     31                self.username = '%s (%s)' %(uname, roles) 
     32            else: 
     33                self.username = uname 
     34            self.homelink = "%s/personalize_form" % ( 
     35                self.portal_state.navigation_root_url()) 
     36 
     37             
     38    def getUserName(self, member): 
     39        """ Get fullname of user or id """ 
     40        userid = member.getId() 
     41        ms = getToolByName(self.context, 'portal_membership') 
     42        minfo = ms.getMemberInfo(userid) 
     43        if minfo['fullname']: 
     44            username = minfo.get('fullname') 
     45        else: 
     46            username = userid 
     47        return username 
     48         
     49    def getRoles(self, member): 
     50        """ Get user roles """ 
     51        roles = '' 
     52        for x in member.getRoles(): 
     53            if x not in ['Authenticated', 'Member']: 
     54                if roles: 
     55                    roles += ', ' 
     56                roles += x 
     57        return roles 
     58 
     59    def getVersion(self): 
     60        """ Get the current version of eduCommons """ 
     61        import pdb; pdb.set_trace() 
     62        qi = getToolByName(self.context, 'portal_quickinstaller') 
     63        return qi.getProductVersion('enpraxis.educommons') 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/configure.zcml

    r887 r888  
    397397     name="eduCommons.footer" 
    398398     manager="plone.app.layout.viewlets.interfaces.IPortalFooter" 
    399      class=".educommonsfooter.eduCommonsFooterViewlet" 
     399     class=".footer.eduCommonsFooterViewlet" 
    400400     permission="zope2.View" 
    401401     /> 
    … …  
    404404     name="eduCommons.colophon" 
    405405     manager="plone.app.layout.viewlets.interfaces.IPortalFooter" 
    406      class=".educommonscolophon.eduCommonsColophonViewlet" 
     406     class=".colophon.eduCommonsColophonViewlet" 
    407407     permission="zope2.View" 
    408408     /> 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/footer.pt

    r887 r888  
    11<div id="portal-footer"> 
    2  
    32  <h5 class="hiddenStructure" i18n:translate="heading_educommons_footer">eduCommons footer</h5> 
    4  
    53    <ul id="portal-footer-items"> 
    64      <li tal:repeat="action view/footer_actions" 
    … …  
    119           i18n:translate="">action title</a> 
    1210      </li> 
    13     </ul><br /> 
    14  
     11    </ul> 
    1512</div> 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/footer.py

    r887 r888  
    99    """ Viewlet for eduCommons footer information """ 
    1010 
    11     index = ViewPageTemplateFile('educommonsfooter.pt') 
     11    index = ViewPageTemplateFile('footer.pt') 
    1212 
    1313    def update(self): 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/configure.zcml

    r864 r888  
    2222     directory="profiles/default" 
    2323     description="An OpenCourseWare content management extension for Plone." 
    24      provides="Products.GenericSetup.interfaces.EXTENSION" 
    25      /> 
    26  
    27   <genericsetup:registerProfile 
    28      name="openocw" 
    29      title="eduCommons OpenOCW" 
    30      directory="profiles/openocw" 
    31      description="Extension profile for eduCommons OpenOCW" 
    3224     provides="Products.GenericSetup.interfaces.EXTENSION" 
    3325     /> 
    … …  
    6153 
    6254  <genericsetup:upgradeStep 
    63      title="Migration :: 3.1.1 to 3.2.1" 
    64      description="Migrates eduCommons from version 3.1.1 to 3.2.1" 
    65      source="3.1.1" 
    66      destination="3.2.1" 
    67      handler=".upgrades.openocw.v3_1_1_to_3_2_1.migrate" 
    68      sortkey="1" 
    69      profile="enpraxis.educommons:openocw" /> 
    70  
    71   <genericsetup:upgradeStep 
    7255     title="Migration :: 3.0.2 to 3.1.0" 
    7356     description="Migrates eduCommons from version 3.0.2 to 3.1.0" 
    … …  
    7861     profile="enpraxis.educommons:default" /> 
    7962 
    80   <genericsetup:upgradeStep 
    81      title="Migration :: 3.0.2 to 3.1.0" 
    82      description="Migrates eduCommons from version 3.0.2 to 3.1.0" 
    83      source="3.0.2" 
    84      destination="3.1.0" 
    85      handler=".upgrades.openocw.v3_0_2_to_3_1_0.migrate" 
    86      sortkey="1" 
    87      profile="enpraxis.educommons:openocw" /> 
    88    
    8963  <subscriber 
    9064     for=".annotations.interfaces.IClearCopyrightable 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/actions.xml

    r887 r888  
    22<object name="portal_actions" meta_type="Plone Actions Tool" 
    33        xmlns:i18n="http://xml.zope.org/namespaces/i18n"> 
    4  
     4  <!-- Templates --> 
    55  <object name="template_buttons" meta_type="CMF Action Category"> 
    66    <property name="title"></property> 
    … …  
    136136    </object> 
    137137  </object> 
    138  
     138  <!-- object --> 
    139139  <object name="object" meta_type="CMF Action Category"> 
    140140    <property name="title"></property> 
    … …  
    177177    </object> 
    178178  </object> 
    179  
     179  <!-- document actions --> 
    180180  <object name="document_actions" meta_type="CMF Action"> 
    181181    <object name="rss" meta_type="CMF Action" i18n:domain="plone"> 
    … …  
    210210      <property name="icon_expr">string:extedit_icon.gif</property> 
    211211    </object> 
    212  
    213212    <object name="skinless" meta_type="CMF Action" i18n:domain="eduCommons"> 
    214213      <property name="title" i18n:translate="">Content View</property> 
    … …  
    234233    </object> 
    235234  </object> 
    236  
     235  <!-- folder buttons --> 
    237236  <object name="folder_buttons" meta_type="CMF Action Category"> 
    238   <object name="package_course" meta_type="CMF Action" i18n:domain="eduCommons"> 
    239    <property name="title" i18n:translate="">Package Course</property> 
    240    <property name="description" i18n:translate=""></property> 
    241    <property name="url_expr">string:@@package_course_view:method</property> 
    242    <property name="available_expr">python:object.Type() == 'Course' and object.portal_workflow.getInfoFor(object, 'review_state') == 'Published'</property> 
    243    <property name="icon_expr"></property> 
    244    <property name="permissions"> 
    245     <element value="Modify portal content"/> 
    246    </property> 
    247    <property name="visible">True</property> 
    248   </object> 
    249  
    250   <object name="change_copyright" meta_type="CMF Action" i18n:domain="eduCommons"> 
    251    <property name="title" i18n:translate="">Change Copyright</property> 
    252    <property name="description" i18n:translate=""></property> 
    253    <property name="url_expr">string:change_copyright:method</property> 
    254    <property name="icon_expr"></property> 
    255    <property name="permissions"> 
    256     <element value="Modify portal content"/> 
    257    </property> 
    258    <property name="visible">True</property> 
    259   </object> 
    260   <object name="chance_accessible_flag" meta_type="CMF Action" i18n:domain="plone"> 
    261    <property name="title" i18n:translate="">Accessibility</property> 
    262    <property name="description" i18n:translate=""></property> 
    263    <property name="url_expr">string:change_accessibility:method</property> 
    264    <property name="icon_expr"></property> 
    265    <property name="permissions"> 
    266     <element value="Modify portal content"/> 
    267    </property> 
    268    <property name="visible">True</property> 
    269   </object> 
    270   <object name="show_nav" meta_type="CMF Action" i18n:domain="eduCommons"> 
    271    <property name="title" i18n:translate="">Show in navigation</property> 
    272    <property name="description" i18n:translate=""></property> 
    273    <property name="url_expr">string:navigation_show:method</property> 
    274    <property name="available_expr">python:object.Type() not in  ['Division', 'Plone Site']</property> 
    275    <property name="icon_expr"></property> 
    276    <property name="permissions"> 
    277     <element value="Modify portal content"/> 
    278    </property> 
    279    <property name="visible">True</property> 
    280   </object> 
    281   <object name="remove_nav" meta_type="CMF Action" i18n:domain="eduCommons"> 
    282    <property name="title" i18n:translate="">Remove from navigation</property> 
    283    <property name="description" i18n:translate=""></property> 
    284    <property name="url_expr">string:navigation_remove:method</property> 
    285    <property name="available_expr">python:object.Type() not in  ['Division', 'Plone Site']</property> 
    286    <property name="icon_expr"></property> 
    287    <property name="permissions"> 
    288     <element value="Modify portal content"/> 
    289    </property> 
    290    <property name="visible">True</property> 
    291   </object> 
    292      
    293   </object> 
    294  
     237    <object name="package_course" meta_type="CMF Action" i18n:domain="eduCommons"> 
     238      <property name="title" i18n:translate="">Package Course</property> 
     239      <property name="description" i18n:translate=""></property> 
     240      <property name="url_expr">string:@@package_course_view:method</property> 
     241      <property name="available_expr">python:object.Type() == 'Course' and object.portal_workflow.getInfoFor(object, 'review_state') == 'Published'</property> 
     242      <property name="icon_expr"></property> 
     243      <property name="permissions"> 
     244        <element value="Modify portal content"/> 
     245      </property> 
     246      <property name="visible">True</property> 
     247    </object> 
     248    <object name="change_copyright" meta_type="CMF Action" i18n:domain="eduCommons"> 
     249      <property name="title" i18n:translate="">Change Copyright</property> 
     250      <property name="description" i18n:translate=""></property> 
     251      <property name="url_expr">string:change_copyright:method</property> 
     252      <property name="icon_expr"></property> 
     253      <property name="permissions"> 
     254        <element value="Modify portal content"/> 
     255      </property> 
     256      <property name="visible">True</property> 
     257    </object> 
     258    <object name="chance_accessible_flag" meta_type="CMF Action" i18n:domain="plone"> 
     259      <property name="title" i18n:translate="">Accessibility</property> 
     260      <property name="description" i18n:translate=""></property> 
     261      <property name="url_expr">string:change_accessibility:method</property> 
     262      <property name="icon_expr"></property> 
     263      <property name="permissions"> 
     264        <element value="Modify portal content"/> 
     265      </property> 
     266      <property name="visible">True</property> 
     267    </object> 
     268    <object name="show_nav" meta_type="CMF Action" i18n:domain="eduCommons"> 
     269      <property name="title" i18n:translate="">Show in navigation</property> 
     270      <property name="description" i18n:translate=""></property> 
     271      <property name="url_expr">string:navigation_show:method</property> 
     272      <property name="available_expr">python:object.Type() not in  ['Division', 'Plone Site']</property> 
     273      <property name="icon_expr"></property> 
     274      <property name="permissions"> 
     275        <element value="Modify portal content"/> 
     276      </property> 
     277      <property name="visible">True</property> 
     278    </object> 
     279    <object name="remove_nav" meta_type="CMF Action" i18n:domain="eduCommons"> 
     280      <property name="title" i18n:translate="">Remove from navigation</property> 
     281      <property name="description" i18n:translate=""></property> 
     282      <property name="url_expr">string:navigation_remove:method</property> 
     283      <property name="available_expr">python:object.Type() not in  ['Division', 'Plone Site']</property> 
     284      <property name="icon_expr"></property> 
     285      <property name="permissions"> 
     286        <element value="Modify portal content"/> 
     287      </property> 
     288      <property name="visible">True</property> 
     289    </object> 
     290  </object> 
    295291  <object name="other_options" meta_type="CMF Action Category"> 
    296292    <object name="search_and_replace" meta_type="CMF Action" i18n:domain="eduCommons"> 
    … …  
    344340        <element value="Modify portal content"/> 
    345341      </property> 
    346      <property name="visible">True</property> 
     342      <property name="visible">True</property> 
    347343    </object> 
    348344    <object name="export_wp" meta_type="CMF Action" i18n:domain="eduCommons"> 
    … …  
    355351        <element value="Modify portal content"/> 
    356352      </property> 
    357      <property name="visible">True</property> 
     353      <property name="visible">True</property> 
    358354    </object> 
    359355    <object name="studygroups" meta_type="CMF Action" i18n:domain="eduCommons"> 
    … …  
    368364    </object> 
    369365  </object> 
     366  <!-- Footer actions --> 
    370367  <object name="ecfooter_actions" meta_type="CMF Action Category"> 
    371368    <property name="title"></property> 
    … …  
    428425      <property name="visible">True</property> 
    429426    </object> 
     427  </object> 
     428  <!-- colophon actions --> 
     429  <object name="eccolophon_actions" meta_type="CMF Action Category"> 
     430    <property name="title"></property> 
    430431    <object name="login" meta_type="CMF Action" i18n:domain="plone"> 
    431432      <property name="title" i18n:translate="">Log in</property> 
    … …  
    451452      <property name="visible">True</property> 
    452453    </object> 
     454    <object name="deploy" meta_type="CMF Action" i18n:domain="staticsite"> 
     455      <property name="title" i18n:translate="">Deploy</property> 
     456      <property name="description" i18n:translate="">Deploy a static version of the Plone site.</property> 
     457      <property name="url_expr">string:${portal_url}/@@deployform</property> 
     458      <property name="permissions"> 
     459        <element value="Manage portal" /> 
     460      </property> 
     461      <property name="visible">False</property> 
     462    </object> 
    453463    <object name="logout" meta_type="CMF Action" i18n:domain="plone"> 
    454464      <property name="title" i18n:translate="">Log out</property> 
    … …  
    462472      <property name="visible">True</property> 
    463473    </object> 
    464   </object> 
    465   <object name="eccolophon_actions" meta_type="CMF Action Category"> 
    466     <property name="title"></property> 
     474    <object name="valid_xhtml" meta_type="CMF Action" i18n:domain="eduCommons"> 
     475      <property name="title" i18n:translate="">Validate XHTML</property> 
     476      <property name="description" i18n:translate=""></property> 
     477      <property 
     478         name="url_expr">string:http://validator.w3.org/check/referer</property> 
     479      <property name="icon_expr"></property> 
     480      <property name="available_expr"></property> 
     481      <property name="permissions"> 
     482        <element value="Modify portal content"/> 
     483      </property> 
     484      <property name="visible">False</property> 
     485    </object> 
     486    <object name="valid_css" meta_type="CMF Action" i18n:domain="eduCommons"> 
     487      <property name="title" i18n:translate="">Validate CSS</property> 
     488      <property name="description" i18n:translate=""></property> 
     489      <property 
     490         name="url_expr"></property> 
     491      <property name="icon_expr"></property> 
     492      <property name="available_expr"></property> 
     493      <property name="permissions"> 
     494        <element value="Modify portal content"/> 
     495      </property> 
     496      <property name="visible">False</property> 
     497    </object> 
    467498    <object name="poweredby_educommons" meta_type="CMF Action" i18n:domain="eduCommons"> 
    468499      <property name="title" i18n:translate="">Powered by eduCommons</property> 
    … …  
    470501      <property 
    471502         name="url_expr">string:http://educommons.com</property> 
    472       <property name="icon_expr"></property> 
    473       <property name="available_expr"></property> 
    474       <property name="permissions"> 
    475       <element value="View"/> 
    476       </property> 
    477       <property name="visible">True</property> 
    478     </object> 
    479     <object name="valid_xhtml" meta_type="CMF Action" i18n:domain="eduCommons"> 
    480       <property name="title" i18n:translate="">Valid XHTML</property> 
    481       <property name="description" i18n:translate=""></property> 
    482       <property 
    483          name="url_expr">string:http://validator.w3.org/check/referer</property> 
    484503      <property name="icon_expr"></property> 
    485504      <property name="available_expr"></property> 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/metadata.xml

    r887 r888  
    22<metadata> 
    33  <description>eduCommons</description> 
    4   <version>100</version> 
     4  <version>101</version> 
    55  <dependencies> 
    66    <dependency>profile-collective.plonebookmarklets:default</dependency> 
    … …  
    1919    <dependency>profile-Products.openstudy:default</dependency> 
    2020    <dependency>profile-Products.highlighter:default</dependency> 
     21    <dependency>profile-plone.app.caching:default</dependency> 
    2122  </dependencies> 
    2223</metadata> 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/eduCommonsContent.css.dtml

    r887 r888  
    1111    padding: 0 0 0 0; 
    1212    margin: -1px 0 0 -11px; 
     13} 
     14 
     15#portal-searchbox { 
     16    padding-top: 35px; 
     17} 
     18 
     19#portal-searchbox input.inputLabel { 
     20    border-radius: 5px 5px 5px 5px; 
     21    border-style: none; 
     22    height: 20px; 
    1323} 
    1424 
    … …  
    800810/* Default Plone utilizes display:table-row and table-cell, both of which don't work in IE7   */ 
    801811 
     812#portal-colophon { 
     813    padding: 0.5em; 
     814} 
     815 
    802816#portal-colophon-items li { 
    803817    display: inline; 
    … …  
    810824#portal-colophon-items li:last-child:after {  
    811825    content: ""; 
     826} 
     827 
     828#portal-footer { 
     829    padding: 0.5em; 
    812830} 
    813831 

  • 4.0/enpraxis.educommons/trunk/enpraxis/educommons/version.txt

    r871 r888  
    1 4.0.2 
     14.1.0 

  • 4.0/enpraxis.educommons/trunk/setup.py

    r871 r888  
    2323from setuptools import setup, find_packages 
    2424 
    25 version = '4.0.2' 
     25version = '4.1.0' 
    2626 
    2727setup(name='enpraxis.educommons', 
Note: See TracChangeset for help on using the changeset viewer.