浏览代码

#275 renaming cover page to splash page

Alex Trofimov 10 年之前
父节点
当前提交
841d58bc49

+ 1 - 1
index.php

@@ -26,7 +26,7 @@ if (!file_exists("./inc/header.inc.php")) {
 require_once('./inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "profiles.inc.php");
 
-if (!isLogged() && getParam('sys_site_cover_enabled')) {
+if (!isLogged() && getParam('sys_site_splash_enabled')) {
     require_once("./splash.php");
     exit;
 }

文件差异内容过多而无法显示
+ 0 - 0
install/sql/system.sql


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

@@ -570,7 +570,7 @@
     <string name="_adm_dsn_cnf_uninstall"><![CDATA[<h3>Uninstall "{0}" template?</h3><p>Uninstalling "{0}" template will also delete all of its data. Do you want to continue?</p>]]></string>
 	<string name="_adm_dsg_btn_make_default"><![CDATA[Make Default]]></string>
 	<string name="_adm_dsg_dsc_alt_text"><![CDATA[Serves as "ALT" text for logo image. Used as a logo when no logo image is uploaded.]]></string>
-	<string name="_adm_dsg_dsc_cover_warning"><![CDATA[Note, that improper use of HTML may break the site layout.]]></string>
+	<string name="_adm_dsg_dsc_splash_warning"><![CDATA[Note, that improper use of HTML may break the site layout.]]></string>
 	<string name="_adm_dsg_err_cannot_process_action"><![CDATA[Cannot process action. It does not have an associated handler.]]></string>
 	<string name="_adm_dsg_err_deactivate_default"><![CDATA[You cannot deactivate template which was selected as Default]]></string>
 	<string name="_adm_dsg_err_last_active"><![CDATA[You need to have at least one active template.]]></string>
@@ -580,7 +580,7 @@
 	<string name="_adm_dsg_err_save"><![CDATA[Cannot save: ]]></string>
 	<string name="_adm_dsg_scs_save"><![CDATA[The changes were successfully saved]]></string>
 	<string name="_adm_dsg_txt_alt_text"><![CDATA[Logo Text]]></string>
-	<string name="_adm_dsg_txt_cover_enabled"><![CDATA[Enable cover page]]></string>
+	<string name="_adm_dsg_txt_splash_enabled"><![CDATA[Enable splash page]]></string>
 	<string name="_adm_dsg_txt_default"><![CDATA[default]]></string>
 	<string name="_adm_dsg_txt_icon_apple"><![CDATA[Apple Touch Devices (152x152)]]></string>
 	<string name="_adm_dsg_txt_icon_facebook"><![CDATA[Facebook Share (100x100)]]></string>
@@ -826,7 +826,7 @@
     <string name="_adm_lang_cnf_uninstall"><![CDATA[<h3>Uninstall "{0}" language?</h3><p>Uninstalling "{0}" language will also delete all of its data. Do you want to continue?</p>]]></string>
 	<string name="_adm_lmi_cpt_actions"><![CDATA[Actions]]></string>
 	<string name="_adm_lmi_cpt_checkout"><![CDATA[Checkout {checkout_counter}]]></string>
-	<string name="_adm_lmi_cpt_cover"><![CDATA[Cover]]></string>
+	<string name="_adm_lmi_cpt_splash"><![CDATA[Splash]]></string>
 	<string name="_adm_lmi_cpt_displays"><![CDATA[Displays]]></string>
 	<string name="_adm_lmi_cpt_downloaded"><![CDATA[Downloaded]]></string>
 	<string name="_adm_lmi_cpt_etemplates"><![CDATA[Email Templates]]></string>

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

@@ -570,7 +570,7 @@
     <string name="_adm_dsn_cnf_uninstall"><![CDATA[<h3>Удалить тему "{0}"?</h3><p>Удаление темы "{0}" также удалит все связанные с ней данные. Вы хотите продолжить?</p>]]></string>
 	<string name="_adm_dsg_btn_make_default"><![CDATA[Сделать основным]]></string>
 	<string name="_adm_dsg_dsc_alt_text"><![CDATA[Используется для дополнительного текста для лого-картинки. Используется в качестве лого, если картинка не загружена.]]></string>
-	<string name="_adm_dsg_dsc_cover_warning"><![CDATA[Заметьте, что неправильное применение HTML может испортить дизайн сайта.]]></string>
+	<string name="_adm_dsg_dsc_splash_warning"><![CDATA[Заметьте, что неправильное применение HTML может испортить дизайн сайта.]]></string>
 	<string name="_adm_dsg_err_cannot_process_action"><![CDATA[Невозможно выполнить действие. Отсутствует связанный обработчик.]]></string>
 	<string name="_adm_dsg_err_deactivate_default"><![CDATA[Невозможно деактивировать тему, выбранную в качестве основной]]></string>
 	<string name="_adm_dsg_err_last_active"><![CDATA[Нужно иметь как минимум одну активную тему.]]></string>
@@ -580,7 +580,7 @@
 	<string name="_adm_dsg_err_save"><![CDATA[Невозможно сохранить: ]]></string>
 	<string name="_adm_dsg_scs_save"><![CDATA[Изменения удачно сохранены]]></string>
 	<string name="_adm_dsg_txt_alt_text"><![CDATA[Текст лого]]></string>
-	<string name="_adm_dsg_txt_cover_enabled"><![CDATA[Включить титульную страницу]]></string>
+	<string name="_adm_dsg_txt_splash_enabled"><![CDATA[Включить титульную страницу]]></string>
 	<string name="_adm_dsg_txt_default"><![CDATA[по умолчанию]]></string>
 	<string name="_adm_dsg_txt_icon_apple"><![CDATA[Устройства Apple Touch (152x152)]]></string>
 	<string name="_adm_dsg_txt_icon_facebook"><![CDATA[Facebook (100x100)]]></string>
@@ -826,7 +826,7 @@
     <string name="_adm_lang_cnf_uninstall"><![CDATA[<h3>Удалить "{0}" язык?</h3><p>Удаление "{0}" языка также удалит все его данные. Вы хотите продолжить?</p>]]></string>
 	<string name="_adm_lmi_cpt_actions"><![CDATA[Действия]]></string>
 	<string name="_adm_lmi_cpt_checkout"><![CDATA[Оплата {checkout_counter}]]></string>
-	<string name="_adm_lmi_cpt_cover"><![CDATA[Обложка]]></string>
+	<string name="_adm_lmi_cpt_splash"><![CDATA[Обложка]]></string>
 	<string name="_adm_lmi_cpt_displays"><![CDATA[Дисплеи]]></string>
 	<string name="_adm_lmi_cpt_downloaded"><![CDATA[Скачано]]></string>
 	<string name="_adm_lmi_cpt_etemplates"><![CDATA[Имейл-шаблоны]]></string>

+ 2 - 2
splash.php

@@ -16,12 +16,12 @@ function getPageMainCode()
 {
     $oTemplate = BxDolTemplate::getInstance();    
 
-    $bEnabled = getParam('sys_site_cover_enabled');
+    $bEnabled = getParam('sys_site_splash_enabled');
     if(!$bEnabled)
     	$oTemplate->displayPageNotFound();
 
     $oTemplate->addJs(array('skrollr/skrollr.min.js'));
-    return $oTemplate->parseHtmlByContent(getParam('sys_site_cover_code'), array(
+    return $oTemplate->parseHtmlByContent(getParam('sys_site_splash_code'), array(
     	'join_link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=create-account'),
     	'login_form' => BxDolService::call('system', 'login_form', array(), 'TemplServiceLogin')
     )); 

+ 5 - 5
studio/classes/BxDolStudioDesigner.php

@@ -10,7 +10,7 @@
 define('BX_DOL_STUDIO_DSG_TYPE_GENERAL', 'general');
 define('BX_DOL_STUDIO_DSG_TYPE_LOGO', 'logo');
 define('BX_DOL_STUDIO_DSG_TYPE_ICON', 'icon');
-define('BX_DOL_STUDIO_DSG_TYPE_COVER', 'cover');
+define('BX_DOL_STUDIO_DSG_TYPE_SPLASH', 'splash');
 define('BX_DOL_STUDIO_DSG_TYPE_SETTINGS', 'settings');
 
 define('BX_DOL_STUDIO_DSG_TYPE_DEFAULT', 'general');
@@ -159,12 +159,12 @@ class BxDolStudioDesigner extends BxTemplStudioPage
         return $this->getJsResult('_adm_dsg_scs_save', true, true, BX_DOL_URL_STUDIO . 'designer.php?page=' . BX_DOL_STUDIO_DSG_TYPE_ICON);
     }
 
-    function submitCover(&$oForm)
+    function submitSplash(&$oForm)
     {
-    	$this->oDb->setParam('sys_site_cover_code', $oForm->getCleanValue('code'));
-        $this->oDb->setParam('sys_site_cover_enabled', $oForm->getCleanValue('enabled') == 'on' ? 'on' : '');
+    	$this->oDb->setParam('sys_site_splash_code', $oForm->getCleanValue('code'));
+        $this->oDb->setParam('sys_site_splash_enabled', $oForm->getCleanValue('enabled') == 'on' ? 'on' : '');
 
-        return $this->getJsResult('_adm_dsg_scs_save', true, true, BX_DOL_URL_STUDIO . 'designer.php?page=' . BX_DOL_STUDIO_DSG_TYPE_COVER);
+        return $this->getJsResult('_adm_dsg_scs_save', true, true, BX_DOL_URL_STUDIO . 'designer.php?page=' . BX_DOL_STUDIO_DSG_TYPE_SPLASH);
     }
 }
 

+ 0 - 0
studio/template/designer_cover.html → studio/template/designer_splash.html


+ 0 - 3
studio/template/dsr_cover.html

@@ -1,3 +0,0 @@
-__warning__
-<iframe name="__cover_iframe_id__" class="bx-std-hidden"></iframe>
-__form__

+ 3 - 0
studio/template/dsr_splash.html

@@ -0,0 +1,3 @@
+__warning__
+<iframe name="__splash_iframe_id__" class="bx-std-hidden"></iframe>
+__form__

+ 16 - 16
studio/template/scripts/BxBaseStudioDesigner.php

@@ -14,9 +14,9 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
     protected $sLogoIframeId = 'adm-dsg-logo-iframe';
     protected $sIconFormId = 'adm-dsg-icon-form';
     protected $sIconIframeId = 'adm-dsg-icon-iframe';
-    protected $sCoverFormId = 'adm-dsg-cover-form';
-    protected $sCoverIframeId = 'adm-dsg-cover-iframe';
-    protected $sCoverEditorId = 'adm-dsg-cover-editor';
+    protected $sSplashFormId = 'adm-dsg-splash-form';
+    protected $sSplashIframeId = 'adm-dsg-splash-iframe';
+    protected $sSplashEditorId = 'adm-dsg-splash-editor';
 
     function __construct($sPage = '')
     {
@@ -43,7 +43,7 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
             BX_DOL_STUDIO_DSG_TYPE_GENERAL => array('icon' => 'globe'),
             BX_DOL_STUDIO_DSG_TYPE_LOGO => array('icon' => 'pencil'),
             BX_DOL_STUDIO_DSG_TYPE_ICON => array('icon' => 'picture-o'),
-            BX_DOL_STUDIO_DSG_TYPE_COVER => array('icon' => 'file-image-o'),
+            BX_DOL_STUDIO_DSG_TYPE_SPLASH => array('icon' => 'file-image-o'),
             BX_DOL_STUDIO_DSG_TYPE_SETTINGS => array('icon' => 'cogs'),
         );
         foreach($aMenuItems as $sMenuItem => $aItem)
@@ -325,18 +325,18 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
         ));
     }
 
-    protected function getCover()
+    protected function getSplash()
     {
     	$oTemplate = BxDolStudioTemplate::getInstance();
 
 		$aForm = array(
 			'form_attrs' => array(
-				'id' => $this->sCoverFormId,
-				'name' => $this->sCoverFormId,
+				'id' => $this->sSplashFormId,
+				'name' => $this->sSplashFormId,
 				'action' => BX_DOL_URL_STUDIO . 'designer.php',
 				'method' => 'post',
 				'enctype' => 'multipart/form-data',
-				'target' => $this->sCoverIframeId
+				'target' => $this->sSplashIframeId
 			),
 			'params' => array(
 				'db' => array(
@@ -356,9 +356,9 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
 				'enabled' => array(
 					'type' => 'checkbox',
 					'name' => 'enabled',
-					'caption' => _t('_adm_dsg_txt_cover_enabled'),
+					'caption' => _t('_adm_dsg_txt_splash_enabled'),
 					'value' => 'on',
-					'checked' => getParam('sys_site_cover_enabled') == 'on',
+					'checked' => getParam('sys_site_splash_enabled') == 'on',
 					'db' => array (
                         'pass' => 'Xss',
                     ),
@@ -367,7 +367,7 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
 					'type' => 'textarea',
 					'name' => 'code',
 					'caption' => '',
-					'value' => getParam('sys_site_cover_code'),
+					'value' => getParam('sys_site_splash_code'),
 					'db' => array (
                         'pass' => 'XssHtml',
                     ),
@@ -384,20 +384,20 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
 		$oForm->initChecker();
 
 		if($oForm->isSubmittedAndValid()) {
-			echo $this->submitCover($oForm);
+			echo $this->submitSplash($oForm);
 			exit;
 		}
 
         $oTemplate->addJs(array('codemirror/codemirror.min.js'));
         $oTemplate->addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'codemirror/|codemirror.css');
 
-		return $oTemplate->parseHtmlByName('designer_cover.html', array(
+		return $oTemplate->parseHtmlByName('designer_splash.html', array(
 			'js_object' => $this->getPageJsObject(),
 			'action_url' => $this->sManageUrl,
 			'content' => $this->getBlockCode(array(
-				'items' => $oTemplate->parseHtmlByName('dsr_cover.html', array(
-					'warning' => MsgBox(_t('_adm_dsg_dsc_cover_warning')),
-					'cover_iframe_id' => $this->sCoverIframeId, 
+				'items' => $oTemplate->parseHtmlByName('dsr_splash.html', array(
+					'warning' => MsgBox(_t('_adm_dsg_dsc_splash_warning')),
+					'splash_iframe_id' => $this->sSplashIframeId, 
 					'form' => $oForm->getCode()
 				)),
 			))

部分文件因为文件数量过多而无法显示