Changeset 1752 in products

Timestamp:

Feb 16, 2010 12:35:25 PM (14 years ago)

Author:

koval

Message:

removed "Filter keywords..." field from configlet, updated tests and translations

Location:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer

Files:

• browser/templates/seo_controlpanel.pt (modified) (1 diff)
• browser/views.py (modified) (3 diffs)
• locales/quintagroup.seoptimizer.pot (modified) (10 diffs)
• locales/uk/LC_MESSAGES/quintagroup.seoptimizer.po (modified) (10 diffs)
• profiles/default/browserlayer.xml (modified) (1 diff)
• profiles/default/controlpanel.xml (modified) (1 diff)
• profiles/default/propertiestool.xml (modified) (1 diff)
• profiles/default/types/Document.xml (modified) (1 diff)
• profiles/default/types/File.xml (modified) (1 diff)
• profiles/default/types/News_Item.xml (modified) (1 diff)
• tests/testQSEOptimizerUsageKeywords.py (modified) (1 diff)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt

@@ -80 +80 @@
                   <textarea cols="60" id="additionalKeywords" name="additionalKeywords" rows="15"
                             tal:content="python:'\n'.join(view.getAdditionalKeywords())"></textarea>
-              </div>
-          </div>
-
-          <div class="field">
-            <input type="checkbox"
-                   id="filterKeywordsByContent"
-                   name="filterKeywordsByContent"
-                   tal:attributes="checked view/getFilterKeywordsByContent"/>
-            <label for="filterKeywordsByContent" i18n:translate="label_filter_keywords_by_content">
-                Filter keywords by their availability in content.
-            </label>
-            <div class="formHelp" i18n:translate="help_filter_keywords_by_content">
-                Controls use of meta keywords according to their presence in content.
               </div>
           </div>

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

@@ -266 +266 @@
         return seo.getProperty('additional_keywords')
 
-    def getFilterKeywordsByContent( self ):
-        """ Get values from filter_keywords_by_content property in seo_properties.
-        """
-        seo = self.portal_properties.seo_properties
-        return seo.getProperty('filter_keywords_by_content')
-
     def createMultiColumnList( self ):
         """
@@ -293 +287 @@
         default_custom_metatags = request.get('default_custom_metatags', [])
         metatags_order = request.get('metatags_order', [])
-        filterKeywordsByContent = request.get('filterKeywordsByContent', None)
         settingsUseKeywordsSG = int(request.get('settingsUseKeywordsSG', 1))
         settingsUseKeywordsLG = int(request.get('settingsUseKeywordsLG', 1))
@@ -309 +302 @@
             seo_props.manage_changeProperties(metatags_order=metatags_order)
             seo_props.manage_changeProperties(content_types_seoprops_enabled=content_types_seoprops_enabled)
-            seo_props.manage_changeProperties(filter_keywords_by_content=filterKeywordsByContent)
             seo_props.manage_changeProperties(settings_use_keywords_sg=settingsUseKeywordsSG)
             seo_props.manage_changeProperties(settings_use_keywords_lg=settingsUseKeywordsLG)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/locales/quintagroup.seoptimizer.pot

@@ -5 +5 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-10 10:23+0000\n"
+"POT-Creation-Date: 2010-02-16 12:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -26 +26 @@
 msgstr ""
 
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/Document.xml
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/File.xml
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/News_Item.xml
+msgid "SEO Properties"
+msgstr ""
+
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/controlpanel.xml
+msgid "Search Engine Optimizer"
+msgstr ""
+
 #. Default: "Canonical URL mast be in ${pdomain} domain."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:383
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:375
 msgid "canonical_msg"
 msgstr ""
@@ -37 +47 @@
 
 #. Default: "Select content types that will have SEO properties enabled."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:168
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:155
 msgid "description_seo_content_types"
 msgstr ""
@@ -61 +71 @@
 msgstr ""
 
-#. Default: "Controls use of meta keywords according to their presence in content."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:93
-msgid "help_filter_keywords_by_content"
-msgstr ""
-
 #. Default: "Fill in meta tags (one per line) in the order in which they will appear on site source pages. Example: \"metaname accessor\"."
 #: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:60
@@ -112 +117 @@
 
 #. Default: "Controls global and local SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:140
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:127
 msgid "help_settings_use_keywords_lg"
 msgstr ""
 
 #. Default: "Controls Plone categories (also known as keywords or tags) and global SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:102
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:89
 msgid "help_settings_use_keywords_sg"
 msgstr ""
@@ -132 +137 @@
 
 #. Default: "Content Types"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:166
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:153
 msgid "label_content_type_title"
 msgstr ""
@@ -156 +161 @@
 msgstr ""
 
-#. Default: "Filter keywords by their availability in content."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:90
-msgid "label_filter_keywords_by_content"
-msgstr ""
-
 #. Default: "HTML Comment"
 #: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:147
@@ -167 +167 @@
 
 #. Default: "Merge global and local SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:158
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:145
 msgid "label_merge_seoglobal_and_seolocal"
 msgstr ""
 
 #. Default: "Merge Plone categories and global SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:130
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:117
 msgid "label_merge_subject_and_seoglobal"
 msgstr ""
@@ -207 +207 @@
 
 #. Default: "Global SEO keywords override local SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:148
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:135
 msgid "label_seoglobal_override_seolocal"
 msgstr ""
 
 #. Default: "Global SEO keywords override Plone categories"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:120
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:107
 msgid "label_seoglobal_override_subject"
 msgstr ""
 
 #. Default: "Settings to control global SEO keywords vs local SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:137
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:124
 msgid "label_settings_use_keywords_lg"
 msgstr ""
 
 #. Default: "Settings to control Plone categories and global SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:99
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:86
 msgid "label_settings_use_keywords_sg"
 msgstr ""
 
 #. Default: "Plone categories override global SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:110
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:97
 msgid "label_subject_override_seoglobal"
 msgstr ""
@@ -246 +246 @@
 
 #. Default: "Content SEO properties have been saved."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:488
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:480
 msgid "seoproperties_saved"
 msgstr ""

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/locales/uk/LC_MESSAGES/quintagroup.seoptimizer.po

@@ -5 +5 @@
 msgstr ""
 "Project-Id-Version: quintagroup.seoptimizer\n"
-"POT-Creation-Date: 2010-02-10 10:23+0000\n"
+"POT-Creation-Date: 2010-02-16 12:25+0000\n"
 "PO-Revision-Date: 2010-02-11 14:05+0300\n"
 "Last-Translator: Olha <olha.pelishok@gmail.com>\n"
@@ -26 +26 @@
 msgstr "Список ключових слів порожній!"
 
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/Document.xml
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/File.xml
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/News_Item.xml
+msgid "SEO Properties"
+msgstr ""
+
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/controlpanel.xml
+msgid "Search Engine Optimizer"
+msgstr ""
+
 #. Default: "Canonical URL mast be in ${pdomain} domain."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:383
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:375
 msgid "canonical_msg"
 msgstr "Canonical URL повинен знаходитись в домені \"${pdomain}\"."
@@ -37 +47 @@
 
 #. Default: "Select content types that will have SEO properties enabled."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:168
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:155
 msgid "description_seo_content_types"
 msgstr "Виберіть типи вмісту, для яких буде можливо прописувати SEO властивості."
@@ -61 +71 @@
 msgstr "Введіть назви додаткових мета теґів (по 1 в кожному рядку), які з'являться при редагуванні  SEO властивостей об'єктів сайту. Наприклад: \ \"metaname | metacontent \" або \ \"metaname \"."
 
-#. Default: "Controls use of meta keywords according to their presence in content."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:93
-msgid "help_filter_keywords_by_content"
-msgstr "Контроль використання ключових слів згідно з їх наявністю в контексті."
-
 #. Default: "Fill in meta tags (one per line) in the order in which they will appear on site source pages. Example: \"metaname accessor\"."
 #: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:60
@@ -112 +117 @@
 
 #. Default: "Controls global and local SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:140
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:127
 msgid "help_settings_use_keywords_lg"
 msgstr "Контроль поведінки глобальних та локальних SEO ключових слів."
 
 #. Default: "Controls Plone categories (also known as keywords or tags) and global SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:102
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:89
 msgid "help_settings_use_keywords_sg"
 msgstr "Контроль поведінки Plone категорій (відомих також як ключові слова чи теґи) та глобальних SEO ключових слів."
@@ -132 +137 @@
 
 #. Default: "Content Types"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:166
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:153
 msgid "label_content_type_title"
 msgstr "Типи вмісту"
@@ -156 +161 @@
 msgstr "Показувати мета теґи <abbr title=\"Dublin Core\">DC</abbr>"
 
-#. Default: "Filter keywords by their availability in content."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:90
-msgid "label_filter_keywords_by_content"
-msgstr "Фільтрувати ключові слова по їх наявності в контексті."
-
 #. Default: "HTML Comment"
 #: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:147
@@ -167 +167 @@
 
 #. Default: "Merge global and local SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:158
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:145
 msgid "label_merge_seoglobal_and_seolocal"
 msgstr "Злиття глобальних і локальних SEO ключових слів"
 
 #. Default: "Merge Plone categories and global SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:130
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:117
 msgid "label_merge_subject_and_seoglobal"
 msgstr "Злиття Plone категорій та глобальних SEO ключових слів"
@@ -207 +207 @@
 
 #. Default: "Global SEO keywords override local SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:148
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:135
 msgid "label_seoglobal_override_seolocal"
 msgstr "Глобальні SEO ключові слова перекривають локальні"
 
 #. Default: "Global SEO keywords override Plone categories"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:120
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:107
 msgid "label_seoglobal_override_subject"
 msgstr "Глобальні SEO ключові слова перекривають Plone категорії"
 
 #. Default: "Settings to control global SEO keywords vs local SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:137
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:124
 msgid "label_settings_use_keywords_lg"
 msgstr "Налаштування поведінки глобальних та локальних SEO ключових слів."
 
 #. Default: "Settings to control Plone categories and global SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:99
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:86
 msgid "label_settings_use_keywords_sg"
 msgstr "Налаштування поведінки Plone ключових слів та глобальних SEO ключових слів."
 
 #. Default: "Plone categories override global SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:110
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:97
 msgid "label_subject_override_seoglobal"
 msgstr "Plone категорії перекривають глобальні SEO ключові слова"
@@ -250 +250 @@
 
 #. Default: "Content SEO properties have been saved."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:488
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:480
 msgid "seoproperties_saved"
 msgstr "SEO властивості збереженно."

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/profiles/default/browserlayer.xml

@@ -2 +2 @@
 <layers
    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-   i18n:domain="seoptimizer">
+   i18n:domain="quintagroup.seoptimizer">
    <layer name="qSEOptimizer"
           interface="quintagroup.seoptimizer.browser.interfaces.IPloneSEOLayer" />

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/profiles/default/controlpanel.xml

@@ -5 +5 @@
     appId="quintagroup.seoptimizer" category="Products" condition_expr=""
     url_expr="string:${portal_url}/@@seo-controlpanel"
-    visible="True" i18n:attributes="">
+    visible="True" i18n:attributes="title">
   <permission>ManagePortal</permission>
  </configlet>

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/profiles/default/propertiestool.xml

@@ -87 +87 @@
    <element value="distribution seo_distribution"/>
   </property>
-  <property name="filter_keywords_by_content" type="boolean">True</property>
  </object>
  <object name="site_properties" meta_type="Plone Property Sheet">

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/profiles/default/types/Document.xml

@@ -4 +4 @@
  <action title="SEO Properties" action_id="seo_properties" category="object" condition_expr="python:exists('portal/@@seo-context-properties')"
     url_expr="string:${object_url}/@@seo-context-properties" visible="True"
-    i18n:attributes="">
+    i18n:attributes="title">
   <permission value="Modify portal content"/>
  </action>

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/profiles/default/types/File.xml

@@ -4 +4 @@
  <action title="SEO Properties" action_id="seo_properties" category="object" condition_expr="python:exists('portal/@@seo-context-properties')"
     url_expr="string:${object_url}/@@seo-context-properties" visible="True"
-    i18n:attributes="">
+    i18n:attributes="title">
   <permission value="Modify portal content"/>
  </action>

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/profiles/default/types/News_Item.xml

@@ -4 +4 @@
  <action title="SEO Properties" action_id="seo_properties" category="object" condition_expr="python:exists('portal/@@seo-context-properties')"
     url_expr="string:${object_url}/@@seo-context-properties" visible="True"
-    i18n:attributes="">
+    i18n:attributes="title">
   <permission value="Modify portal content"/>
  </action>

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testQSEOptimizerUsageKeywords.py

@@ -136 +136 @@
         self.assert_(m, "No 'subject, global, local' keywords find")
 
-    def test_default_values_filter_keywords_by_content_in_configlet(self):
-        self.assertEqual(self.sp.getProperty('filter_keywords_by_content', None), True)
-
-    def test_changes_filter_keywords_by_content_in_configlet(self):
-        path = self.portal.id+'/@@seo-controlpanel?filter_keywords_by_content=False&form.submitted=1'
-        self.publish(path, self.basic_auth)
-        self.assertEqual(self.sp.getProperty('filter_keywords_by_content', 0), None)
-
-    def test_filter_keywords_by_content_true(self):
-        # Usage metatags keywords, which present in content (filter_keywords_by_content=True)
-        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2, filter_keywords_by_content=True)
-        self.html = self.setup_testing_render_keywords(html='<p>subject global</p>')
-        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="(?:subject|global),\s*(?:subject|global)"\s*)){2}/>)',
-                    self.html, re.S|re.M)
-        self.assert_(m, "In metatags keywords not finded \"subject, global\". Checkbox filter_keywords_by_content in configlet is not working.")
-
-    def test_filter_keywords_by_content_false(self):
-        # Usage metatags keywords, without taking into consideration presece in content (filter_keywords_by_content=False)
-        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2, filter_keywords_by_content=False)
-        self.html = self.setup_testing_render_keywords(html='<p>subject global</p>')
-        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="(?:subject|global|local),\s*(?:subject|global|local),\s*(?:subject|global|local)"\s*)){2}/>)',
-                    self.html, re.S|re.M)
-        self.assert_(m, "In metatags keywords not finded \"subject, global, locals\". Checkbox filter_keywords_by_content in configlet is not working.")
-
 def test_suite():
     from unittest import TestSuite, makeSuite