Changeset 1265 in products

Timestamp:

Sep 8, 2009 5:52:25 PM (15 years ago)

Author:

liebster

Message:

Added additional functionality for metatags using

Location:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer

Files:

• browser/configure.zcml (modified) (1 diff)
• browser/viewlets.py (modified) (1 diff)
• browser/views.py (modified) (2 diffs)
• skins/quintagroup.seoptimizer/qseo_properties_edit.cpy (modified) (2 diffs)
• skins/quintagroup.seoptimizer/qseo_properties_edit_form.cpt (modified) (4 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/configure.zcml

@@ -75 +75 @@
         layer=".interfaces.IPloneSEOLayer"
         permission="zope2.View"
+        allowed_attributes="seo_globalCustomMetaTags"
         />
 

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/viewlets.py

@@ -124 +124 @@
         custom_meta_tags = seo_context.seo_customMetaTags()
         for tag in custom_meta_tags:
-            metaTags[tag['meta_name']] = tag['meta_content']
+            if tag['meta_content']:
+                metaTags[tag['meta_name']] = tag['meta_content']
 
         # Set the additional matching keywords, if any

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py

@@ -67 +67 @@
     def seo_customMetaTags( self ):
         """
-           Return context's properties prefixed with qSEO_custom_
+        """
+        tags = self.seo_globalCustomMetaTags()
+        loc = self.seo_localCustomMetaTags()
+
+        names = [i['meta_name'] for i in tags]
+        add_tags = []
+        for i in loc:
+            if i['meta_name'] in names:
+                for t in tags:
+                    if t['meta_name'] == i['meta_name']:
+                        t['meta_content'] = i['meta_content']
+            else:
+                add_tags.append(i)
+        tags.extend(add_tags)
+        return tags
+
+    def seo_globalWithoutLocalCustomMetaTags( self ):
+        """
+        """
+        glob = self.seo_globalCustomMetaTags()
+        loc = self.seo_localCustomMetaTags()
+        names = [i['meta_name'] for i in loc]
+        tags = []
+        for i in glob:
+            if i['meta_name'] not in names:
+                tags.append(i)
+        return tags
+
+    def seo_localCustomMetaTags( self ):
+        """
         """
         result = []
-        added = []
         property_prefix = 'qSEO_custom_'
-
-        context = aq_inner(self.context)
-
+        context = aq_inner(self.context)
         for property, value in context.propertyItems():
-            idx = property.find(property_prefix)
-            if idx == 0 and len(property) > len(property_prefix):
-                added.append(property[len(property_prefix):])
+            if property.startswith(property_prefix) and property[len(property_prefix):]:
                 result.append({'meta_name'    : property[len(property_prefix):],
                                'meta_content' : value})
-
+        return result
+
+    def seo_globalCustomMetaTags( self ):
+        """
+        """
+        result = []
+        context = aq_inner(self.context)
         site_properties = getToolByName(context, 'portal_properties')
         if hasattr(site_properties, 'seo_properties'):
@@ -87 +117 @@
             for tag in custom_meta_tags:
                 name_value = tag.split(SEPERATOR)
-                if name_value[0] and name_value[0] not in added:
-                    if len(name_value) == 1:
-                        result.append({'meta_name'    : name_value[0],
-                                       'meta_content' : ''})
-                    else:
-                        result.append({'meta_name'    : name_value[0],
-                                       'meta_content' : name_value[1]})
+                if name_value[0]:
+                    result.append({'meta_name'    : name_value[0],
+                                   'meta_content' : len(name_value) == 1 and '' or name_value[1]})
         return result
-    
+
+    def seo_nonEmptylocalMetaTags( self ):
+        """
+        """
+        return bool(self.seo_localCustomMetaTags())
+
     def seo_html_comment( self ):
         """

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/skins/quintagroup.seoptimizer/qseo_properties_edit.cpy

@@ -7 +7 @@
 ##bind subpath=traverse_subpath
 ##title=Update SEO Properties
-##parameters=title=None,description=None,canonical=None,keywords=None,html_comment=None,robots=None,distribution=None,title_override=0,description_override=0,canonical_override=0,keywords_override=0,html_comment_override=0,robots_override=0,distribution_override=0,custommetatags=[]
+##parameters=title=None,description=None,canonical=None,keywords=None,html_comment=None,robots=None,distribution=None,title_override=0,description_override=0,canonical_override=0,keywords_override=0,html_comment_override=0,robots_override=0,distribution_override=0,custommetatags=[],custommetatags_override=0
 
 def setProperty(context, property, value, type='string'):
@@ -24 +24 @@
         custom_existing.append(property)
 
+if not custommetatags_override: custommetatags=[]
+
+globalCustomMetaTags = context.restrictedTraverse('@@seo_context').seo_globalCustomMetaTags()
 custom_updated = []
 for tag in custommetatags:
     meta_name, meta_content = tag['meta_name'], tag['meta_content']
-    if meta_name and meta_content:
-        setProperty(context, '%s%s' % (property_prefix, meta_name), meta_content)
+    if meta_name:
+        if not [gmt for gmt in globalCustomMetaTags if (gmt['meta_name']==meta_name and gmt['meta_content']==meta_content)]:
+            setProperty(context, '%s%s' % (property_prefix, meta_name), meta_content)
         custom_updated.append('%s%s' % (property_prefix, meta_name))
 

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/skins/quintagroup.seoptimizer/qseo_properties_edit_form.cpt

@@ -255 +255 @@
           </div>
           <div class="field"
-               tal:define="fieldName string:custommetatags;">
+               tal:define="fieldName string:custommetatags;
+                           nonEmptylocalMetaTags here/@@seo_context/seo_nonEmptylocalMetaTags;">
             <label i18n:translate="label_custom_metatags" for="custom_metatags">
               Custom Meta Tags
@@ -262 +263 @@
               Here you can manage your custom meta tags.
             </div>
+            <input type="checkbox"
+                   id="custommetatags_override"
+                   name="custommetatags_override"
+                   tabindex=""
+                   tal:attributes="checked python:test(nonEmptylocalMetaTags, 'on', None);
+                                   tabindex tabindex/next;"
+                   />
+            <label i18n:translate="label_override" for="custommetatags_override">
+              Override
+            </label><br />
             <table class="custom-metatags-table"
                    id="datagridwidget-table-custommetatags"
@@ -267 +278 @@
                    tal:define="columnNames python:['meta name', 'meta content'];
                                columnIds   python:['meta_name', 'meta_content'];
-                               fielddata here/@@seo_context/seo_customMetaTags;">
+                               globalMT    here/@@seo_context/seo_globalWithoutLocalCustomMetaTags;
+                               localMT    here/@@seo_context/seo_localCustomMetaTags;">
                 <thead>
                     <tr>
@@ -279 +291 @@
                 </thead>
                 <tbody id="datagridwidget-tbody-custommetatags">
-                    <tal:row-loop tal:repeat="row fielddata">
+                    <tal:row-loop tal:repeat="row globalMT">
+                        <tr id="datagridwidget-row">
+                            <tal:vars define="fieldId string:${fieldName}_${repeat/row/number}">
+                                <td class="datagridwidget-cell"
+                                    tal:repeat="column columnIds">
+                                    <tal:cell tal:define="cell_value python:row.get(column);">
+                                        <input type="text"
+                                               id="columnId_fieldId"
+                                               value=""
+                                               name="fieldId.columnId:records"
+                                               style="width: 100%;"
+                                               tal:attributes="name string:${fieldName}.${column}:records;
+                                                               id string:${column}_${fieldId};
+                                                               value cell_value"/>
+                                    </tal:cell>
+                                </td>
+                            </tal:vars>
+                        </tr>
+                    </tal:row-loop>
+                    <tal:row-loop tal:repeat="row localMT">
                         <tr id="datagridwidget-row">
                             <tal:vars define="fieldId string:${fieldName}_${repeat/row/number}">