Changeset 13368 for trunk/administration

Timestamp:

12/07/09 04:04:18 (2 years ago)

Author:

Sergey Zotov

Message:

Ticket #1582

Location:

trunk/administration

Files:

• fields.php (modified) (1 diff)
• js/fields.js (modified) (3 diffs)
• templates/base/css/fields.css (modified) (2 diffs)
• templates/base/css/pageBuilder.css (modified) (7 diffs)
• templates/base/pbuilder_content.html (modified) (3 diffs)

trunk/administration/fields.php

@@ -38 +38 @@
     'name_index' => $iNameIndex,
     'css_name' => array('fields.css'),
-    'js_name' => array('ui.tabs.js', 'ui.mouse.js', 'ui.draggable.js', 'ui.draggable.ext.js', 'ui.sortable.js', 'fields.js'),
+    'js_name' => array('ui.core.js', 'ui.tabs.js', 'ui.sortable.js', 'fields.js'),
     'header' => _t('_adm_fields_title')    
 );

trunk/administration/js/fields.js

@@ -260 +260 @@
 BxDolPFMArea.prototype.activateSortable = function() {
     var oThisArea = this;
-    
-    this.sortableInstanceBlocks = $( this.element ).sortable({
-        items: 'div.build_block,div.build_block_fake',
-        hoverClass: 'build_block_hover',
-        stop: function(a,b){
-            oThisArea.stopItemsSort( this.id );
+    
+    $('.blocks_container', this.element).sortable('destroy').sortable({
+        items: $('.build_block,.build_block_fake', this.element),
+        //connectWith: $('.blocks_container', this.element),
+        cancel: '.build_item_active,.build_item_inactive',
+        dropOnEmpty: false,
+        stop: function(e,ui){
+            oThisArea.stopItemsSort( ui.item );
         }
-    }).sortableInstance(); //create instance for destroying possibilities
-
-    this.sortableInstanceItems = $( this.element ).sortable({
-        items: 'div.build_item_active,div.build_item_inactive,div.build_item_fake',
-        hoverClass: 'build_item_hover',
-        stop: function(a,b){
-            oThisArea.stopItemsSort( this.id );
+    });
+    
+    $('.build_block,.build_inac_items_col', this.element).sortable({
+        items: $('.build_item_active,.build_item_inactive,.build_item_fake', this.element),
+        dropOnEmpty: false,
+        stop: function(e,ui){
+            oThisArea.stopItemsSort( ui.item );
         }
-    }).sortableInstance();
-}
-
-BxDolPFMArea.prototype.deactivateSortable = function() {
-    this.sortableInstanceBlocks.destroy();
-    this.sortableInstanceItems.destroy();
-}
-
-BxDolPFMArea.prototype.stopItemsSort = function( draggedElementID ) {
+    });
+}
+
+BxDolPFMArea.prototype.stopItemsSort = function( item ) {
+    var draggedElementID = $(item).attr('id');
     if( draggedElementID == 'build_block_new_' + this.id ) {
         if( $( '#build_block_new_' + this.id ).parent().is( '#' + this.activeZoneElemID ) )
@@ -350 +348 @@
     oNewBlock.getElement();
     
-    this.deactivateSortable();
     this.activateSortable();
 }
@@ -374 +371 @@
     this.active_items[iNewInd].getElement();
     
-    this.deactivateSortable();
     this.activateSortable();
 }

trunk/administration/templates/base/css/fields.css

@@ -132 +132 @@
 .build_item_fake,
 .build_block_fake {
-    min-height:1px;
+    height:2px;
     font-size:1px;
     /*background-color:yellow;*/
@@ -337 +337 @@
 
 
-.form_tabs_cont {
+ul#form_tabs_switcher {
+    margin:0px;
+    margin-bottom:3px;
+    padding:0px;
     border-bottom:1px solid #ccc;
-    margin-bottom:3px;
-}
-
-.form_tabs_cont ul {
     list-style:none;
-    margin:0px;
-    padding:0px;
     height:25px;
 }
 
-.form_tabs_cont ul  li {
+ul#form_tabs_switcher li {
     float:left;
     padding:5px;

trunk/administration/templates/base/css/pageBuilder.css

@@ -3 +3 @@
     background-image: none;
     width: auto;
-    padding: 0px;
+    padding: 5px;
     border: 1px solid #cccccc;
 }
@@ -17 +17 @@
 .block_cont#activeAreaWrapper {
     margin-bottom: 0px;
-    border-bottom: none
+    border-bottom: none;
 }
 
@@ -54 +54 @@
 }
 
-#pageWidthSlider div,
-#pageWidthSlider1 div {
-    position: absolute;
-    top: -2px;
+
+#pageWidthSlider a.ui-slider-handle,
+#pageWidthSlider1 a.ui-slider-handle {
+    top: -2px;
     width: 12px;
     height: 20px;
-    background-image: url(../images/slider-handle1.gif);
-    cursor: pointer;
+    border: none;
+    background-image: url(../images/slider-handle1.gif);
 }
 
 .buildArea {
-    padding: 8px;
+    /*padding: 8px;*/
 }
 
@@ -80 +80 @@
     background-color: #fff;
     padding: 3px;
-    margin: 3px;
+    margin: 5px;
     text-align: center;
     overflow: hidden;
@@ -106 +106 @@
     text-align: center;
     cursor: move;
-    padding-top: 6px;*/
+    padding-top: 6px;
     background-repeat: no-repeat;
     background-image: url( ../images/block_header.gif );
@@ -134 +134 @@
     /*background-color: #f5f5f5;*/
     border: 1px dashed #999999;
+    float: left;
 }
 
@@ -151 +152 @@
 }
 
-#columnsSlider div {
-    background-image: url(../images/slider-handle.gif);
-    height: 23px;
-    left: 0px;
-    position: absolute;
+#columnsSlider a {
     top: -5px;
     width: 12px;
-    z-index: 1;
-    cursor: pointer;
+    height: 23px;
+    border: none;
+    background-image: url(../images/slider-handle.gif);
 }
 

trunk/administration/templates/base/pbuilder_content.html

@@ -3 +3 @@
     <bx_if:page>
         <div id="buildAreasWrapper">
-            <div class="block_head"><bx_text:_adm_txt_pb_other_pages_width /></div>
+            <div class="block_head"><bx_text:_adm_txt_pb_page_width /></div>
             <div class="block_cont_nd">
                 <div id="pageWidthValue"></div>
-                <div id="pageWidthSlider">
-                    <div></div>
-                </div>
+                <div id="pageWidthSlider"></div>
                 <div class="clear_both"></div>
             </div>
@@ -24 +22 @@
             </div>
             
-            <div id="columnsSlider">
-                <div></div>
-            </div>
+            <div id="columnsSlider"></div>
     
             <div class="block_head"><bx_text:_adm_txt_pb_inactive_blocks /></div>
@@ -45 +41 @@
             <div class="block_cont_nd">
                 <div id="pageWidthValue1"></div>
-    
-                <div id="pageWidthSlider1">
-                    <div></div>
-                </div>
-    
+                <div id="pageWidthSlider1"></div>
                 <div class="clear_both"></div>
             </div>