Sfoglia il codice sorgente

Ticket #532 - new menu template to fit the idea better.

AntonLV 9 anni fa
parent
commit
3b4a8a161c

+ 3 - 2
install/sql/system.sql

@@ -2894,7 +2894,8 @@ INSERT INTO `sys_menu_templates` (`id`, `template`, `title`, `visible`) VALUES
 (14, 'menu_floating_blocks_big.html', '_sys_menu_template_title_floating_blocks_big', 1),
 (15, 'menu_custom.html', '_sys_menu_template_title_custom', 0),
 (16, 'menu_buttons_ver.html', '_sys_menu_template_title_buttons_ver', 1),
-(17, 'menu_inline_sbtn.html', '_sys_menu_template_title_inline_sbtn', 1);
+(17, 'menu_inline_sbtn.html', '_sys_menu_template_title_inline_sbtn', 1),
+(18, 'menu_icon_buttons_hor.html', '_sys_menu_template_title_icon_buttons_hor', 1);
 
 CREATE TABLE IF NOT EXISTS `sys_objects_menu` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -2934,7 +2935,7 @@ INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `templa
 ('sys_switch_language_inline', '_sys_menu_title_switch_language_inline', 'sys_switch_language', 'system', 3, 0, 1, 'BxTemplMenuSwitchLanguage', ''),
 ('sys_switch_template', '_sys_menu_title_switch_template', 'sys_switch_template', 'system', 6, 0, 1, 'BxTemplMenuSwitchTemplate', ''),
 ('sys_set_acl_level', '_sys_menu_title_set_acl_level', '', 'system', 6, 0, 1, 'BxTemplMenuSetAclLevel', ''),
-('sys_social_sharing', '_sys_menu_title_social_sharing', 'sys_social_sharing', 'system', 9, 0, 1, 'BxTemplMenuSocialSharing', '');
+('sys_social_sharing', '_sys_menu_title_social_sharing', 'sys_social_sharing', 'system', 18, 0, 1, 'BxTemplMenuSocialSharing', '');
 
 CREATE TABLE IF NOT EXISTS `sys_menu_sets` (
   `set_name` varchar(64) NOT NULL,

+ 1 - 1
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -837,7 +837,7 @@ class BxBaseModGeneralModule extends BxDolModule
             ));
         }
 
-        $aCustomParams = false;
+        $aCustomParams = array();
         $iIdThumb = isset($aParams['id_thumb']) ? (int)$aParams['id_thumb'] : 0;
         $bSocialSharing = isset($aParams['social_sharing']) ? (bool)$aParams['social_sharing'] : true;
         if ($iIdThumb && $bSocialSharing) {

+ 6 - 5
modules/boonex/english/data/langs/system/en.xml

@@ -1988,10 +1988,10 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_set_acl_level"><![CDATA[Set membership]]></string>
 	<string name="_sys_menu_item_title_studio"><![CDATA[Studio]]></string>
 	<string name="_sys_menu_item_title_subscriptions"><![CDATA[Subscriptions]]></string>
-	<string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[]]></string>
-    <string name="_sys_menu_item_title_social_sharing_googleplus"><![CDATA[]]></string>
-    <string name="_sys_menu_item_title_social_sharing_twitter"><![CDATA[]]></string>
-    <string name="_sys_menu_item_title_social_sharing_pinterest"><![CDATA[]]></string>
+	<string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[Share in Facebook]]></string>
+    <string name="_sys_menu_item_title_social_sharing_googleplus"><![CDATA[Share in Google Plus]]></string>
+    <string name="_sys_menu_item_title_social_sharing_twitter"><![CDATA[Share in Twitter]]></string>
+    <string name="_sys_menu_item_title_social_sharing_pinterest"><![CDATA[Share in Pinterest]]></string>
 	<string name="_sys_menu_item_title_system_about"><![CDATA[About]]></string>
 	<string name="_sys_menu_item_title_system_privacy"><![CDATA[Privacy]]></string>
 	<string name="_sys_menu_item_title_system_switch_language"><![CDATA[Language]]></string>
@@ -2046,12 +2046,13 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_set_title_homepage"><![CDATA[Content modules]]></string>
 	<string name="_sys_menu_set_title_toolbar_member"><![CDATA[Toolbar Member]]></string>
 	<string name="_sys_menu_set_title_toolbar_site"><![CDATA[Toolbar Site]]></string>
-	<string name="_sys_menu_template_title_buttons_hor"><![CDATA[Horizontal Buttons]]></string>
+	<string name="_sys_menu_template_title_buttons_hor"><![CDATA[Horizontal Buttons]]></string>	
 	<string name="_sys_menu_template_title_buttons_ver"><![CDATA[Vertical Buttons]]></string>
 	<string name="_sys_menu_template_title_floating_blocks"><![CDATA[Floating Blocks]]></string>
 	<string name="_sys_menu_template_title_floating_blocks_big"><![CDATA[Floating Blocks Big]]></string>
 	<string name="_sys_menu_template_title_footer"><![CDATA[Footer Links]]></string>
 	<string name="_sys_menu_template_title_hor"><![CDATA[Horizontal Links]]></string>
+	<string name="_sys_menu_template_title_icon_buttons_hor"><![CDATA[Horizontal Icon Buttons]]></string>
 	<string name="_sys_menu_template_title_inline"><![CDATA[Inline]]></string>
 	<string name="_sys_menu_template_title_inline_sbtn"><![CDATA[Inline ('special' buttons)]]></string>
 	<string name="_sys_menu_template_title_interactive_vertical"><![CDATA[Interactive Vertical Links]]></string>

+ 9 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -1986,6 +1986,10 @@
 	<string name="_sys_menu_item_title_set_acl_level"><![CDATA[Назначить членство]]></string>
 	<string name="_sys_menu_item_title_studio"><![CDATA[Студия]]></string>
 	<string name="_sys_menu_item_title_subscriptions"><![CDATA[Подписки]]></string>
+	<string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[Поделиться в Facebook]]></string>
+    <string name="_sys_menu_item_title_social_sharing_googleplus"><![CDATA[Поделиться в Google Plus]]></string>
+    <string name="_sys_menu_item_title_social_sharing_twitter"><![CDATA[Поделиться в Twitter]]></string>
+    <string name="_sys_menu_item_title_social_sharing_pinterest"><![CDATA[Поделиться в Pinterest]]></string>
 	<string name="_sys_menu_item_title_system_about"><![CDATA[Об...]]></string>
 	<string name="_sys_menu_item_title_system_privacy"><![CDATA[Конфиденциальность]]></string>
 	<string name="_sys_menu_item_title_system_switch_language"><![CDATA[Язык]]></string>
@@ -2017,6 +2021,10 @@
 	<string name="_sys_menu_item_title_system_set_acl_level"><![CDATA[Назначить членство]]></string>
 	<string name="_sys_menu_item_title_system_studio"><![CDATA[Студия]]></string>
 	<string name="_sys_menu_item_title_system_subscriptions"><![CDATA[Подписки]]></string>
+	<string name="_sys_menu_item_title_system_social_sharing_facebook"><![CDATA[Поделиться в Facebook]]></string>
+    <string name="_sys_menu_item_title_system_social_sharing_googleplus"><![CDATA[Поделиться в Google Plus]]></string>
+    <string name="_sys_menu_item_title_system_social_sharing_twitter"><![CDATA[Поделиться в Twitter]]></string>
+    <string name="_sys_menu_item_title_system_social_sharing_pinterest"><![CDATA[Поделиться в Pinterest]]></string>
 	<string name="_sys_menu_set_title_account"><![CDATA[Аккаунт]]></string>
 	<string name="_sys_menu_set_title_account_dashboard_manage_tools"><![CDATA[Инструменты управления Панелью Аккаунта]]></string>
 	<string name="_sys_menu_set_title_account_settings"><![CDATA[Настройки Аккаунта]]></string>
@@ -2042,6 +2050,7 @@
 	<string name="_sys_menu_template_title_floating_blocks_big"><![CDATA[Подвесные Блоки - Большие]]></string>
 	<string name="_sys_menu_template_title_footer"><![CDATA[Футер - Ссылки]]></string>
 	<string name="_sys_menu_template_title_hor"><![CDATA[Горизонтальные Ссылки]]></string>
+	<string name="_sys_menu_template_title_icon_buttons_hor"><![CDATA[Горизонтальные Кнопки с Иконками]]></string>
 	<string name="_sys_menu_template_title_inline"><![CDATA[В тексте]]></string>
 	<string name="_sys_menu_template_title_inline_sbtn"><![CDATA[В тексте ('спец' кнопки)]]></string>
 	<string name="_sys_menu_template_title_interactive_vertical"><![CDATA[Интерактивные Вертикальные Ссылки]]></string>

+ 6 - 0
template/menu_icon_buttons_hor.html

@@ -0,0 +1,6 @@
+<ul class="bx-menu-btns-hor bx-menu-object-__object__ bx-clearfix">
+    <bx_repeat:menu_items><li class="bx-def-margin-thd-topbottom __class_add__"><a class="bx-btn bx-def-margin-right" href="__link__" target="__target__" onclick="__onclick__" <bx_if:title>title="__title_attr__"</bx_if:title>>
+        <bx_if:image><i style="background-image:url(__icon_url__)"></i></bx_if:image>
+        <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
+    </a></li></bx_repeat:menu_items>
+</ul>

+ 4 - 1
template/scripts/BxBaseMenu.php

@@ -132,7 +132,10 @@ class BxBaseMenu extends BxDolMenu
 		);
 		$a['bx_if:title'] = array (
 			'condition' => (bool)$a['title'],
-			'content' => array('title' => $a['title']),
+			'content' => array(
+				'title' => $a['title'],
+		        'title_attr' => $a['title_attr']
+		    ),
 		);
 		$a['bx_if:addon'] = array (
 			'condition' => (bool)$mixedAddon,

+ 1 - 1
template/scripts/BxBaseMenuSocialSharing.php

@@ -32,7 +32,7 @@ class BxBaseMenuSocialSharing extends BxTemplMenu
     {
         if(!empty($this->_aNeedEncode) && is_array($this->_aNeedEncode))
             foreach($this->_aNeedEncode as $sKey1 => $sKey2)
-                if(key_exists($sKey1, $a))
+                if(array_key_exists($sKey1, $a))
                     $a[$sKey2] = rawurlencode($a[$sKey1]);
 
         return parent::addMarkers($a);