Просмотр исходного кода

Ticket #255 - Clean up: Description block for Persons module.

AntonLV 10 лет назад
Родитель
Сommit
299dbe86ce

+ 2 - 0
modules/boonex/persons/classes/BxPersonsConfig.php

@@ -43,6 +43,8 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'FIELD_ADDED' => 'added',
             'FIELD_CHANGED' => 'changed',
             'FIELD_NAME' => 'fullname',
+        	'FIELD_TITLE' => 'fullname',
+        	'FIELD_TEXT' => 'description',
             'FIELD_PICTURE' => 'picture',
             'FIELD_PICTURE_PREVIEW' => 'picture_preview',
             'FIELD_COVER' => 'cover',

+ 1 - 0
modules/boonex/persons/install/langs/en.xml

@@ -80,6 +80,7 @@
 	<string name="_bx_persons_page_block_title_system_profile_info"><![CDATA[Info]]></string>
 	<string name="_bx_persons_page_block_title_profile_membership"><![CDATA[Membership]]></string>
 	<string name="_bx_persons_page_block_title_system_profile_membership"><![CDATA[Membership]]></string>
+	<string name="_bx_persons_page_block_title_profile_description"><![CDATA[Description]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends_link"><![CDATA[Friends of <a href="{profile_link}">{display_name}</a>]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>

+ 5 - 4
modules/boonex/persons/install/sql/enable.sql

@@ -32,7 +32,8 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_persons_view_profile', 'view-persons-profile', '_bx_persons_page_title_sys_view_profile', '_bx_persons_page_title_view_profile', 'bx_persons', 7, 2147483647, 1, 'page.php?i=view-persons-profile', '', '', '', 0, 1, 0, 'BxPersonsPageEntry', 'modules/boonex/persons/classes/BxPersonsPageEntry.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_persons_view_profile', 2, 'bx_persons', '', '_bx_persons_page_block_title_profile_friends', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:15:\"profile_friends\";}', 0, 0, 1, 0),
+('bx_persons_view_profile', 2, 'bx_persons', '', '_bx_persons_page_block_title_profile_description', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 0),
+('bx_persons_view_profile', 2, 'bx_persons', '', '_bx_persons_page_block_title_profile_friends', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:15:\"profile_friends\";}', 0, 0, 1, 1),
 ('bx_persons_view_profile', 3, 'bx_persons', '', '_bx_persons_page_block_title_profile_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 0),
 ('bx_persons_view_profile', 3, 'bx_persons', '', '_bx_persons_page_block_title_profile_membership', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:18:\"profile_membership\";}', 0, 0, 1, 1);
 
@@ -141,9 +142,9 @@ SET @iHomepageMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name`
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('sys_homepage', 'bx_persons', 'persons-home', '_bx_persons_menu_item_title_system_entries_home', '_bx_persons_menu_item_title_entries_home', 'page.php?i=persons-home', '', '', 'user col-blue3', 'bx_persons_submenu', 2147483647, 1, 1, IFNULL(@iHomepageMenuOrder, 0) + 1);
 
---SET @iCreateProfileMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_profiles_create' 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`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES
---('sys_profiles_create', 'bx_persons', 'create-person-profile', '_bx_persons_menu_item_title_system_profile_type', '_bx_persons_menu_item_title_profile_type', 'page.php?i=create-persons-profile', '', '', 'user', '', 2147483647, 1, 1, IFNULL(@iCreateProfileMenuOrder, 0) + 1);
+-- SET @iCreateProfileMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_profiles_create' 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`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES
+-- ('sys_profiles_create', 'bx_persons', 'create-person-profile', '_bx_persons_menu_item_title_system_profile_type', '_bx_persons_menu_item_title_profile_type', 'page.php?i=create-persons-profile', '', '', 'user', '', 2147483647, 1, 1, IFNULL(@iCreateProfileMenuOrder, 0) + 1);
 
 SET @iAddMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_add_profile_links' 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`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 1 - 0
modules/boonex/persons/template/entry-text.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/profile/template/entry-text.html />

+ 6 - 5
modules/boonex/russian/data/langs/bx_persons/ru.xml

@@ -9,11 +9,11 @@
 	<string name="_bx_persons_option_num_rss"><![CDATA[Число элементов в ленте RSS]]></string>
 
 	<string name="_bx_persons_form_profile"><![CDATA[Персоны]]></string>
-	<string name="_bx_persons_form_profile_display_add"><![CDATA[Добавить персону]]></string>
-	<string name="_bx_persons_form_profile_display_edit"><![CDATA[Редактировать персону]]></string>
-	<string name="_bx_persons_form_profile_display_edit_cover"><![CDATA[Редактировать обложку]]></string>
-	<string name="_bx_persons_form_profile_display_delete"><![CDATA[Удалить персону]]></string>
-	<string name="_bx_persons_form_profile_display_view"><![CDATA[Просмотреть персону]]></string>
+	<string name="_bx_persons_form_profile_display_add"><![CDATA[Добавление персоны]]></string>
+	<string name="_bx_persons_form_profile_display_edit"><![CDATA[Редактирование персоны]]></string>
+	<string name="_bx_persons_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
+	<string name="_bx_persons_form_profile_display_delete"><![CDATA[Удаление персоны]]></string>
+	<string name="_bx_persons_form_profile_display_view"><![CDATA[Просмотр персоны]]></string>
     <string name="_bx_persons_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_persons_form_profile_input_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_persons_form_profile_input_sys_allow_view_to"><![CDATA[Доступен для]]></string>
@@ -80,6 +80,7 @@
 	<string name="_bx_persons_page_block_title_system_profile_info"><![CDATA[Инфо]]></string>
 	<string name="_bx_persons_page_block_title_profile_membership"><![CDATA[Членство]]></string>
 	<string name="_bx_persons_page_block_title_system_profile_membership"><![CDATA[Членство]]></string>
+	<string name="_bx_persons_page_block_title_profile_description"><![CDATA[Описание]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends_link"><![CDATA[<a href="{profile_link}">{display_name}</a> - Друзья]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_persons_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>