#1041 Move link to build-in help page from help menu to help link it left bar

modules/boonex/antispam/classes/BxAntispamStudioPage.php

@@ -24,6 +24,7 @@ class BxAntispamStudioPage extends BxTemplStudioModule
             array('name' => 'ip_table', 'icon' => 'align-justify', 'title' => '_bx_antispam_ip_table', 'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-ip-table')),
             array('name' => 'dnsbl_list', 'icon' => 'align-justify', 'title' => '_bx_antispam_dnsbl_list', 'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-dnsbl-list')),
             array('name' => 'block_log', 'icon' => 'clock-o', 'title' => '_bx_antispam_block_log', 'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-block-log')),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_bx_antispam_help'),
         );
     }
 
@@ -31,13 +32,6 @@ class BxAntispamStudioPage extends BxTemplStudioModule
     {
         return _t('_bx_antispam_help_text');
     }
-
-    protected function getPageCaptionHelp()
-    {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_antispam&page=help">' . _t('_bx_antispam_help') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
-    }
 }
 
 /** @} */

modules/boonex/chat_plus/classes/BxChatPlusStudioPage.php

@@ -11,16 +11,19 @@
 
 class BxChatPlusStudioPage extends BxTemplStudioModule
 {
-    function getHelp ()
+    function __construct($sModule = "", $sPage = "")
     {
-        return _t('_bx_chat_plus_information_block');
-    }
+        parent::__construct($sModule, $sPage);
 
-    protected function getPageCaptionHelp()
+        $this->aMenuItems = array(
+            array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_bx_chat_plus_information'),
+        );
+    }
+    
+    function getHelp ()
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_chat_plus&page=help">' . _t('_bx_chat_plus_information') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
+        return _t('_bx_chat_plus_information_block');
     }
 }
 

modules/boonex/dolphin_connect/classes/BxDolConStudioPage.php

@@ -11,16 +11,19 @@
 
 class BxDolConStudioPage extends BxTemplStudioModule
 {
-    function getHelp ()
+    function __construct($sModule = "", $sPage = "")
     {
-        return _t('_bx_dolcon_information_block', BX_DOL_URL_ROOT);
-    }
+        parent::__construct($sModule, $sPage);
 
-    protected function getPageCaptionHelp()
+        $this->aMenuItems = array(
+            array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_sys_connect_information'),
+        );
+    }
+    
+    function getHelp ()
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_dolcon&page=help">' . _t('_sys_connect_information') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
+        return _t('_bx_dolcon_information_block', BX_DOL_URL_ROOT);
     }
 }
 

modules/boonex/google_connect/classes/BxGoogleConStudioPage.php

@@ -11,18 +11,21 @@
 
 class BxGoogleConStudioPage extends BxTemplStudioModule
 {
+    function __construct($sModule = "", $sPage = "")
+    {
+        parent::__construct($sModule, $sPage);
+
+        $this->aMenuItems = array(
+            array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_sys_connect_information'),
+        );
+    }
+    
     function getHelp ()
     {
         $oModule = BxDolModule::getInstance('bx_googlecon'); 
         return _t('_bx_googlecon_information_block', BX_DOL_URL_ROOT . $oModule -> _oConfig -> getBaseUri() . 'handle');
     }
-
-    protected function getPageCaptionHelp()
-    {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_googlecon&page=help">' . _t('_sys_connect_information') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
-    }
 }
 
 /** @} */

modules/boonex/intercom/classes/BxIntercomStudioPage.php

@@ -11,16 +11,19 @@
 
 class BxIntercomStudioPage extends BxTemplStudioModule
 {
-    function getHelp ()
+    function __construct($sModule = "", $sPage = "")
     {
-        return _t('_bx_intercom_information_block');
+        parent::__construct($sModule, $sPage);
+
+        $this->aMenuItems = array(
+            array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_bx_intercom_information'),
+        );
     }
 
-    protected function getPageCaptionHelp()
+    function getHelp ()
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_intercom&page=help">' . _t('_bx_intercom_information') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
+        return _t('_bx_intercom_information_block');
     }
 }
 

modules/boonex/linkedin_connect/classes/BxLinkedinStudioPage.php

@@ -11,17 +11,20 @@
 
 class BxLinkedinStudioPage extends BxTemplStudioModule
 {
-    function getHelp ()
+    function __construct($sModule = "", $sPage = "")
     {
-        $oModule = BxDolModule::getInstance('bx_linkedin'); 
-        return _t('_bx_linkedin_information_block', BX_DOL_URL_ROOT . $oModule -> _oConfig -> getBaseUri() . 'handle');
+        parent::__construct($sModule, $sPage);
+
+        $this->aMenuItems = array(
+            array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_sys_connect_information'),
+        );
     }
 
-    protected function getPageCaptionHelp()
+    function getHelp ()
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_linkedin&page=help">' . _t('_sys_connect_information') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
+        $oModule = BxDolModule::getInstance('bx_linkedin'); 
+        return _t('_bx_linkedin_information_block', BX_DOL_URL_ROOT . $oModule -> _oConfig -> getBaseUri() . 'handle');
     }
 }
 

modules/boonex/mailchimp/classes/BxMailchimpStudioPage.php

@@ -11,18 +11,21 @@
 
 class BxMailchimpStudioPage extends BxTemplStudioModule
 {
+    function __construct($sModule = "", $sPage = "")
+    {
+        parent::__construct($sModule, $sPage);
+
+        $this->aMenuItems = array(
+            array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_bx_mailchimp_information'),
+        );
+    }
+    
     function getHelp ()
     {
         $oModule = BxDolModule::getInstance('bx_mailchimp');
         return _t('_bx_mailchimp_information_block', BX_DOL_URL_ROOT . $oModule->_oConfig->getBaseUri() . 'bulk_add', BX_MAILCHIMP_LIMIT);
     }
-
-    protected function getPageCaptionHelp()
-    {        
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_mailchimp&page=help">' . _t('_bx_mailchimp_information') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
-    }
 }
 
 /** @} */

modules/boonex/oauth2/classes/BxOAuthStudioPage.php

@@ -21,6 +21,7 @@ class BxOAuthStudioPage extends BxTemplStudioModule
 
         $this->aMenuItems = array(
             array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_bx_oauth_help'),
         );
     }
 
@@ -35,13 +36,6 @@ class BxOAuthStudioPage extends BxTemplStudioModule
     {
         return _t('_bx_oauth_help_text', BX_DOL_URL_ROOT);
     }
-
-    protected function getPageCaptionHelp()
-    {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_oauth&page=help">' . _t('_bx_oauth_help') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
-    }
 }
 
 /** @} */

modules/boonex/russian/data/langs/bx_smtp/ru.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
 	<string name="_bx_smtp"><![CDATA[SMTP Почтовик]]></string>
-	<string name="_bx_smtp_tester"><![CDATA[SMTP Почтовик - Тест]]></string>
+	<string name="_bx_smtp_tester"><![CDATA[Тест]]></string>
 	<string name="_bx_smtp_recipient"><![CDATA[Получатель]]></string>
 	<string name="_bx_smtp_subject"><![CDATA[Тема]]></string>
 	<string name="_bx_smtp_body"><![CDATA[Тело]]></string>
@@ -18,8 +18,6 @@
         <br />
         <b>Имя отправителя сообщения</b> - получатели увидят это имя рядом с электронным адресом отправителя, так что, скорее всего, следует указать здесь имя Вашего сайта.
         <br />
-        <b>Прикреплять к отправляемому письму все файлы из папки kmailer/attach</b> - Вы можете загрузить любые файлы в папку <b>modules/boonex/smtpmailer/data/attach</b>, и при включённой данной функции они будут прикреплены к любому письму, посылаемому Вашим сайтом.
-        <br />
         <b>Требует ли Ваш SMTP-сервер безопасного подключения</b> - Вы можете отключить эту опцию, если имя Вашего хоста - localhost, так как безопасное подключение необязательно в данном случае.
         <br />
         <b>Включить SMTP-почтовик</b> - возможно совсем отключить SMTP-почтовик, например, если Ваш SMTP-сервер временно не работает. 

modules/boonex/smtpmailer/classes/BxSMTPStudioPage.php

@@ -22,6 +22,7 @@ class BxSMTPStudioPage extends BxTemplStudioModule
         $this->aMenuItems = array(
             array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
             array('name' => 'tester', 'icon' => 'envelope', 'title' => '_bx_smtp_tester'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_bx_smtp_help'),
         );
     }
 
@@ -35,12 +36,7 @@ class BxSMTPStudioPage extends BxTemplStudioModule
         return _t('_bx_smtp_help_text');
     }
 
-    protected function getPageCaptionHelp()
-    {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_smtp&page=help">' . _t('_bx_smtp_help') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
-    }
+
 }
 
 /** @} */

modules/boonex/smtpmailer/install/langs/en.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
 	<string name="_bx_smtp"><![CDATA[SMTP Mailer]]></string>
-	<string name="_bx_smtp_tester"><![CDATA[SMTP Mailer Tester]]></string>
+	<string name="_bx_smtp_tester"><![CDATA[Test]]></string>
 	<string name="_bx_smtp_recipient"><![CDATA[Recipient]]></string>
 	<string name="_bx_smtp_subject"><![CDATA[Subject]]></string>
 	<string name="_bx_smtp_body"><![CDATA[Body]]></string>
@@ -18,8 +18,6 @@
         <br />
         <b>From name of the message</b> - recipients will see this name as email sender, so it is probably your site name.
         <br />
-        <b>Attach every outgoing email all files from kmailer/attach folder</b> - you can upload any files to <b>modules/boonex/smtpmailer/data/attach</b> folder on your site and enable this option setting to attach uploaded files to every email.
-        <br />
         <b>Is your SMTP server requires secure connection</b> - you can disable it if your hostname is localhost, secure connection is not needed if you send mails from localhost.
         <br />
         <b>Enable SMTP mailer</b> - it is possible to disable SMTP mailer at all, for example if you have temporary problems with your SMTP server. 

modules/boonex/twitter_connect/classes/BxTwitterStudioPage.php

@@ -11,17 +11,20 @@
 
 class BxTwitterStudioPage extends BxTemplStudioModule
 {
-    function getHelp ()
+    function __construct($sModule = "", $sPage = "")
     {
-        $oModule = BxDolModule::getInstance('bx_twitter'); 
-        return _t('_bx_twitter_information_block', BX_DOL_URL_ROOT . $oModule -> _oConfig -> getBaseUri() . 'handle');
+        parent::__construct($sModule, $sPage);
+
+        $this->aMenuItems = array(
+            array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_sys_connect_information'),
+        );
     }
 
-    protected function getPageCaptionHelp()
+    function getHelp ()
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_twitter&page=help">' . _t('_sys_connect_information') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
+        $oModule = BxDolModule::getInstance('bx_twitter'); 
+        return _t('_bx_twitter_information_block', BX_DOL_URL_ROOT . $oModule -> _oConfig -> getBaseUri() . 'handle');
     }
 }
 

modules/boonex/una_connect/classes/BxUnaConStudioPage.php

@@ -11,16 +11,19 @@
 
 class BxUnaConStudioPage extends BxTemplStudioModule
 {
-    function getHelp ()
+    function __construct($sModule = "", $sPage = "")
     {
-        return _t('_bx_unacon_information_block', BX_DOL_URL_ROOT);
+        parent::__construct($sModule, $sPage);
+
+        $this->aMenuItems = array(
+            array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
+            array('name' => 'help', 'icon' => 'question', 'title' => '_sys_connect_information'),
+        );
     }
 
-    protected function getPageCaptionHelp()
+    function getHelp ()
     {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-        $sContent = '<a href="' . BX_DOL_URL_STUDIO . 'module.php?name=bx_unacon&page=help">' . _t('_sys_connect_information') . "</a>";
-        return $oTemplate->parseHtmlByName('page_caption_help.html', array('content' => $sContent));
+        return _t('_bx_unacon_information_block', BX_DOL_URL_ROOT);
     }
 }