Index: branches/2.8.x/wb/admin/pages/sections.php
===================================================================
--- branches/2.8.x/wb/admin/pages/sections.php (revision 1834)
+++ branches/2.8.x/wb/admin/pages/sections.php (revision 1835)
@@ -32,7 +32,7 @@
exit(0);
}
/* */
-$debug = false; // to show position and section_id
+$debug = true; // to show position
If(!defined('DEBUG')) { define('DEBUG',$debug);}
// Create new admin object
if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
@@ -251,6 +251,7 @@
'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'],
'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'],
'TEXT_ADD_SECTION' => $TEXT['ADD_SECTION'],
+ 'TEXT_SECTION' => $TEXT['SECTION'],
'TEXT_ID' => 'ID',
'TEXT_TYPE' => $TEXT['TYPE'],
'TEXT_BLOCK' => $TEXT['BLOCK'],
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1834)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1835)
@@ -51,5 +51,5 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1834');
+if(!defined('REVISION')) define('REVISION', '1835');
if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/templates/wb_theme/css/screen.css
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1834)
+++ branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1835)
@@ -17,7 +17,7 @@
.input_large { width :300px; }
.input_full { width :100%; }
/* */
-table { border-collapse :collapse; width :100%; table-layout :fixed; }
+table { border-collapse :collapse; width :100%; table-layout :inherit; }
table.layout { table-layout :auto; }
table.header { margin :auto; width :100%; }
table.header td { min-width :10%; }
Index: branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php (revision 1834)
+++ branches/2.8.x/wb/modules/jsadmin/jsadmin_backend_include.php (revision 1835)
@@ -73,8 +73,10 @@
if(get_setting('mod_jsadmin_ajax_order_sections', '1')) {
$js_scripts[] = 'dragdrop.js';
if(SECTION_BLOCKS) {
- $js_buttonCell= 5; }
- else{ $js_buttonCell= 5; } // This ist the Cell where the Button "Up" is , by Swen Uth
+ $js_buttonCell= 5;
+ } else {
+ $js_buttonCell= 5;
+ } // This ist the Cell where the Button "Up" is , by Swen Uth
}
} elseif($page_type == 'config') {
$js_scripts[] = 'tool.js';
Index: branches/2.8.x/wb/modules/jsadmin/move_to.php
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/move_to.php (revision 1834)
+++ branches/2.8.x/wb/modules/jsadmin/move_to.php (revision 1835)
@@ -63,15 +63,15 @@
$table = TABLE_PREFIX.'pages';
}
}
+ $bModified = ($id_field == 'page_id') ? $bModified : false;
$iPageId = intval($_GET['page_id']);
// Get current index
- $sql = 'SELECT `'.$common_field.'`,`position`,`page_id` FROM `'.$table.'` WHERE `'.$id_field.'` ='.(int)$id; //.' AND page_id='.$iPageId;
+ $sql = 'SELECT `'.$common_field.'`,`position` FROM `'.$table.'` WHERE `'.$id_field.'` ='.(int)$id; //.' AND page_id='.$iPageId;
if($oRes=$database->query($sql)) {
if($aPage = $oRes->fetchRow(MYSQL_ASSOC)){
$common_id = intval($aPage[$common_field]);
$old_position = intval($aPage['position']);
- $iPageId = intval($aPage['page_id']);
}
}
@@ -90,9 +90,11 @@
if($old_position == $position)
return;
*/
+
// all echos with coded for looking in firebug console
$sSqlModify = ($bModified == true) ? ',`modified_when` = '.time().',`modified_by` = '.$admin->get_user_id().' ' : '';
if($old_position != $position) {
+}
echo $output = ($bDebug == false) ? "\n" : "$sql
\n";
// Build query to update affected rows
if($old_position < $position)
@@ -116,7 +118,12 @@
EOT;
echo $output = ($bDebug == false) ? "\n" : "$sql
\n";
$database->query($sql);
-}
+ if(!class_exists('order', false)){ include(WB_PATH.'/framework/class.order.php'); }
+ $order = new order($table, 'position', $id_field, $common_field);
+ $order->clean($common_id);
+ echo $output = ($bDebug == false) ? "\n" : "$table,'position','$id_field','$common_field'
\n";
+ echo $output = ($bDebug == false) ? "\n" : "$common_id
\n";
+
} else {
die("Missing parameters");
header("Location: index.php");