Resolve conflict.

install/sql/system.sql

@@ -295,10 +295,11 @@ SET @iCategoryId = LAST_INSERT_ID();
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_params`, `check_error`, `order`) VALUES
 (@iCategoryId, 'sys_cron_time', '_adm_stg_cpt_option_sys_cron_time', '0', 'digit', '', '', '', '', 2),
 (@iCategoryId, 'sys_install_time', '_adm_stg_cpt_option_sys_install_time', '0', 'digit', '', '', '', '', 3),
-(@iCategoryId, 'sys_upgrade_channel', '_adm_stg_cpt_option_sys_upgrade_channel', 'stable', 'select', 'stable,beta', '', '', '', 4),
-(@iCategoryId, 'sys_revision', '_adm_stg_cpt_option_sys_revision', '0', 'digit', '', '', '', '', 5),
-(@iCategoryId, 'sys_eq_time', '_adm_stg_cpt_option_sys_eq_time', '0', 'digit', '', '', '', '', 6),
-(@iCategoryId, 'sys_push_queue_time', '_adm_stg_cpt_option_sys_push_queue_time', '0', 'digit', '', '', '', '', 7),
+(@iCategoryId, 'sys_update_time', '_adm_stg_cpt_option_sys_update_time', '0', 'digit', '', '', '', '', 4),
+(@iCategoryId, 'sys_upgrade_channel', '_adm_stg_cpt_option_sys_upgrade_channel', 'stable', 'select', 'stable,beta', '', '', '', 5),
+(@iCategoryId, 'sys_revision', '_adm_stg_cpt_option_sys_revision', '0', 'digit', '', '', '', '', 6),
+(@iCategoryId, 'sys_eq_time', '_adm_stg_cpt_option_sys_eq_time', '0', 'digit', '', '', '', '', 7),
+(@iCategoryId, 'sys_push_queue_time', '_adm_stg_cpt_option_sys_push_queue_time', '0', 'digit', '', '', '', '', 8),
 
 (@iCategoryId, 'sys_ftp_login', '_adm_stg_cpt_option_sys_ftp_login', '', 'digit', '', '', '', '', 10),
 (@iCategoryId, 'sys_ftp_password', '_adm_stg_cpt_option_sys_ftp_password', '', 'digit', '', '', '', '', 11),

modules/base/profile/classes/BxBaseModProfileFormsEntryHelper.php

@@ -221,6 +221,10 @@ class BxBaseModProfileFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
                 if($sRedirectCustom) {
                     $sRedirectUrl = $this->prepareCustomRedirectUrl($sRedirectCustom, $aContentInfo);
                 }
+                
+            case BX_DOL_PROFILE_REDIRECT_HOMEPAGE:
+                $sRedirectUrl =  BX_DOL_URL_ROOT;  
+                break;
         }
 
         $sCustomReferrer = $oSession->getValue('custom-referrer');

modules/base/profile/classes/BxBaseModProfileModule.php

@@ -12,6 +12,7 @@
 define('BX_DOL_PROFILE_REDIRECT_PROFILE', 'profile');
 define('BX_DOL_PROFILE_REDIRECT_LAST', 'last');
 define('BX_DOL_PROFILE_REDIRECT_CUSTOM', 'custom');
+define('BX_DOL_PROFILE_REDIRECT_HOMEPAGE', 'homepage');
 
 define('BX_DOL_PROFILE_ACTIVATE_ALWAYS', 'on');
 define('BX_DOL_PROFILE_ACTIVATE_NEVER', 'off');
@@ -111,7 +112,7 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
         $CNF = &$this->_oConfig->CNF;
 
         $aResult = array();
-        $aChoices = array(BX_DOL_PROFILE_REDIRECT_PROFILE, BX_DOL_PROFILE_REDIRECT_LAST, BX_DOL_PROFILE_REDIRECT_CUSTOM);
+        $aChoices = array(BX_DOL_PROFILE_REDIRECT_PROFILE, BX_DOL_PROFILE_REDIRECT_LAST, BX_DOL_PROFILE_REDIRECT_CUSTOM, BX_DOL_PROFILE_REDIRECT_HOMEPAGE);
         foreach($aChoices as $sChoice) 
             $aResult[] = array('key' => $sChoice, 'value' => _t($CNF['T']['option_redirect_aadd_' . $sChoice]));
 

modules/boonex/albums/classes/BxAlbumsConfig.php

@@ -21,6 +21,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             'edit-album' => 'checkAllowedEdit',
             'edit-image' => 'checkAllowedEdit',
             'delete-album' => 'checkAllowedDelete',
+			'delete-image' => 'checkAllowedDelete',
         );
 
         $this->CNF = array (

modules/boonex/albums/classes/BxAlbumsMenuViewActionsMedia.php

@@ -89,6 +89,15 @@ class BxAlbumsMenuViewActionsMedia extends BxAlbumsMenuViewActions
             'object_menu' => $CNF['OBJECT_MENU_ACTIONS_VIEW_MEDIA']
         ));
     }
+	
+	protected function _getMenuItemDeleteImage($aItem)
+    {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        return $this->_getMenuItemByNameActions($aItem, array(
+            'object_menu' => $CNF['OBJECT_MENU_ACTIONS_VIEW_MEDIA']
+        ));
+    }
 
     protected function _getMenuItemView($aItem, $aParams = array())
     {

modules/boonex/albums/classes/BxAlbumsModule.php

@@ -737,6 +737,18 @@ class BxAlbumsModule extends BxBaseModTextModule
 
         echoJson(array('popup' => array('html' => $sContent, 'options' => array('closeOnOuterClick' => false))));
     }
+	
+	
+	public function actionDeleteMedia($iMediaId)
+    {
+        $CNF = &$this->_oConfig->CNF;
+
+		$aMediaInfo = $this->_oDb->getMediaInfoById($iMediaId);
+		$oUploader = BxDolUploader::getObjectInstance($CNF['OBJECT_UPLOADERS'][0], $CNF['OBJECT_STORAGE'], '');
+        $oUploader->deleteGhost($aMediaInfo['file_id'], bx_get_logged_profile_id());
+        
+        echoJson(['redirect' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aMediaInfo['content_id'])]);
+    }
 
     public function actionGetSiblingMedia($iMediaId, $mixedContext)
     {

modules/boonex/albums/classes/BxAlbumsTemplate.php

@@ -384,7 +384,7 @@ class BxAlbumsTemplate extends BxBaseModTextTemplate
         $oModule = BxDolModule::getInstance($this->MODULE);
         $CNF = &$oModule->_oConfig->CNF;
 
-        if (!($aAlbumInfo = $oModule->_oDb->getContentInfoById($aMediaInfo['content_id'])))
+        if (!($aAlbumInfo = $oModule->_oDb->getContentInfoById($aMediaInfo['id'])))
             return '';
 
         return $this->entryAuthor ($aMediaInfo, $aAlbumInfo[$CNF['FIELD_AUTHOR']]);

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

@@ -197,6 +197,8 @@
     <string name="_bx_albums_menu_item_title_add_images"><![CDATA[Add/Edit Pictures]]></string>
     <string name="_bx_albums_menu_item_title_system_edit_image"><![CDATA[Edit Image]]></string>
     <string name="_bx_albums_menu_item_title_edit_image"><![CDATA[Edit Image]]></string>
+	<string name="_bx_albums_menu_item_title_system_delete_image"><![CDATA[Delete Image]]></string>
+	<string name="_bx_albums_menu_item_title_delete_image"><![CDATA[Delete Image]]></string>
     <string name="_bx_albums_menu_item_title_system_delete_entry"><![CDATA[Delete]]></string>
     <string name="_bx_albums_menu_item_title_delete_entry"><![CDATA[Delete]]></string>
     <string name="_bx_albums_menu_item_title_system_view_entry"><![CDATA[View Album]]></string>

modules/boonex/albums/install/sql/enable.sql

@@ -275,7 +275,9 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 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 
 ('bx_albums_view_media', 'bx_albums', 'add-images-to-album', '_bx_albums_menu_item_title_system_add_images', '_bx_albums_menu_item_title_add_images', 'page.php?i=add-images&id={content_id}', '', '', 'plus', '', 2147483647, 1, 0, 10),
 ('bx_albums_view_media', 'bx_albums', 'edit-album', '_bx_albums_menu_item_title_system_edit_album', '_bx_albums_menu_item_title_edit_album', 'page.php?i=edit-album&id={content_id}', '', '', 'pencil-alt', '', 2147483647, 1, 0, 20),
-('bx_albums_view_media', 'bx_albums', 'edit-image', '_bx_albums_menu_item_title_system_edit_image', '_bx_albums_menu_item_title_edit_image', 'javascript:void(0)', 'javascript:{js_object}.editMedia(this, {media_id});', '', 'pencil-alt', '', 2147483647, 1, 0, 30);
+('bx_albums_view_media', 'bx_albums', 'edit-image', '_bx_albums_menu_item_title_system_edit_image', '_bx_albums_menu_item_title_edit_image', 'javascript:void(0)', 'javascript:{js_object}.editMedia(this, {media_id});', '', 'pencil-alt', '', 2147483647, 1, 0, 30),
+('bx_albums_view_media', 'bx_albums', 'delete-image', '_bx_albums_menu_item_title_system_delete_image', '_bx_albums_menu_item_title_delete_image', 'javascript:void(0)', 'javascript:{js_object}.deleteMedia(this, {media_id});', '', 'remove', '', 2147483647, 1, 0, 40);
+
 
 -- MENU: all actions menu for view media page 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
@@ -288,6 +290,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_albums_view_actions_media', 'bx_albums', 'add-images-to-album', '_bx_albums_menu_item_title_system_add_images', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 10),
 ('bx_albums_view_actions_media', 'bx_albums', 'edit-album', '_bx_albums_menu_item_title_system_edit_album', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 20),
 ('bx_albums_view_actions_media', 'bx_albums', 'edit-image', '_bx_albums_menu_item_title_system_edit_image', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 30),
+('bx_albums_view_actions_media', 'bx_albums', 'delete-image', '_bx_albums_menu_item_title_system_delete_image', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 40),
 ('bx_albums_view_actions_media', 'bx_albums', 'comment', '_sys_menu_item_title_system_va_comment', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 200),
 ('bx_albums_view_actions_media', 'bx_albums', 'view', '_sys_menu_item_title_system_va_view', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 210),
 ('bx_albums_view_actions_media', 'bx_albums', 'vote', '_sys_menu_item_title_system_va_vote', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 220),

modules/boonex/albums/js/main.js

@@ -54,6 +54,28 @@ BxAlbumsMain.prototype.editMedia = function(oButton, iId) {
     );
 };
 
+BxAlbumsMain.prototype.deleteMedia = function(oButton, iId) {
+    var $this = this;
+	
+    bx_confirm(_t('_Are_you_sure'), function() {
+		var oDate = new Date();
+		$this.loadingInButton(oButton, true);
+
+		$.get(
+			$this._sActionsUrl + 'delete_media/' + iId, 
+			{
+				_t: oDate.getTime()
+			},
+			function(oData) {
+				$this.loadingInButton(oButton, false);
+
+				processJsonData(oData);
+			},
+			'json'
+		);
+	});
+};
+
 BxAlbumsMain.prototype.onEditMedia = function(oData) {
     if(oData && oData.content != undefined)
         $('#' + this._oHtmlIds['subentry_votes'] + oData.content.subentry_id).html(oData.content.votes_formated);

modules/boonex/english/data/langs/system/en.xml

@@ -618,6 +618,7 @@
 	<string name="_adm_dbd_txt_script_on"><![CDATA[UNA on]]></string>
 	<string name="_adm_dbd_txt_htools_status"><![CDATA[{0} - <b>{1}</b>]]></string>
 	<string name="_adm_dbd_txt_installed"><![CDATA[Installed:]]></string>
+	<string name="_adm_dbd_txt_updated"><![CDATA[Updated:]]></string>
 	<string name="_adm_dbd_txt_version"><![CDATA[Version:]]></string>
     <string name="_adm_dbd_msg_upgrade_started"><![CDATA[Site will be upgraded within a minute.<br />Don't forget to <a href="{0}store.php?page=updates">check for modules updates</a> after that.]]></string>
 	<string name="_adm_dbd_txt_su_database"><![CDATA[Database]]></string>
@@ -1531,6 +1532,7 @@
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP server password]]></string>
 	<string name="_adm_stg_cpt_option_sys_cron_time"><![CDATA[Last cron execution time]]></string>
 	<string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Installation date]]></string>
+	<string name="_adm_stg_cpt_option_sys_update_time"><![CDATA[Last update]]></string>
 	<string name="_adm_stg_cpt_option_sys_upgrade_channel"><![CDATA[Update channel]]></string>
 	<string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Live updates interval (in milliseconds)]]></string>
     <string name="_adm_stg_cpt_option_sys_location_field_default"><![CDATA[Location field provider]]></string>

modules/boonex/nexus/template/styles.html

@@ -20,7 +20,7 @@ html .bx-menu-toolbar-padding {
     padding-top:0 !important;
 }
 html #bx-toolbar-content {
-    display:none;
+    display:none !important;
 }
 html .cd-side-nav,
 html .cd-main-content .content-wrapper {
@@ -53,4 +53,10 @@ html .bx-sliding-menu-main ul.bx-menu-floating-blocks-big {
 html .bx-sliding-menu-main ul.bx-menu-floating-blocks-big {
     text-align:center;
 }
+html .cd-side-nav,
+html .bx-sliding-menu, 
+html .bx-sliding-menu-main 
+{
+    top:0 !important;
+}
 </style>

modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -263,6 +263,7 @@ class BxOrgsConfig extends BxBaseModGroupsConfig
             	'option_redirect_aadd_profile' => '_bx_orgs_option_redirect_aadd_profile',
             	'option_redirect_aadd_last' => '_bx_orgs_option_redirect_aadd_last',
             	'option_redirect_aadd_custom' => '_bx_orgs_option_redirect_aadd_custom',
+                'option_redirect_aadd_homepage' => '_bx_orgs_option_redirect_aadd_homepage',
                 'option_activation_on' => '_bx_orgs_option_activation_on',
             	'option_activation_off' => '_bx_orgs_option_activation_off',
             	'option_activation_add' => '_bx_orgs_option_activation_add',

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

@@ -11,6 +11,7 @@
     <string name="_bx_orgs_option_redirect_aadd_profile"><![CDATA[Profile Page]]></string>
     <string name="_bx_orgs_option_redirect_aadd_last"><![CDATA[Last Page]]></string>
     <string name="_bx_orgs_option_redirect_aadd_custom"><![CDATA[Custom Page]]></string>
+    <string name="_bx_orgs_option_redirect_aadd_homepage"><![CDATA[Homepage]]></string>
     <string name="_bx_orgs_option_redirect_aadd_custom_url"><![CDATA[URL for 'Custom Page' redirect]]></string>
     <string name="_bx_orgs_option_activation_on"><![CDATA[Auto-activate after creation & editing]]></string>
     <string name="_bx_orgs_option_activation_add"><![CDATA[Manually activate after editing, auto-activate after creation]]></string>

modules/boonex/persons/classes/BxPersonsConfig.php

@@ -203,6 +203,7 @@ class BxPersonsConfig extends BxBaseModProfileConfig
                 'option_redirect_aadd_profile' => '_bx_persons_option_redirect_aadd_profile',
             	'option_redirect_aadd_last' => '_bx_persons_option_redirect_aadd_last',
             	'option_redirect_aadd_custom' => '_bx_persons_option_redirect_aadd_custom',
+                'option_redirect_aadd_homepage' => '_bx_persons_option_redirect_aadd_homepage',
                 'option_activation_on' => '_bx_persons_option_activation_on',
             	'option_activation_off' => '_bx_persons_option_activation_off',
             	'option_activation_add' => '_bx_persons_option_activation_add',

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

@@ -11,6 +11,7 @@
 	<string name="_bx_persons_option_redirect_aadd_profile"><![CDATA[Profile Page]]></string>
 	<string name="_bx_persons_option_redirect_aadd_last"><![CDATA[Last Page]]></string>
 	<string name="_bx_persons_option_redirect_aadd_custom"><![CDATA[Custom Page]]></string>
+  <string name="_bx_persons_option_redirect_aadd_homepage"><![CDATA[Homepage]]></string>
 	<string name="_bx_persons_option_redirect_aadd_custom_url"><![CDATA[URL for 'Custom Page' redirect]]></string>
   <string name="_bx_persons_option_activation_on"><![CDATA[After creation & after editing]]></string>
   <string name="_bx_persons_option_activation_add"><![CDATA[After creation only]]></string>

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

@@ -195,6 +195,8 @@
     <string name="_bx_albums_menu_item_title_add_images"><![CDATA[Добавить/Изменить изображения]]></string>
     <string name="_bx_albums_menu_item_title_system_edit_image"><![CDATA[Изменить изображение]]></string>
     <string name="_bx_albums_menu_item_title_edit_image"><![CDATA[Изменить изображение]]></string>
+    <string name="_bx_albums_menu_item_title_system_delete_image"><![CDATA[Удалить изображение]]></string>
+	  <string name="_bx_albums_menu_item_title_delete_image"><![CDATA[Удалить изображение]]></string>
     <string name="_bx_albums_menu_item_title_system_delete_entry"><![CDATA[Удалить]]></string>
     <string name="_bx_albums_menu_item_title_delete_entry"><![CDATA[Удалить]]></string>
     <string name="_bx_albums_menu_item_title_system_view_entry"><![CDATA[Просмотреть альбом]]></string>

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

@@ -11,6 +11,7 @@
     <string name="_bx_orgs_option_redirect_aadd_profile"><![CDATA[Страница организации]]></string>
     <string name="_bx_orgs_option_redirect_aadd_last"><![CDATA[Предыдущая страница]]></string>
     <string name="_bx_orgs_option_redirect_aadd_custom"><![CDATA[Пользовательская страница]]></string>
+    <string name="_bx_orgs_option_redirect_aadd_homepage"><![CDATA[Домашняя страница]]></string>
     <string name="_bx_orgs_option_redirect_aadd_custom_url"><![CDATA[URL для перенаправления 'Пользовательская страница']]></string>
     <string name="_bx_orgs_option_activation_on"><![CDATA[После создания и после редактирования]]></string>
     <string name="_bx_orgs_option_activation_add"><![CDATA[Только после создания]]></string>

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

@@ -11,6 +11,7 @@
 	<string name="_bx_persons_option_redirect_aadd_profile"><![CDATA[Страница профиля]]></string>
     <string name="_bx_persons_option_redirect_aadd_last"><![CDATA[Предыдущая страница]]></string>
     <string name="_bx_persons_option_redirect_aadd_custom"><![CDATA[Пользовательская страница]]></string>
+    <string name="_bx_persons_option_redirect_aadd_homepage"><![CDATA[Домашняя страница]]></string>
     <string name="_bx_persons_option_redirect_aadd_custom_url"><![CDATA[URL для перенаправления 'Пользовательская страница']]></string>
     <string name="_bx_persons_option_activation_on"><![CDATA[После создания и после редактирования]]></string>
     <string name="_bx_persons_option_activation_add"><![CDATA[Только после создания]]></string>

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

@@ -1517,6 +1517,7 @@
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP-сервер - Пароль]]></string>
 	<string name="_adm_stg_cpt_option_sys_cron_time"><![CDATA[Дата последнего запуска планировщика]]></string>
     <string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Дата установки]]></string>
+	<string name="_adm_stg_cpt_option_sys_update_time"><![CDATA[Последнее обновление]]></string>
     <string name="_adm_stg_cpt_option_sys_upgrade_channel"><![CDATA[Канал обновлений]]></string>
     <string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Интервал обновлений (в миллисекундах)]]></string>
     <string name="_adm_stg_cpt_option_sys_location_field_default"><![CDATA[Поставщик для поля ввода адреса]]></string>

studio/classes/BxDolStudioDashboard.php

@@ -67,10 +67,13 @@ class BxDolStudioDashboard extends BxTemplStudioWidget
 
             	case 'perform_upgrade':
                     $oUpgrader = bx_instance('BxDolUpgrader');
-                    if(!$oUpgrader->prepare(false))
+                    if(!$oUpgrader->prepare(false)){
                         $aResult = array('code' => 1, 'message' => $oUpgrader->getError());
-                    else
+					}
+                    else{
+						$this->oDb->setUpdateDate();
                         $aResult = array('code' => 0, 'message' => _t('_adm_dbd_msg_upgrade_started', BX_DOL_URL_STUDIO));
+					}
                     break;
 
                 case 'clear_cache':

studio/classes/BxDolStudioDashboardQuery.php

@@ -19,6 +19,12 @@ class BxDolStudioDashboardQuery extends BxDolStudioPageQuery
     	$sSql = "SELECT SUM(`current_size`) AS `size` FROM `sys_objects_storage` WHERE `object` LIKE " . $this->escape($sModule . '%') . " LIMIT 1";
     	return $this->getOne($sSql);
     }
+    
+    function setUpdateDate()
+    {
+    	$sSql = "UPDATE `sys_options` SET value = :value WHERE `name` = 'sys_update_time'";
+    	return $this->query($sSql, ['value' => time()]);
+    }
 }
 
 /** @} */

studio/template/dbd_versions.html

@@ -4,7 +4,12 @@
     </div>
     <div class="bx-dbd-virsion-info">
         <div class="bx-def-margin-thd-top"><bx_text:_adm_dbd_txt_script_on />&nbsp;<b>__domain__</b></div>
-        <div class="bx-def-margin-thd-top"><bx_text:_adm_dbd_txt_version />&nbsp;<b>__version__</b>&nbsp;<bx_text:_adm_dbd_txt_installed />&nbsp;<b>__installed__</b></div>
+        <div class="bx-def-margin-thd-top">
+			<bx_text:_adm_dbd_txt_version />&nbsp;<b>__version__</b>&nbsp;<bx_text:_adm_dbd_txt_installed />&nbsp;<b>__installed__</b>
+			<bx_if:show_update_info>
+				&nbsp;<bx_text:_adm_dbd_txt_updated />&nbsp;<b>__updated__</b>
+			</bx_if:show_update_info>
+		</div>
         <div class="bx-dbd-version-available bx-def-margin-thd-top bx-clearfix"></div>
     </div>
     <script language="javascript">

studio/template/scripts/BxBaseStudioDashboard.php

@@ -119,7 +119,13 @@ class BxBaseStudioDashboard extends BxDolStudioDashboard
         	'js_object' => $sJsObject,
             'domain' => getParam('site_title'),
             'version' => bx_get_ver(),
-            'installed' => bx_time_js(getParam('sys_install_time'))
+            'installed' => bx_time_js(getParam('sys_install_time')),
+			'bx_if:show_update_info' => array(
+        		'condition' => getParam('sys_update_time') > 0,
+        		'content' => array(
+		        	'updated' => bx_time_js(getParam('sys_update_time')),
+       			)
+       		),
         ));
 
     	return array('content' => $sContent);