Changeset 884

Timestamp:

11/28/11 17:31:18 (6 months ago)

Author:

brent

Message:

Fixed course summary pages when the bar is clicked on.

Location:

4.0/enpraxis.educommons/trunk/enpraxis/educommons

Files:

• annotations/configure.zcml (modified) (1 diff)
• browser/accessibilityview.py (modified) (1 diff)
• browser/copyrightview.py (modified) (1 diff)
• browser/summarycontents.py (modified) (3 diffs)
• browser/summary_table.pt (modified) (3 diffs)
• portlet/courseinfo.pt (modified) (1 diff)
• profiles/default/catalog.xml (modified) (1 diff)

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

@@ -26 +26 @@
      />
 
-  <adapter name="getClearCopyright" 
+  <adapter name="getCopyrightCleared" 
            factory=".indexers.getCopyrightCleared" />
 
-  <adapter name="getAaccessibilityCompliant"
+  <adapter name="getAccessibilityCompliant"
            factory=".indexers.getAccessibilityCompliant" />
 

4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/accessibilityview.py

@@ -37 +37 @@
                 access.accessible = True
                 message=_(u'Accessibility Compliant set to True')
+                self.context.reindexObject()
             elif 'False' == value and access.accessible:
                 access.accessible = False
                 message=_(u'Accessibility Compliant set to False')
+                self.context.reindexObject()
         return message
 

4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/copyrightview.py

@@ -37 +37 @@
                 clear.clearedcopyright = True
                 message = _(u'Copyright Cleared')
+                self.context.reindexObject()
             elif 'False' == value and clear.clearedcopyright:
                 clear.clearedcopyright = False
                 message = _(u'Copyright Revoked')
+                self.context.reindexObject()
         return message
 

4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/summarycontents.py

@@ -34 +34 @@
 
 
-
 class SummaryContentsView(FolderContentsView):
     """
@@ -58 +57 @@
     """                
 
-
-    def __init__(self, context, request, contentFilter={}):
+    def __init__(self, context, request, contentFilter=None):
         """
         Initialize the table
@@ -71 +69 @@
                            buttons=self.buttons)
 
-    @property
-    def items(self):
-        """
-        """
-        plone_utils = getToolByName(self.context, 'plone_utils')
-        plone_view = getMultiAdapter((self.context, self.request), name=u'plone')
-        portal_workflow = getToolByName(self.context, 'portal_workflow')
-        portal_properties = getToolByName(self.context, 'portal_properties')
-        site_properties = portal_properties.site_properties
-        
-        use_view_action = site_properties.getProperty('typesUseViewActionInListings', ())
-        browser_default = self.context.browserDefault()
-       
-
-        contentsMethod = self.context.queryCatalog
-       
-        results = list()
-        for i, obj in enumerate(contentsMethod(self.contentFilter)):
-            if i % 2 == 0:
-                table_row_class = "draggable even"
-            else:
-                table_row_class = "draggable odd"
-
-            url = obj.getURL()
-            path = obj.getPath or "/".join(obj.getPhysicalPath())
-            icon = plone_view.getIcon(obj);
             
-            type_class = 'contenttype-' + plone_utils.normalizeString(
-                obj.portal_type)
-
-            review_state = obj.review_state
-            state_class = 'state-' + plone_utils.normalizeString(review_state)
-            relative_url = obj.getURL(relative=True)
-            obj_type = obj.portal_type
-
-            modified = plone_view.toLocalizedTime(
-                obj.ModificationDate, long_format=1)
-            
-            if obj_type in use_view_action:
-                view_url = url + '/view'
-            elif obj.is_folderish:
-                view_url = url + "/folder_contents"              
-            else:
-                view_url = url
-
-            is_browser_default = len(browser_default[1]) == 1 and (
-                obj.id == browser_default[1][0])
-
-            if IAnnotations(obj.getObject()).has_key('eduCommons.clearcopyright'):
-                cc_status = IAnnotations(obj.getObject())['eduCommons.clearcopyright']
-            else:
-                cc_status = False
-                              
-            results.append(dict(
-                url = url,
-                id  = obj.getId,
-                quoted_id = urllib.quote_plus(obj.getId),
-                path = path,
-                title_or_id = obj.pretty_title_or_id(),
-                description = obj.Description,
-                obj_type = obj_type,
-                size = obj.getObjSize,
-                modified = modified,
-                icon = icon.html_tag(),
-                type_class = type_class,
-                wf_state = review_state,
-                state_title = portal_workflow.getTitleForStateOnType(review_state,
-                                                           obj_type),
-                state_class = state_class,
-                is_browser_default = is_browser_default,
-                folderish = obj.is_folderish,
-                relative_url = relative_url,
-                view_url = view_url,
-                table_row_class = table_row_class,
-                is_expired = self.context.isExpired(obj),
-                cc_status = cc_status,
-            ))
-        return results
-
     @property
     def buttons(self):

4.0/enpraxis.educommons/trunk/enpraxis/educommons/browser/summary_table.pt

@@ -61 +61 @@
                 >State</tal:state>&nbsp;</th>
             <th class="nosort" 
-                id="foldercontents-order-column"
-                tal:condition="view/show_sort_column">
-              &nbsp;<tal:order i18n:translate="listingheader_order">Flags</tal:order>&nbsp;</th>
+                id="foldercontents-cc-column">
+              &nbsp;<tal:cc i18n:domain="eduCommons" i18n:translate="">Flags</tal:cc>&nbsp;</th>
           </tr>
       </thead>
@@ -100 +99 @@
                       <img tal:replace="structure item/icon" />
                       <a href="#" tal:attributes="href  item/view_url;
-                                                title string: ${item/obj_type}: ${item/description};
+                                                title string: ${item/obj_type}: ${item/brain/Description};
                                                 class item/state_class;">
                         <strong tal:omit-tag="not: item/is_browser_default"
@@ -129 +128 @@
                   <span tal:condition="not: item/state_title">&nbsp;</span>
               </td>
-              <td tal:define="copyright_status item/cc_status" width="15px" align="center">
-                <span tal:condition="copyright_status">&copy;</span>
+              <td tal:define="copyright_status item/brain/getCopyrightCleared|nothing;
+                              access_status item/brain/getAccessibilityCompliant|nothing" 
+                  width="15px" 
+                  align="center">
+                <span tal:condition="copyright_status" style="color: green;">c</span>
+                <span tal:condition="access_status" style="color: blue;">a</span>
               </td>
              </tr>

4.0/enpraxis.educommons/trunk/enpraxis/educommons/portlet/courseinfo.pt

@@ -18 +18 @@
             </td>
             <td class="statecolumn">
-              <a tal:attributes="href string:${url}/summary_conents?sort_on=getObjPositionInCourse&state=${item}">
+              <a tal:attributes="href string:${url}/summary_contents?sort_on=getObjPositionInCourse&state=${item}">
                 <img alt="barchart" class="statecolumnimage"
                      tal:attributes="width python:view.statePercent(item);

4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/catalog.xml

@@ -22 +22 @@
   <column value="getOerType" />
   <column value="getFullCourseName" />
+  <column value="getCopyrightCleared" />
+  <column value="getAccessibilityCompliant" />
 </object>