Jelajahi Sumber

#43
- prominent divider in popup
- Friend requests was renamed to Friends

Alex Trofimov 12 tahun lalu
induk
melakukan
c1546cf74c

+ 2 - 2
modules/boonex/persons/install/langs/en.xml

@@ -100,8 +100,8 @@
     <string name="_bx_persons_menu_item_title_unsubscribe"><![CDATA[Unsubscribe]]></string>
     <string name="_bx_persons_menu_item_title_system_more_actions"><![CDATA[More Actions]]></string>
     <string name="_bx_persons_menu_item_title_more_actions"><![CDATA[]]></string>
-    <string name="_bx_persons_menu_item_title_system_friend_requests"><![CDATA[Friend requests]]></string>
-    <string name="_bx_persons_menu_item_title_friend_requests"><![CDATA[Friend requests]]></string>
+    <string name="_bx_persons_menu_item_title_system_friends"><![CDATA[Friends]]></string>
+    <string name="_bx_persons_menu_item_title_friends"><![CDATA[Friends]]></string>
 
     <string name="_bx_persons_txt_account_pending"><![CDATA[This profile is pending approval, please wait until it is activated.]]></string>
     <string name="_bx_persons_txt_account_suspended"><![CDATA[This profile is suspended.]]></string>

+ 1 - 1
modules/boonex/persons/install/sql/enable.sql

@@ -179,7 +179,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- notifications menu in account popup
 SET @iNotifMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_account_notifications' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES
-('sys_account_notifications', 'bx_persons', 'notifications-friend-requests', '_bx_persons_menu_item_title_system_friend_requests', '_bx_persons_menu_item_title_friend_requests', 'page.php?i=persons-profile-friends&profile_id={member_id}', '', '', 'group col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:31:"get_unconfirmed_connections_num";s:6:"params";a:1:{i:0;s:20:"sys_profiles_friends";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, IFNULL(@iAddMenuOrder, 0) + 1);
+('sys_account_notifications', 'bx_persons', 'notifications-friend-requests', '_bx_persons_menu_item_title_system_friends', '_bx_persons_menu_item_title_friends', 'page.php?i=persons-profile-friends&profile_id={member_id}', '', '', 'group col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:31:"get_unconfirmed_connections_num";s:6:"params";a:1:{i:0;s:20:"sys_profiles_friends";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, IFNULL(@iAddMenuOrder, 0) + 1);
 
 
 -- ACL

+ 6 - 0
template/css/default.less

@@ -57,6 +57,12 @@
         .margin-left(0);
     }
 }
+.bx-def-margin-right-auto {
+    .margin-right(@bx-margin);
+    &:last-child {
+        .margin-right(0);
+    }
+}
 
 .bx-def-margin-sec {
     .margin(@bx-margin-sec);

+ 1 - 1
template/menu_account_notifications.html

@@ -1,4 +1,4 @@
-<ul class="bx-menu-notif bx-def-border-top bx-menu-object-__object__ bx-clearfix">
+<ul class="bx-menu-notif bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
         <li class="bx-def-border-bottom bx-def-padding-sec-top bx-def-padding-sec-bottom __class_add__">
             <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>

+ 3 - 2
template/menu_account_popup.html

@@ -1,5 +1,6 @@
 <div class="bx-menu-account-popup bx-menu-object-__object__">
     <div class="bx-def-font-h2">__profile_display_name__</div>
-    <div class="bx-def-margin-sec-top">__menu_account__</div>
-    <div class="bx-def-margin-sec-top">__menu_notifications__</div>
+    <div class="bx-def-margin-sec-top bx-def-margin-sec-bottom">__menu_account__</div>
+    <div class="bx-def-color-bg-sec" style="height:0.5em; margin-left:-3em; margin-right:-3em;"></div>
+    <div>__menu_notifications__</div>
 </div>

+ 1 - 1
template/menu_horizontal.html

@@ -1,5 +1,5 @@
 <ul class="bx-menu-hor bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
-        <li class="bx-def-margin-left-auto __class_add__"><a href="__link__" target="__target__" onclick="__onclick__">__title__</a></li>
+        <li class="bx-def-margin-right-auto __class_add__"><a href="__link__" target="__target__" onclick="__onclick__">__title__</a></li>
     </bx_repeat:menu_items>
 </ul>