Changeset 15957

Timestamp:

02/07/12 01:41:17 (4 months ago)

Author:

Anton Lesnikov

Message:

Designer -> Manage Logo updated.

Location:

trunk

Files:

• modules/boonex/english/install/data/langs/en.xml (modified) (1 diff)
• studio/classes/BxDolStudioDesigner.php (modified) (3 diffs)
• studio/js/designer.js (modified) (1 diff)
• studio/templates/base/css/designer.css (modified) (1 diff)
• studio/templates/base/dsr_logo_preview.html (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioBuilderPage.php (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioDesigner.php (modified) (4 diffs)

trunk/modules/boonex/english/install/data/langs/en.xml

@@ -1994 +1994 @@
     <string name="_adm_lmi_cpt_logo"><![CDATA[Logo]]></string>
     <string name="_adm_lmi_cpt_icon"><![CDATA[Site Icon]]></string>
-    <string name="_adm_dsg_txt_upload_photo"><![CDATA[Upload Photo]]></string>
-    <string name="_adm_dsg_txt_alt_text"><![CDATA[ALT Text]]></string>
+    <string name="_adm_dsg_txt_current_photo"><![CDATA[Current Logo Image]]></string>
+    <string name="_adm_dsg_dsc_current_photo"><![CDATA[No image uploaded. Logo text is used instead.]]></string>
+    <string name="_adm_dsg_txt_current_photo_delete"><![CDATA[Delete]]></string>
+    <string name="_adm_dsg_txt_upload_photo"><![CDATA[Upload New Logo Image]]></string>
+    <string name="_adm_dsg_txt_alt_text"><![CDATA[Logo Text]]></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_btn_designer_submit"><![CDATA[Submit]]></string>
     <string name="_adm_dsg_txt_icon_apple"><![CDATA[Apple Touch Devices (129x129)]]></string>
     <string name="_adm_dsg_txt_icon_facebook"><![CDATA[Facebook Share (100x100)]]></string>
     <string name="_adm_dsg_txt_icon_favicon"><![CDATA[Favicon (16x16)]]></string>
-    <string name="_adm_dsg_err_remove_old_icon"><![CDATA[Cannot remove an old icon.]]></string>
-    <string name="_adm_dsg_err_remove_old_logo"><![CDATA[Cannot remove an old logo.]]></string>
+    <string name="_adm_dsg_err_remove_old_icon"><![CDATA[Cannot remove current icon.]]></string>
+    <string name="_adm_dsg_err_remove_old_logo"><![CDATA[Cannot remove current logo image.]]></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_save"><![CDATA[Cannot save: ]]></string>

trunk/studio/classes/BxDolStudioDesigner.php

@@ -31 +31 @@
 
         //--- Check actions ---//
-        if(($sAction = bx_get('pgt_action')) !== false) {
+        if(($sAction = bx_get('dsg_action')) !== false) {
             $sAction = bx_process_input($sAction);
 
             $aResult = array('code' => 1, 'message' => _t('_adm_dsg_err_cannot_process_action'));
             switch($sAction) {
+                case 'delete_logo':
+                    $aResult = array('code' => 0, 'message' => '');
+                    if(!$this->deleteLogo())
+                        $aResult = array('code' => 2, 'message' => _t('_adm_dsg_err_remove_old_logo'));
+                    break;
+
                 case 'get-page-by-type':
-                    $sValue = bx_process_input(bx_get('pgt_value'));
+                    $sValue = bx_process_input(bx_get('dsg_value'));
                     if(empty($sValue))
                         break;
@@ -59 +65 @@
             $oStorage = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
 
-            $iId = (int)$this->oDb->getParam('sys_site_logo');
-            if($iId != 0 && !$oStorage->deleteFile($iId, $iProfileId))
+            if(!$this->deleteLogo())
                 return $this->getJsResult('_adm_dsg_err_remove_old_logo');
 
@@ -75 +80 @@
         $this->oDb->setParam('sys_site_logo_alt', $oForm->getCleanValue('alt'));
         return $this->getJsResult('_adm_dsg_scs_save', true, true, BX_DOL_URL_STUDIO . 'designer.php?page=' . BX_DOL_STUDIO_DSG_TYPE_LOGO);
+    }
+    
+    function deleteLogo() {
+        $iProfileId = getLoggedId();
+
+        bx_import('BxDolStorage');
+        $oStorage = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
+
+        $iId = (int)$this->oDb->getParam('sys_site_logo');
+        if($iId != 0 && !$oStorage->deleteFile($iId, $iProfileId))
+            return false;
+
+        return true;
     }
 

trunk/studio/js/designer.js

@@ -12 +12 @@
     this.iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
 }
+
+BxDolStudioDesigner.prototype.deleteLogo = function() {
+    var $this = this;
+    var oDate = new Date();
+
+    $.post(
+        this.sActionsUrl,
+        {
+            dsg_action: 'delete_logo',
+            _t: oDate.getTime()
+        },
+        function(oData) {
+            if(oData.code != 0 && oData.message.length > 0) {
+                alert(oData.message);
+                return;
+            }
+
+            document.location.href = document.location.href; 
+        },
+        'json'
+    );
+};
 /** @} */

trunk/studio/templates/base/css/designer.css

@@ -1 +1 @@
 div.adm-dsg-logo-preview {}
+div.adm-dsg-logo-preview-empty {}

trunk/studio/templates/base/dsr_logo_preview.html

@@ -1 @@
-<div class="adm-dsg-logo-preview">
-    <img src="__url__" alt="__alt__" />
-</div>
+<bx_if:show_empty>
+    <div class="adm-dsg-logo-preview-empty bx-def-font-small bx-def-color-ft-gray-l3">__content__</div>
+</bx_if:show_empty>
+<bx_if:show_image>
+    <div class="adm-dsg-logo-preview">
+        <img src="__url__" alt="__alt__" />
+        <p>
+            <button class="bx_btn" onclick="javascript:__js_object__.deleteLogo()">
+                <bx_text:_adm_dsg_txt_current_photo_delete />
+            </button>
+        </p>
+    </div>
+</bx_if:show_image>

trunk/studio/templates/base/scripts/BxBaseStudioBuilderPage.php

@@ -1020 +1020 @@
 
                     $iImageId = $oStorage->storeFileFromForm($_FILES['image_file'], false);
+                    $oStorage->afterUploadCleanup($iImageId, 0);
                 }
 

trunk/studio/templates/base/scripts/BxBaseStudioDesigner.php

@@ -84 +84 @@
         $oTemplate = BxDolStudioTemplate::getInstance();
 
-        $sPreview = "";
         $sAlt = $this->oDb->getParam('sys_site_logo_alt');
+
+        $aTmplVarsPreview = array(
+            'bx_if:show_empty' => array(
+                'condition' => true,
+                'content' => array(
+                    'content' => _t("_adm_dsg_dsc_current_photo")
+                )
+            ),
+            'bx_if:show_image' => array(
+                'condition' => false,
+                'content' => array()
+            )
+        );
 
         if(($iId = (int)$this->oDb->getParam('sys_site_logo')) != 0) {
@@ -93 +105 @@
             $sFileUrl = $oStorage->getFileUrlById($iId);
             if($sFileUrl !== false) {
-                $aTmplVars = array(
-                    'url' => $sFileUrl, 
-                    'alt' => $sAlt
+                $aTmplVarsPreview['bx_if:show_empty']['condition'] = false;
+                $aTmplVarsPreview['bx_if:show_image'] = array(
+                    'condition' => true,
+                    'content' => array(
+                        'js_object' => $this->getPageJsObject(),
+                        'url' => $sFileUrl, 
+                        'alt' => $sAlt
+                    )
                 );
-                $sPreview = $oTemplate->parseHtmlByName('dsr_logo_preview.html', $aTmplVars);
             }
             else
                 $this->oDb->setParam('sys_site_logo', 0);
         }
+        $sPreview = $oTemplate->parseHtmlByName('dsr_logo_preview.html', $aTmplVarsPreview);
 
         $aForm = array(
@@ -111 +128 @@
                 'enctype' => 'multipart/form-data',
                 'target' => $this->sLogoIframeId
+            ),
+            'params' => array(
+                'db' => array(
+                    'table' => '',
+                    'key' => '',
+                    'uri' => '',
+                    'uri_title' => '',
+                    'submit_name' => 'save'
+                ),
+            ),
+            'inputs' => array(
+                'page' => array(
+                    'type' => 'hidden',
+                    'name' => 'page',
+                    'value' => $this->sPage
+                ),
+                'preview' => array(
+                    'type' => 'custom',
+                    'name' => 'preview',
+                    'caption' => _t('_adm_dsg_txt_current_photo'),
+                    'content' => $sPreview
+                ),
+                'image' => array(
+                    'type' => 'file',
+                    'name' => 'image',
+                    'caption' => _t('_adm_dsg_txt_upload_photo')
+                ),
+                'alt' => array(
+                    'type' => 'text',
+                    'name' => 'alt',
+                    'caption' => _t('_adm_dsg_txt_alt_text'),
+                    'info' => _t('_adm_dsg_dsc_alt_text'),
+                    'value' => $sAlt,
+                    'checker' => array(
+                        'func' => '',
+                        'params' => array(),
+                        'error' => ''
+                    ),
+                    'db' => array (
+                        'pass' => 'Xss',
+                    ),
+                ),
+                'save' => array(
+                    'type' => 'submit',
+                    'name' => 'save',
+                    'value' => _t('_adm_btn_designer_submit'),
+                )
+            )
+        );
+
+        $oForm = new BxBaseStudioFormView($aForm);
+        $oForm->initChecker();
+
+        if($oForm->isSubmittedAndValid()) {
+            echo $this->submitLogo($oForm);
+            exit;
+        }
+
+        $aTmplVars = array(
+            'js_object' => $this->getPageJsObject(),
+            'bx_repeat:blocks' => array(
+                array(
+                    'caption' => '',
+                    'panel_top' => '',
+                    'items' => $oTemplate->parseHtmlByName('dsr_logo.html', array('logo_iframe_id' => $this->sLogoIframeId, 'form' => $oForm->getCode())),
+                    'panel_bottom' => ''
+                )
+            )
+        );
+
+        return $oTemplate->parseHtmlByName('designer.html', $aTmplVars);
+    }
+
+    protected function getIcon() {
+        $oTemplate = BxDolStudioTemplate::getInstance();
+
+        $sPreview = "";
+        $aTmplVars = array('bx_repeat:images' => array());
+
+        if(($iId = (int)$this->oDb->getParam('sys_site_icon')) != 0) {
+            $aTranscoders = array(
+                BX_DOL_TRANSCODER_OBJ_ICON_APPLE => '_adm_dsg_txt_icon_apple',
+                BX_DOL_TRANSCODER_OBJ_ICON_FACEBOOK => '_adm_dsg_txt_icon_facebook',
+                BX_DOL_TRANSCODER_OBJ_ICON_FAVICON => '_adm_dsg_txt_icon_favicon'
+            );
+
+            bx_import('BxDolImageTranscoder');
+            foreach($aTranscoders as $sTranscoder => $sTitle) {
+                $oTranscoder = BxDolImageTranscoder::getObjectInstance($sTranscoder);
+
+                $sImageUrl = $oTranscoder->getImageUrl($iId);
+                if($sImageUrl === false) {
+                    $this->oDb->setParam('sys_site_icon', 0);
+                    break;
+                }
+
+                $aTmplVars['bx_repeat:images'][] = array(
+                    'caption' => _t($sTitle),
+                    'url' => $sImageUrl
+                );
+            }
+
+            $sPreview = $oTemplate->parseHtmlByName('dsr_icon_preview.html', $aTmplVars);
+        }
+
+        $aForm = array(
+            'form_attrs' => array(
+                'id' => $this->sIconFormId,
+                'name' => $this->sIconFormId,
+                'action' => BX_DOL_URL_STUDIO . 'designer.php',
+                'method' => 'post',
+                'enctype' => 'multipart/form-data',
+                'target' => $this->sIconIframeId
             ),
             'params' => array(
@@ -137 +267 @@
                     'caption' => _t('_adm_dsg_txt_upload_photo')
                 ),
-                'alt' => array(
-                    'type' => 'text',
-                    'name' => 'alt',
-                    'value' => $sAlt,
-                    'caption' => _t('_adm_dsg_txt_alt_text'),
-                    'checker' => array(
-                        'func' => '',
-                        'params' => array(),
-                        'error' => ''
-                    ),
-                    'db' => array (
-                        'pass' => 'Xss',
-                    ),
-                ),
-                'save' => array(
-                    'type' => 'submit',
-                    'name' => 'save',
-                    'value' => _t('_adm_btn_designer_submit'),
-                )
-            )
-        );
-
-        $oForm = new BxBaseStudioFormView($aForm);
-        $oForm->initChecker();
-
-        if($oForm->isSubmittedAndValid()) {
-            echo $this->submitLogo($oForm);
-            exit;
-        }
-
-        $aTmplVars = array(
-            'js_object' => $this->getPageJsObject(),
-            'bx_repeat:blocks' => array(
-                array(
-                    'caption' => '',
-                    'panel_top' => '',
-                    'items' => $oTemplate->parseHtmlByName('dsr_logo.html', array('logo_iframe_id' => $this->sLogoIframeId, 'form' => $oForm->getCode())),
-                    'panel_bottom' => ''
-                )
-            )
-        );
-
-        return $oTemplate->parseHtmlByName('designer.html', $aTmplVars);
-    }
-
-    protected function getIcon() {
-        $oTemplate = BxDolStudioTemplate::getInstance();
-
-        $sPreview = "";
-        $aTmplVars = array('bx_repeat:images' => array());
-
-        if(($iId = (int)$this->oDb->getParam('sys_site_icon')) != 0) {
-            $aTranscoders = array(
-                BX_DOL_TRANSCODER_OBJ_ICON_APPLE => '_adm_dsg_txt_icon_apple',
-                BX_DOL_TRANSCODER_OBJ_ICON_FACEBOOK => '_adm_dsg_txt_icon_facebook',
-                BX_DOL_TRANSCODER_OBJ_ICON_FAVICON => '_adm_dsg_txt_icon_favicon'
-            );
-
-            bx_import('BxDolImageTranscoder');
-            foreach($aTranscoders as $sTranscoder => $sTitle) {
-                $oTranscoder = BxDolImageTranscoder::getObjectInstance($sTranscoder);
-
-                $sImageUrl = $oTranscoder->getImageUrl($iId);
-                if($sImageUrl === false) {
-                    $this->oDb->setParam('sys_site_icon', 0);
-                    break;
-                }
-
-                $aTmplVars['bx_repeat:images'][] = array(
-                    'caption' => _t($sTitle),
-                    'url' => $sImageUrl
-                );
-            }
-
-            $sPreview = $oTemplate->parseHtmlByName('dsr_icon_preview.html', $aTmplVars);
-        }
-
-        $aForm = array(
-            'form_attrs' => array(
-                'id' => $this->sIconFormId,
-                'name' => $this->sIconFormId,
-                'action' => BX_DOL_URL_STUDIO . 'designer.php',
-                'method' => 'post',
-                'enctype' => 'multipart/form-data',
-                'target' => $this->sIconIframeId
-            ),
-            'params' => array(
-                'db' => array(
-                    'table' => '',
-                    'key' => '',
-                    'uri' => '',
-                    'uri_title' => '',
-                    'submit_name' => 'save'
-                ),
-            ),
-            'inputs' => array(
-                'page' => array(
-                    'type' => 'hidden',
-                    'name' => 'page',
-                    'value' => $this->sPage
-                ),
-                'preview' => array(
-                    'type' => 'custom',
-                    'name' => 'preview',
-                    'content' => $sPreview
-                ), 
-                'image' => array(
-                    'type' => 'file',
-                    'name' => 'image',
-                    'caption' => _t('_adm_dsg_txt_upload_photo')
-                ),
                 'save' => array(
                     'type' => 'submit',