MODX 3 fixes

README.md

@@ -1,6 +1,8 @@
 # SEOPro
 **Author:** Sterc (<modx@sterc.nl>)  
-**Version:** 1.2.2
+**Version:** 2.0.0
+
+## Warning: This version is developed for MODX 3+
 
 ## Description
 [SEOPro][2] is a MODX Extra developed by [Sterc][1]. This Extra offers you guidelines in the process of optimizing your webpage for search engines. It enables you to enter focus keywords per page. Based on that input, SEOPro provides you with feedback on the SEO quality of your pagetitle, longtitle, description and alias by checking if the keywords are present.

_build/config.json

@@ -3,7 +3,7 @@
   "lowCaseName": "seopro",
   "description": "MODX SEO Pro is a MODX package that helps you when performing Search Engine Optimization (SEO) in MODX.",
   "author": "Sterc",
-  "version": "1.3.0-pl",
+  "version": "2.0.0-pl",
   "package":{
     "elements": {
       "plugins": [{
@@ -82,4 +82,4 @@
       "source": "setup.options.php"
     }
   }
-}
+}

_build/gpm_resolvers/gpm.resolve.tables.php

@@ -22,10 +22,12 @@
             $modx->addPackage('seopro', $modelPath, null);
 
 
+
             $manager = $modx->getManager();
 
             $manager->createObjectContainer('seoKeywords');
 
+
             break;
     }
 }

assets/components/seopro/css/mgr23.css

@@ -77,10 +77,6 @@
     padding-left: 20px;
 }
 
-.seopro-counter .green{
-    color: #919191 !important;
-}
-
 .seopro-counter-chars {
     position: absolute;
     top: 29px;
@@ -102,6 +98,11 @@
 .seopro-counter-keywords{
 	padding-left: 30px;
 }
+
+#seopro-counter-keywords-alias {
+    margin-right: 30px;
+}
+
 .x-btn-seopro button{
 /*	background-image: url(../img/tips.png);
 	background-position: 0px 0px !important;*/

assets/components/seopro/js/mgr/seopro.js

@@ -52,7 +52,7 @@ Ext.extend(seoPro, Ext.Component, {
                 id: 'seopro-resource-' + field,
                 class: 'seopro-counter',
                 html: '<span class="seopro-counter-wrap seopro-counter-keywords" id="seopro-counter-keywords-' + field + '" title="' + _('seopro.keywords') + '"><strong>' + _('seopro.keywords') + ':&nbsp;&nbsp;</strong><span id="seopro-counter-keywords-' + field + '-current">0</span></span>\
-                        <span class="seopro-counter-wrap seopro-counter-chars" id="seopro-counter-chars-' + field + '" title="' + _('seopro.characters.allowed') + '"><span class="current" id="seopro-counter-chars-' + field + '-current">1</span>/<span class="allowed" id="seopro-counter-chars-' + field + '-allowed">' + seoPro.config.chars[field] + '</span></span>'
+                        <span class="seopro-counter-wrap seopro-counter-chars green" id="seopro-counter-chars-' + field + '" title="' + _('seopro.characters.allowed') + '"><span class="current" id="seopro-counter-chars-' + field + '-current">1</span>/<span class="allowed" id="seopro-counter-chars-' + field + '-allowed">' + seoPro.config.chars[field] + '</span></span>'
             });
             seoPro.count(field);
         }
@@ -64,7 +64,7 @@ Ext.extend(seoPro, Ext.Component, {
             name: 'keywords',
             id: 'seopro-keywords',
             fieldLabel: _('seopro.focuskeywords'),
-            description: '[[+seoPro.keywords]]',
+            description: _('seopro.focuskeywords_desc'),
             value: seoPro.config.record,
             enableKeyEvents: true,
             anchor: '100%',
@@ -80,18 +80,13 @@ Ext.extend(seoPro, Ext.Component, {
                 }
             }
         });
-        var fieldDesc = new Ext.form.Label({
-            forId: 'pagetitle',
-            text: _('seopro.focuskeywords_desc'),
-            cls: 'desc-under'
-        });
+
         fp.insert(3, field);
-        fp.insert(4, fieldDesc);
         fp.doLayout();
     },
     addPanel: function() {
         var fp = Ext.getCmp('modx-resource-main-left');
-        fp.insert(5, {
+        fp.insert(4, {
             xtype: 'panel',
             anchor: '100%',
             border: false,
@@ -108,7 +103,7 @@ Ext.extend(seoPro, Ext.Component, {
                 items: [{
                     xtype: 'box',
                     id: 'seopro-google-title',
-                    style: 'background-color: #fbfbfb; background-image: url(https://www.google.com/s2/favicons?domain='+MODx.config.site_url+');',
+                    style: 'background-image: url(https://www.google.com/s2/favicons?domain='+MODx.config.site_url+');',
                     cls: seoPro.config.searchEngine,
                     html: '',
                     border: false
@@ -176,9 +171,9 @@ Ext.extend(seoPro, Ext.Component, {
         }
 
         if (charCount > maxchars || charCount === 0) {
-            Ext.get('seopro-counter-chars-' + field).addClass('red');
+            Ext.get('seopro-counter-chars-' + field).addClass('red').removeClass('green');
         } else {
-            Ext.get('seopro-counter-chars-' + field).removeClass('red');
+            Ext.get('seopro-counter-chars-' + field).addClass('green').removeClass('red');
         }
     },
     changePrevBox: function(field) {
@@ -227,7 +222,11 @@ Ext.extend(seoPro, Ext.Component, {
                     if (!MODx.isEmpty(seoPro.config.values['introtext']) && !introCheck) {
                         description = seoPro.config.values['introtext'];
                     } else {
+                        var label = Ext.get('modx-resource-description').dom.labels[0].innerText;
+
+                        label       = label.replace(/:$/, '').toLowerCase();
                         description = _('seopro.emptymetadescription');
+                        description = description.replace(/\<span class="seopro-google-description--field"\>(.*)\<\/span\>/, label);
                     }
                 } else {
                     description = seoPro.config.values['description'];

core/components/seopro/docs/changelog.txt

@@ -1,5 +1,8 @@
 Changelog for SEO Pro.
 
+SEO Pro 2.0.0 pl
+- Release for modx 3
+
 SEO Pro 1.3.0 pl
 ==============
 - Change type of modResource.description to be "text" instead of "varchar". (#74)

core/components/seopro/docs/readme.txt

@@ -1,10 +1,12 @@
 --------------------
 SEO Pro
 --------------------
-Version: 1.2.2-pl
+Version: 2.0.0-pl
 Author: Sterc <modx@sterc.nl>
 --------------------
 
+Warning: This version is developed for modx 3+
+
 SEO Pro is a MODX Extra developed by Sterc. This Extra offers you guidance in the process of optimising your website for search engines. It enables you to enter focus keywords per page. Based on that input, SEO Pro provides you feedback on the SEO quality of your pagetitle, longtitle, description and alias by checking if the keywords are present.
 
 Workflow:

core/components/seopro/lexicon/de/default.inc.php

@@ -7,7 +7,7 @@
 $_lang['seopro.focuskeywords_desc'] = 'durch Komma getrennt, ohne Leerzeichen';
 $_lang['seopro.prevbox'] = 'Google-Vorschau';
 $_lang['seopro.prevbox_yandex'] = 'Yandex-Vorschau';
-$_lang['seopro.emptymetadescription']='<i>Bitte geben Sie eine Beschreibung ein.</i>';
+$_lang['seopro.emptymetadescription']='<i>Bitte geben Sie eine <span class="seopro-google-description--field">Beschreibung</span> ein.</i>';
 $_lang['seopro.branding_text']='This site is optimized with the Sterc seoPro plugin - https://github.com/Sterc/SEOPro.';
 
 $_lang['setting_seopro.delimiter'] = 'Trennzeichen in Google-Vorschau';

core/components/seopro/lexicon/en/default.inc.php

@@ -7,7 +7,7 @@
 $_lang['seopro.focuskeywords_desc'] = 'Enter your keywords comma-separated (example: table, chair)';
 $_lang['seopro.prevbox'] = 'Google Preview';
 $_lang['seopro.prevbox_yandex'] = 'Yandex Preview';
-$_lang['seopro.emptymetadescription']='<i>Please enter a description</i>';
+$_lang['seopro.emptymetadescription']='<i>Please enter a <span class="seopro-google-description--field">description</span></i>';
 $_lang['seopro.branding_text']='This site is optimized with the Sterc seoPro plugin - https://github.com/Sterc/SEOPro.';
 
 $_lang['setting_seopro.delimiter'] = 'Delimiter in Google/Yandex Preview.';

core/components/seopro/lexicon/fr/default.inc.php

@@ -7,7 +7,7 @@
 $_lang['seopro.focuskeywords_desc'] = 'Séparés par des virgules';
 $_lang['seopro.prevbox'] = 'Dans Google ça donne quoi?';
 $_lang['seopro.prevbox_yandex'] = 'Dans Yandex ça donne quoi?';
-$_lang['seopro.emptymetadescription']='<i>Remplissez la description avant de prévisualiser</i>';
+$_lang['seopro.emptymetadescription']='<i>Remplissez la <span class="seopro-google-description--field">description</span> avant de prévisualiser</i>';
 $_lang['seopro.branding_text']='This site is optimized with the Sterc seoPro plugin - https://github.com/Sterc/SEOPro.';
 
 $_lang['setting_seopro.delimiter'] = 'Séparateur dans Google/Yandex preview.';

core/components/seopro/lexicon/it/default.inc.php

@@ -8,5 +8,5 @@
 $_lang['seopro.focuskeywords_desc'] = 'Separate da virgole';
 $_lang['seopro.prevbox'] = 'Come verrà visualizzato in Google?';
 $_lang['seopro.prevbox_yandex'] = 'Come verrà visualizzato in Yandex?';
-$_lang['seopro.emptymetadescription']='<i>Please enter a description</i>';
+$_lang['seopro.emptymetadescription']='<i>Please enter a <span class="seopro-google-description--field">description</span></i>';
 $_lang['seopro.branding_text']='This site is optimized with the Sterc seoPro plugin - https://github.com/Sterc/SEOPro.';

core/components/seopro/lexicon/nl/default.inc.php

@@ -7,7 +7,7 @@
 $_lang['seopro.focuskeywords_desc'] = 'Vul je keywords komma-gescheiden in.';
 $_lang['seopro.prevbox'] = 'Google Preview';
 $_lang['seopro.prevbox_yandex'] = 'Yandex Preview';
-$_lang['seopro.emptymetadescription']='<i>Vul een omschrijving in</i>';
+$_lang['seopro.emptymetadescription']='<i>Vul een <span class="seopro-google-description--field">omschrijving</span> in</i>';
 $_lang['seopro.branding_text']='Deze website is geoptimaliseerd met de Sterc seoPro plugin - https://github.com/Sterc/SEOPro.';
 
 $_lang['setting_seopro.delimiter'] = 'Scheidingsteken in Google/Yandex preview.';

core/components/seopro/lexicon/pl/default.inc.php

@@ -7,7 +7,7 @@
 $_lang['seopro.focuskeywords_desc'] = 'Wprowadź frazy oddzielone przecinkami (przykład: stół,krzesło)';
 $_lang['seopro.prevbox'] = 'Jak to wygląda w Google?';
 $_lang['seopro.prevbox_yandex'] = 'Jak to wygląda w Yandex?';
-$_lang['seopro.emptymetadescription']='<i>Wprowadź opis aby zobaczyć podgląd</i>';
+$_lang['seopro.emptymetadescription']='<i>Wprowadź <span class="seopro-google-description--field">opis</span> aby zobaczyć podgląd</i>';
 $_lang['seopro.branding_text']='This site is optimized with the Sterc seoPro plugin - https://github.com/Sterc/SEOPro.';
 
 $_lang['setting_seopro.delimiter'] = 'Separator';

core/components/seopro/lexicon/ru/default.inc.php

@@ -7,7 +7,7 @@
 $_lang['seopro.focuskeywords_desc'] = 'Разделённые запятой';
 $_lang['seopro.prevbox'] = 'Как это будет выглядеть в Google?';
 $_lang['seopro.prevbox_yandex'] = 'Как это будет выглядеть в Yandex?';
-$_lang['seopro.emptymetadescription']='<i>Для предварительного просмотра заполните поле Описание</i>';
+$_lang['seopro.emptymetadescription']='<i>Для предварительного просмотра заполните поле <span class="seopro-google-description--field">Описание</span></i>';
 $_lang['seopro.branding_text']='This site is optimized with the Sterc seoPro plugin - https://github.com/Sterc/SEOPro.';
 
 $_lang['setting_seopro.delimiter'] = 'Разделитель в сниппете Google/Yandex';