Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1379) +++ branches/2.8.x/CHANGELOG (revision 1380) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +13 Jan-2011 Build 1380 Dietmar Woellbrink (Luisehahne) ++ output fixings, known error in jsadmin will be fix later 13 Jan-2011 Build 1379 Werner von den Decken (DarkViper) # fix class.admin 13 Jan-2011 Build 1378 Werner von den Decken (DarkViper) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1379) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1380) @@ -52,6 +52,6 @@ // 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.2.RC4'); -if(!defined('REVISION')) define('REVISION', '1379'); +if(!defined('REVISION')) define('REVISION', '1380'); ?> Index: branches/2.8.x/wb/templates/argos_theme/theme.css =================================================================== --- branches/2.8.x/wb/templates/argos_theme/theme.css (revision 1379) +++ branches/2.8.x/wb/templates/argos_theme/theme.css (revision 1380) @@ -90,7 +90,7 @@ .pages_list ul li {list-style-type:none;margin:2px 0;} table.pages_view {width:900px;} -table.pages_view tr, tr.sectionrow {background:#f0f0f0;} +table.pages_view tr, tr.sectionrow {background:#f0f0f0; line-height :2.2em;} table.pages_view tr:hover, tr.sectionrow:hover {background:#eaeff6;} tr.sectionrow {padding:0 10px;} tr.sectionrow td {border-top:3px solid #f9f9f9;} @@ -97,7 +97,7 @@ .page_list {display:none;} .page_list_show li {display:block;} -img.page_list_rights {border:none;float:left;margin:0;vertical-align:middle;} +img.page_list_rights {border:none;float:left;margin:0;vertical-align:middle; padding :2px;} .sections_list {font-weight:bold;padding-left:10px;} .sections_list table {width:900px;} Index: branches/2.8.x/wb/modules/jsadmin/move_to.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/move_to.php (nonexistent) +++ branches/2.8.x/wb/modules/jsadmin/move_to.php (revision 1380) @@ -0,0 +1,97 @@ + + Copyright (C) 2004-2009, Ryan Djurovich + + Website Baker is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Website Baker is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Website Baker; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +require('../../config.php'); + + if(isset($_GET['page_id']) AND is_numeric($_GET['page_id']) AND is_numeric(@$_GET['position'])) { + $position = $_GET['position']; + + // Include WB admin wrapper script + $update_when_modified = true; // Tells script to update when this page was last updated + require(WB_PATH.'/modules/admin.php'); + + // Get common fields + if(isset($_GET['section_id']) AND is_numeric($_GET['section_id'])) { + $page_id = $_GET['page_id']; + $id = $_GET['section_id']; + $id_field = 'section_id'; + $common_field = 'page_id'; + $table = TABLE_PREFIX.'sections'; + } else { + $id = $_GET['page_id']; + $id_field = 'page_id'; + $common_field = 'parent'; + $table = TABLE_PREFIX.'pages'; + } + + // Get current index + $sql = <<"; + $rs = $database->query($sql); + if($row = $rs->fetchRow()) { + $common_id = $row[$common_field]; + $old_position = $row['position']; + } + echo "$old_position
"; + if($old_position == $position) + return; + + // Build query to update affected rows + if($old_position < $position) + $sql = << $old_position AND position <= $position + AND $common_field = $common_id +EOT; + else + $sql = <<= $position AND position < $old_position + AND $common_field = $common_id +EOT; + echo "
$sql
"; + $database->query($sql); + + // Build query to update specified row + $sql = <<$sql"; + $database->query($sql); +} else { + die("Missing parameters"); + header("Location: index.php"); + exit(0); +} +?> Property changes on: branches/2.8.x/wb/modules/jsadmin/move_to.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property