Changeset 2740 in products

Timestamp:

Aug 11, 2010 3:42:40 PM (14 years ago)

Author:

fenix

Message:

• removed some unnecessary trailing white spaces;
• fixed batch related labels;
• made batch_size field disable when batching is not allowed
• fixed navigation bug (removed unnecessary separator)

Location:

quintagroup.portlet.collection/trunk/quintagroup/portlet/collection

Files:

• browser/configure.zcml (modified) (1 diff)
• browser/resources/batch.js (modified) (3 diffs)
• browser/resources/batch_size_enable.js (added)
• browser/templates/navigation.pt (modified) (1 diff)
• collection.pt (modified) (1 diff)
• collection.py (modified) (9 diffs)
• profiles/default/jsregistry.xml (modified) (1 diff)

quintagroup.portlet.collection/trunk/quintagroup/portlet/collection/browser/configure.zcml

@@ -17 +17 @@
       name="batch.js"
       file="resources/batch.js" />
+
+  <browser:resource
+      name="batch_size_enable.js"
+      file="resources/batch_size_enable.js" />
+
 </configure>

quintagroup.portlet.collection/trunk/quintagroup/portlet/collection/browser/resources/batch.js

@@ -27 +27 @@
           for (i=1;i<=batch_size;i++){
             jq(nav_links[index-i]).show();
+            if (i==batch_size) {
+              jq(nav_links[index-i]).find('.navlinkSeparator').hide();
+            }
           }
         }
@@ -43 +46 @@
             if (i+index<nav_links.size()){
               jq(nav_links[i+index]).show();
+            }
+            if (i==batch_size) {
+              jq(nav_links[i+index]).find('.navlinkSeparator').hide();
             }
           }
@@ -78 +84 @@
       for (i=0; i<batch_size;i++){
           jq(nav_links[i]).show();
+          if (i==batch_size-1) {
+            jq(nav_links[i]).find('.navlinkSeparator').hide();
+          }
       }
       showPageByIndex(0);

quintagroup.portlet.collection/trunk/quintagroup/portlet/collection/browser/templates/navigation.pt

@@ -3 +3 @@
   <tal:block repeat="batch options/batches">
     <a class="navlink">
-      <span tal:content="repeat/batch/number"/>
-      <span tal:condition="not:repeat/batch/end">|</span>
+      <span class="navlinkValue" tal:content="repeat/batch/number"/>
+      <span class="navlinkSeparator" tal:condition="not:repeat/batch/end">|</span>
     </a>
   </tal:block>

quintagroup.portlet.collection/trunk/quintagroup/portlet/collection/collection.pt

@@ -7 +7 @@
     <dt class="portletHeader">
         <span class="portletTopLeft"></span>
-        <a tal:attributes="href collection_url" 
+        <a tal:attributes="href collection_url"
            tal:omit-tag="not:view/data/link_title">
             <span tal:content="view/data/header" />

quintagroup.portlet.collection/trunk/quintagroup/portlet/collection/collection.py

@@ -29 +29 @@
 class NotValidBatchSizeValue(ValidationError):
     """This is not valid batch size value.
-    
+
     """
 
@@ -47 +47 @@
                                   default=[u"Title", u"Description"],
                                   value_type=schema.Choice(vocabulary='quintagroup.portlet.collection.vocabularies.PortletAttributesVocabulary'))
-                                  
+
     styling = schema.Choice(title=_(u"Portlet style"),
                             description=_(u"description_styling", default=u"Choose a css style for the porlet."),
@@ -55 +55 @@
 
 
-    show_item_more = schema.Bool(title=_(u"Show more... link for collection items."),
+    show_item_more = schema.Bool(title=_(u"Show more... link for collection items"),
                                  description=_(u"If enabled, a more... link will appear in the bottom of the each collection item, "
                                                 "linking to the corresponding item."),
                                  required=True,
                                  default=True)
-                       
-    link_title = schema.Bool(title=_(u"Link title."),
+
+    link_title = schema.Bool(title=_(u"Link title"),
                                  description=_(u"If enabled, title will be shown as link to corresponding object. "),
                                  required=True,
                                  default=True)
 
-    allow_batching = schema.Bool(title=_(u"Allow batching."),
-                                 description=_(u"If enabled, items will be splited into pages."),
+    allow_batching = schema.Bool(title=_(u"Allow batching"),
+                                 description=_(u"If enabled, items will be split into pages."),
                                  required=False,
                                  default=False)
@@ -75 +75 @@
                                           "(if not set 3 items will be displayed as default)."),
                             required=False,
-                            default=3, 
+                            default=3,
                             constraint=validate_batch_size)
 
 class Assignment(base.Assignment):
     """
-    Portlet assignment.    
+    Portlet assignment.
     This is what is actually managed through the portlets UI and associated
     with columns.
@@ -108 +108 @@
         self.allow_batching = allow_batching
         self.batch_size = batch_size
-       
+
     @property
     def title(self):
@@ -115 +115 @@
         """
         return self.header
-    
+
 class Renderer(base.Renderer):
     """Portlet renderer.
-    
+
     This is registered in configure.zcml. The referenced page template is
     rendered, and the implicit variable 'view' will refer to an instance
@@ -135 +135 @@
         delta = self.data.batch_size
         return [items[idx:idx + delta] for idx in range(0, len(items), delta)]
-    
+
     def batch_navigation(self):
         return self.navigation(batches=self.batches())
@@ -145 +145 @@
                             for index, batch in enumerate(self.batches())])
         return self.items_listing(portlet_items=self.results())
-        
+
 class AddForm(base.AddForm):
     """Portlet add form.
-    
+
     This is registered in configure.zcml. The form_fields variable tells
     zope.formlib which fields to display. The create() method actually
     constructs the assignment that is being added.
     """
+
     form_fields = form.Fields(IQCollectionPortlet)
     form_fields['target_collection'].custom_widget = UberSelectionWidget
-    
+
     label = _(u"Add Collection Portlet")
     description = _(u"This portlet display a listing of items from a Collection.")
@@ -164 +165 @@
 class EditForm(base.EditForm):
     """Portlet edit form.
-    
+
     This is registered with configure.zcml. The form_fields variable tells
     zope.formlib which fields to display.

quintagroup.portlet.collection/trunk/quintagroup/portlet/collection/profiles/default/jsregistry.xml

@@ -5 +5 @@
     expression="" id="++resource++batch.js" inline="False"/>    
 
+ <javascript cacheable="True" compression="safe" cookable="True" enabled="True"
+    expression="" id="++resource++batch_size_enable.js" inline="False"/>    
+
 </object>