Explorar el Código

Small fixes and improvements:
- bx-clearfix for designboxes
- font icon support in lite vertical menu
- PHP errors

Alex Trofimov hace 13 años
padre
commit
c0d965914e

+ 1 - 1
inc/classes/BxDolForm.php

@@ -916,7 +916,7 @@ class BxDolForm extends BxDol {
         return isset($aData[$sKey]) ? $aData[$sKey] : false;
     }
     
-    function setSubmittedValue($sKey, $mixedValue, $sMethod, &$aSpecificValues = false) {
+    public static function setSubmittedValue($sKey, $mixedValue, $sMethod, &$aSpecificValues = false) {
         $aData = array();
         if($sMethod == BX_DOL_FORM_METHOD_GET) {
             $aData = &$_GET;

+ 1 - 2
inc/classes/BxDolProfile.php

@@ -108,8 +108,7 @@ class BxDolProfile extends BxDol implements iBxDolProfile {
      * Check if profile status is active
      */
     public function isActive($iProfileId = false) {
-        $aInfo = $this->getStatus($iProfileId);
-        return BX_PROFILE_STATUS_ACTIVE == $aInfo['status'];
+        return BX_PROFILE_STATUS_ACTIVE == $this->getStatus($iProfileId);
     }
 
     /**

+ 1 - 1
studio/classes/BxDolStudioForm.php

@@ -118,7 +118,7 @@ class BxDolStudioForm extends BxBaseFormView {
     }
 
     protected function getTranslationsKey($sType, $sName, $sValue) {
-        $iRand = mktime();
+        $iRand = time();
         $sPrefixDefault = "_sys_form_input";
 
         $sName = BxDolStudioUtils::getSystemName(trim($sName));

+ 1 - 1
template/designbox_0.html

@@ -1,6 +1,6 @@
 
 <!-- Design Box 0 [start] -->
-<div class="bx-def-margin-bottom">
+<div class="bx-def-margin-bottom bx-clearfix">
     __designbox_content__
 </div>
 <!-- Design Box 0 [ end ] -->

+ 1 - 1
template/designbox_1.html

@@ -2,7 +2,7 @@
 <!-- Design Box 1 [start] -->
 <div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom bx-def-round-corners">
     <div class="bx-db-header"><div class="bx-db-title bx-def-padding-left bx-def-padding-top bx-def-font-h2">__title__</div>__caption_item__<div class="bx-clear"></div></div>
-    <div class="bx-db-content">__designbox_content__</div>
+    <div class="bx-db-content bx-clearfix">__designbox_content__</div>
     __bottom_item__
 </div>
 <!-- Design Box 1 [ end ] -->

+ 1 - 1
template/designbox_10.html

@@ -1,6 +1,6 @@
 
 <!-- Design Box 10 [start] -->
-<div class="bx-def-padding">
+<div class="bx-def-padding bx-clearfix">
     __designbox_content__
 </div>
 <!-- Design Box 10 [ end ] -->

+ 1 - 1
template/designbox_11.html

@@ -2,7 +2,7 @@
 <!-- Design Box 11 [start] -->
 <div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom bx-def-round-corners">
     <div class="bx-db-header"><div class="bx-db-title bx-def-padding-left bx-def-padding-top bx-def-font-h2">__title__</div>__caption_item__<div class="bx-clear"></div></div>
-    <div class="bx-db-content bx-def-padding">__designbox_content__</div>
+    <div class="bx-db-content bx-def-padding bx-clearfix">__designbox_content__</div>
     __bottom_item__
 </div>
 <!-- Design Box 11 [ end ] -->

+ 1 - 1
template/designbox_13.html

@@ -1,7 +1,7 @@
 
 <!-- Design Box 13 [start] -->
 <div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom bx-def-round-corners">
-    <div class="bx-db-content bx-def-padding">
+    <div class="bx-db-content bx-def-padding bx-clearfix">
             __designbox_content__
     </div>
 </div>

+ 1 - 1
template/designbox_3.html

@@ -1,7 +1,7 @@
 
 <!-- Design Box 3 [start] -->
 <div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom bx-def-round-corners">
-    <div class="bx-db-content">
+    <div class="bx-db-content bx-clearfix">
             __designbox_content__
     </div>
 </div>

+ 1 - 1
template/menu_vertical_lite.html

@@ -2,7 +2,7 @@
     <bx_repeat:menu_items>
         <li class="bx-def-margin-sec-top __class_add__">
             <a href="__link__" target="__target__" onclick="__onclick__">
-                <bx_if:icon><img class="bx-def-margin-sec-right" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:icon>
+                <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:image><img class="bx-def-margin-sec-right" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
                 __title__
             </a>

+ 1 - 1
template/scripts/BxBaseUploaderHTML5.php

@@ -76,7 +76,7 @@ class BxBaseUploaderHTML5 extends BxDolUploader {
      * @param $mixedFiles as usual $_FILES['some_name'] array, but maybe some other params depending on the uploader
      * @return nothing, but if some files failed to upload, the actual error message can be determined by calling BxDolUploader::getUploadErrorMessages()
      */
-    public function handleUploads ($mixedFiles, $isMultiple = true, $iContentId = false) {
+    public function handleUploads ($iProfileId, $mixedFiles, $isMultiple = true, $iContentId = false) {
 
         bx_import('BxDolStorage');
         $oStorage = BxDolStorage::getObjectInstance($this->_sStorageObject);