Changeset 15899

Timestamp:

01/19/12 02:57:10 (4 months ago)

Author:

Leonid Sokushev

Message:

ticket #2740

Location:

tags/7.0

Files:

• administration/pageBuilder.php (modified) (1 diff)
• inc/classes/BxDolPageViewAdmin.php (modified) (1 diff)
• inc/js/classes/BxDolPageBuilder.js (modified) (4 diffs)

tags/7.0/administration/pageBuilder.php

@@ -38 +38 @@
 
 $GLOBALS['oAdmTemplate']->addJsTranslation(array(
-    '_adm_btn_Column', '_Are you sure?',
+    '_adm_btn_Column', '_Are you sure?', '_Empty'
 ));
 

tags/7.0/inc/classes/BxDolPageViewAdmin.php

@@ -321 +321 @@
         ";
         db_res( $sQuery );
-        
-        echo _t( process_pass_data($aData['Caption']) );
+        $sCaption = process_pass_data($aData['Caption']);
+                if (mb_strlen($sCaption) == 0)
+                    $sCaption = '_Empty';
+        echo _t($sCaption);
     }
     

tags/7.0/inc/js/classes/BxDolPageBuilder.js

@@ -29 +29 @@
     this.eAllAreas    = $(this.activeArea).add(this.inactiveArea).add(this.samplesArea).parent().parent().get(0);
     
-    $.getJSON( this.options.parser, {action:'load', Page: this.options.page}, function( oJSON ){ _builder.loadJSON( oJSON ) } );
+    $.getJSON( this.options.parser, {action:'load', Page: this.options.page}, function( oJSON ){_builder.loadJSON( oJSON )} );
 }
 
@@ -200 +200 @@
             .appendTo( $block )
             .hover( 
-                function(){ showFloatDesc( _t('_adm_pbuilder_Column_non_enough_width_warn', iBlockMinWidth)); },
-                function(){ hideFloatDesc(); }
+                function(){showFloatDesc( _t('_adm_pbuilder_Column_non_enough_width_warn', iBlockMinWidth));},
+                function(){hideFloatDesc();}
             )
-            .mousemove( function(e){ moveFloatDesc( e ) } );
+            .mousemove( function(e){moveFloatDesc( e )} );
         }
     }
@@ -407 +407 @@
         placeholder: 'buildColumn ui-sortable-placeholder',
         forcePlaceholderSize: true,
-        stop: function() { _builder.columnsStopSort(); }
+        stop: function() {_builder.columnsStopSort();}
     });
     
@@ -520 +520 @@
 BxDolPageBuilder.prototype.drawBlock = function( iBlockID, sBlockCaption, eColumnCont ) {
     var _builder = this;
-    
+    if (sBlockCaption.length == 0)
+            sBlockCaption = _t('_Empty');
     $(
         '<div class="buildBlock" id="buildBlock_' + iBlockID + '">' +