diff --git a/e107_admin/auth.php b/e107_admin/auth.php index d8b61161e..e4b06022c 100644 --- a/e107_admin/auth.php +++ b/e107_admin/auth.php @@ -1,20 +1,17 @@ authcheck($_POST['authname'], $_POST['authpass'], varset($_POST['hashchallenge'],'')); - if ($row[0] == "authfail") + if ($row[0] == "authfail") { $admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"LOGIN",LAN_ROLL_LOG_11,"U: ".$tp->toDB($_POST['authname']),FALSE,LOG_TO_ROLLING); echo "\n"; header("location: ../index.php"); exit; - } - else + } + else { $cookieval = $row['user_id'].".".md5($row['user_password']); @@ -88,11 +93,11 @@ else $edata_li = array("user_id" => $row['user_id'], "user_name" => $row['user_name'], 'class_list' => implode(',',$class_list)); $e_event->trigger("login", $edata_li); - if ($pref['user_tracking'] == "session") + if ($pref['user_tracking'] == "session") { $_SESSION[$pref['cookie_name']] = $cookieval; - } - else + } + else { cookie($pref['cookie_name'], $cookieval, (time()+3600 * 24 * 30)); } @@ -101,13 +106,13 @@ else } $e_sub_cat = 'logout'; - require_once(e_ADMIN."header.php"); + if(!defset('NO_HEADER')) require_once(e_ADMIN."header.php"); - if (ADMIN == FALSE) + if (ADMIN == FALSE) { $obj = new auth; $obj->authform(); - require_once(e_ADMIN."footer.php"); + if(!defset('NO_HEADER')) require_once(e_ADMIN."footer.php"); exit; } } @@ -149,7 +154,7 @@ class auth "; - if ($use_imagecode) + if ($use_imagecode) { $text .= " diff --git a/e107_admin/image.php b/e107_admin/image.php index fabd90521..555df8702 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -1,104 +1,202 @@ toDB($_POST['filename']); - @unlink(e_FILE."public/avatars/".$image); - $sql->db_Update("user", "user_image='' WHERE user_image='-upload-{$image}'"); - $sql->db_Update("user", "user_sess='' WHERE user_sess='{$image}'"); - $admin_log->log_event('IMALAN_01',$image,E_LOG_INFORMATIVE,''); - $message = $image." ".IMALAN_28; + header('Location: '.e_SELF); + exit(); } +/* + * DELETE CHECKED AVATARS - SHOW AVATAR SCREEN + */ +if (isset($_POST['submit_show_delete_multi'])) +{ + if(varset($_POST['multiaction'])) + { + $tmp = array(); $tmp1 = array(); $message = array(); -if (isset($_POST['deleteall'])) + foreach ($_POST['multiaction'] as $todel) + { + $todel = explode('#', $todel); + $todel[1] = basename($todel[1]); + + $image_type = 2; + if(strpos($todel[1], '-upload-') === 0) + { + $image_type = 1; + $todel[1] = substr($todel[1], strlen('-upload-')); + } + + //delete it from server + @unlink(e_FILE."public/avatars/".$todel[1]); + + //admin log & sysmessage + $message[] = $todel[1]; + + //It's owned by an user + if($todel[0]) + { + switch ($image_type) + { + case 1: //avatar + $tmp[] = intval($todel[0]); + break; + + case 2: //photo + $tmp1[] = intval($todel[0]); + break; + } + } + } + + //Reset all deleted user avatars with one query + if(!empty($tmp)) + { + $sql->db_Update("user", "user_image='' WHERE user_id IN (".implode(',', $tmp).")"); + } + //Reset all deleted user photos with one query + if(!empty($tmp1)) + { + $sql->db_Update("user", "user_sess='' WHERE user_id IN (".implode(',', $tmp1).")"); + } + unset($tmp, $tmp1); + + //Format system message + if(!empty($message)) + { + $admin_log->log_event('IMALAN_01', implode('[!br!]', $message), E_LOG_INFORMATIVE, ''); + $message = implode(', ', $message).' '.IMALAN_28; + } + else $message = ''; + } +} + +/* + * DELETE ALL UNUSED IMAGES - SHOW AVATAR SCREEN + */ +if (isset($_POST['submit_show_deleteall'])) { $handle = opendir(e_FILE."public/avatars/"); + $dirlist = array(); while ($file = readdir($handle)) { - if ($file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db') { + if (!is_dir(e_FILE."public/avatars/{$file}") && $file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db') { $dirlist[] = $file; } } closedir($handle); - $imgList = ''; - $count = 0; - while (list($key, $image_name) = each($dirlist)) + + if(!empty($dirlist)) { - if (!$sql->db_Select("user", "*", "user_image='-upload-$image_name' OR user_sess='$image_name'")) { - unlink(e_FILE."public/avatars/".$image_name); - $count++; - $imgList .= '[!br!]'.$image_name; + $imgList = ''; + $count = 0; + foreach ($dirlist as $image_name) + { + $image_name = basename($image_name); + $image_todb = $tp->toDB($image_name); + if (!$sql->db_Count('user', '(*)', "WHERE user_image='-upload-{$image_todb}' OR user_sess='{$image_todb}'")) { + unlink(e_FILE."public/avatars/".$image_name); + $imgList .= '[!br!]'.$image_name; + $count++; + } } + + $message = $count." ".IMALAN_26; + $admin_log->log_event('IMALAN_02', $message.$imgList,E_LOG_INFORMATIVE, ''); + unset($imgList); } - $message = $count." ".IMALAN_26; - $admin_log->log_event('IMALAN_02',$message.$imgList,E_LOG_INFORMATIVE,''); - unset($imgList); } -if (isset($_POST['avdelete'])) +/* + * DELETE ALL CHECKED BAD IMAGES - VALIDATE SCREEN + */ +if (isset($_POST['submit_avdelete_multi'])) { require_once(e_HANDLER."avatar_handler.php"); $avList = array(); - foreach($_POST['avdelete'] as $key => $val) + $tmp = array(); + $uids = array(); + //Sanitize + $_POST['multiaction'] = $tp->toDB($_POST['multiaction']); + + //sql queries significant reduced + if(!empty($_POST['multiaction']) && $sql->db_Select("user", 'user_id, user_name, user_image', "user_id IN (".implode(',', $_POST['multiaction']).")")) { - $key = intval($key); // We only need the key - if ($sql->db_Select("user", 'user_id, user_name, user_image', "user_id='{$key}'")) + $search_users = $sql->db_getList('ALL', FALSE, FALSE, 'user_id'); + foreach($_POST['multiaction'] as $uid) { - $row = $sql->db_Fetch(); - $avname=avatar($row['user_image']); - if (strpos($avname,"http://")===FALSE) - { // Internal file, so unlink it - @unlink($avname); + if (varsettrue($search_users[$uid])) + { + $avname = avatar($search_users[$uid]['user_image']); + if (strpos($avname, "http://") === FALSE) + { // Internal file, so unlink it + @unlink($avname); + } + + $uids[] = $uid; + $tmp[] = $search_users[$uid]['user_name']; + $avList[] = $uid.':'.$search_users[$uid]['user_name'].':'.$search_users[$uid]['user_image']; } - $sql->db_Update("user","user_image='' WHERE user_id='{$key}'"); - $message = IMALAN_51.$row['user_name']." ".IMALAN_28; - $avList[] = $key.':'.$row['user_name'].':'.$row['user_image']; } + + //sql queries significant reduced + if(!empty($uids)) + { + $sql->db_Update("user", "user_image='' WHERE user_id IN (".implode(',', $uids).")"); + } + + $message = IMALAN_51.''.implode(', ', $tmp).' '.IMALAN_28; + $admin_log->log_event('IMALAN_03', implode('[!br!]', $avList), E_LOG_INFORMATIVE, ''); + unset($search_users); } - $admin_log->log_event('IMALAN_03',implode('[!br!]',$avList),E_LOG_INFORMATIVE,''); - unset($avList); - $_POST['check_avatar_sizes'] = TRUE; // Force size recheck after doing one or more deletes + unset($avList, $tmp, $uids); + } +/* + * UPDATE IMAGE OPTIONS - MAIN SCREEN + */ if (isset($_POST['update_options'])) { - unset($temp); - $temp['image_post'] = intval($_POST['image_post']); - $temp['resize_method'] = $_POST['resize_method']; - $temp['im_path'] = trim($tp->toDB($_POST['im_path'])); - $temp['image_post_class'] = intval($_POST['image_post_class']); - $temp['image_post_disabled_method'] = intval($_POST['image_post_disabled_method']); - $temp['enable_png_image_fix'] = intval($_POST['enable_png_image_fix']); + $tmp = array(); + $tmp['image_post'] = intval($_POST['image_post']); + $tmp['resize_method'] = $tp->toDB($_POST['resize_method']); + $tmp['im_path'] = trim($tp->toDB($_POST['im_path'])); + $tmp['image_post_class'] = intval($_POST['image_post_class']); + $tmp['image_post_disabled_method'] = intval($_POST['image_post_disabled_method']); + $tmp['enable_png_image_fix'] = intval($_POST['enable_png_image_fix']); - if ($admin_log->logArrayDiffs($temp, $pref, 'IMALAN_04')) + if ($admin_log->logArrayDiffs($tmp, $pref, 'IMALAN_04')) { save_prefs(); // Only save if changes $message = IMALAN_9; @@ -109,16 +207,29 @@ if (isset($_POST['update_options'])) } } -//FIXME - better message handler, no tablerender for sys-messages anymore -if (isset($message)) +/* + * SYSTEM MESSAGE + */ +//FIXME - better message handler, sysmessages CSS rules +if (varsettrue($message)) { - $ns->tablerender("", "
".$message."
"); + //no tablerender for sys-messages anymore + $message = " +
".$message."
+ "; +} +else +{ + $message = ''; } - +/* + * SHOW AVATARS SCREEN + */ if (isset($_POST['show_avatars'])) { $handle = opendir(e_FILE."public/avatars/"); + $dirlist = array(); while ($file = readdir($handle)) { if ($file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db' && !is_dir($file)) @@ -130,55 +241,77 @@ if (isset($_POST['show_avatars'])) $text = ''; - if (!is_array($dirlist)) + if (empty($dirlist)) { $text .= IMALAN_29; } else { $text = " -
+ +
"; $count = 0; while (list($key, $image_name) = each($dirlist)) { $users = IMALAN_21." | "; - if ($sql->db_Select("user", "*", "user_image='-upload-$image_name' OR user_sess='$image_name'")) + $row = array('user_id' => ''); + $image_pre = ''; + $disabled = ''; + if ($sql->db_Select("user", "*", "user_image='-upload-".$tp->toDB($image_name)."' OR user_sess='".$tp->toDB($image_name)."'")) { /* //Is it possible?! I don't think so while ($row = $sql->db_Fetch()) { - extract($row); //FIXME - kill this!!! + extract($row); // kill this!!! $users .= "$user_name (".($user_sess == $image_name ? IMALAN_24 : IMALAN_23).") | "; }*/ $row = $sql->db_Fetch(); + if($row['user_image'] == '-upload-'.$image_name) $image_pre = '-upload-'; $users .= "{$row['user_name']} (".($row['user_sess'] == $image_name ? IMALAN_24 : IMALAN_23).")"; } else { $users = ''.IMALAN_22.''; } - //File info - $users = "".IMALAN_66.": {$image_name} ".$users; - - // Control over the image size (design) - $image_size = getimagesize(e_FILE."public/avatars/".$image_name); - - //Friendly UI - click text to select a form element - $img_src = ""; - if ($image_size[0] > $pref['im_width'] || $image_size[1] > $pref['im_height']) + //directory? + if(is_dir(e_FILE."public/avatars/".$image_name)) { - $img_src = "".IMALAN_57.""; - } + //File info + $users = "".IMALAN_66.": {$image_name} ".IMALAN_69.""; + // Control over the image size (design) + $image_size = getimagesize(e_FILE."public/avatars/".$image_name); + + //Friendly UI - click text to select a form element + $img_src = ''.IMALAN_70.''; + $disabled = ' disabled="disabled"'; + } + else + { + //File info + $users = "".IMALAN_66.": {$image_name} ".$users; + + // Control over the image size (design) + $image_size = getimagesize(e_FILE."public/avatars/".$image_name); + + //Friendly UI - click text to select a form element + $img_src = ""; + if ($image_size[0] > $pref['im_width'] || $image_size[1] > $pref['im_height']) + { + $img_src = "".IMALAN_57.""; + } + } + //style attribute allowed here - server side width/height control + //options class - used for JS selectors (see eCoreImage object) $text .= " -
+
{$users}
{$img_src}
- +
@@ -189,25 +322,30 @@ if (isset($_POST['show_avatars'])) $count++; } - //FIXME add multi delete for better user experience (not working yet), make check/uncheck-all work $text .= "
-
- - - - -
+
+ + + + + + +
+
"; } - $ns->tablerender(IMALAN_18, $text); + $ns->tablerender(IMALAN_18, $message.$text); } +/* + * CHECK AVATARS SCREEN + */ if (isset($_POST['check_avatar_sizes'])) { // Set up to track what we've done @@ -221,10 +359,10 @@ if (isset($_POST['check_avatar_sizes'])) $text = "
-
+
".CACLAN_3." - + @@ -246,15 +384,15 @@ if (isset($_POST['check_avatar_sizes'])) // Loop through avatar field for every user // $iUserCount = $sql->db_Count("user"); + $found = false; + $allowedWidth = intval($pref['im_width']); + $allowedHeight = intval($pref['im_width']); if ($sql->db_Select("user", "*", "user_image!=''")) { + while ($row = $sql->db_Fetch()) { - extract($row); //FIXME - kill this!!! - - // - // Check size - // - $avname=avatar($user_image); + //Check size + $avname=avatar($row['user_image']); if (strpos($avname,"http://")!==FALSE) { $iAVexternal++; @@ -263,23 +401,31 @@ if (isset($_POST['check_avatar_sizes'])) $iAVinternal++; $bAVext=FALSE; } + $image_stats = getimagesize($avname); $sBadImage=""; + if (!$image_stats) { $iAVnotfound++; // allow delete $sBadImage=IMALAN_42; - } else { + } + else + { $imageWidth = $image_stats[0]; $imageHeight = $image_stats[1]; - if ( ($imageHeight > $pref['im_height']) || ($imageWidth > $pref['im_width']) ) + + if ( ($imageHeight > $allowedHeight) || ($imageWidth > $allowedWidth) ) { // Too tall or too wide $iAVtoobig++; - if ($imageWidth > $pref['im_width']) { + if ($imageWidth > $allowedWidth) + { $sBadImage = IMALAN_40." ($imageWidth)"; } - if ($imageHeight > $pref['im_height']) { + + if ($imageHeight > $allowedHeight) + { if (strlen($sBadImage)) { $sBadImage .= ", "; @@ -289,90 +435,86 @@ if (isset($_POST['check_avatar_sizes'])) } } - // - // If not found or too big, allow delete - // + //If not found or too large, allow delete if (strlen($sBadImage)) { - //$sBadImage .=" [".$avname."]"; // Show all files that have a problem - //FIXME + $found = true; $text .= " "; } - else - { - //Nothing found - $text .=" - - - "; - - } } } - // - // Done, so show stats - // + + //Nothing found + if(!$found) + { + $text .= " + + + + "; + } + $text .= "
- + - ".$user_name." + ".$row['user_name']." ".$sBadImage." ".$avname."
".IMALAN_65."
".IMALAN_65."
- - - + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
".IMALAN_38."".$pref['im_width']."
".IMALAN_39."".$pref['im_height']."
".IMALAN_45."".$iAVnotfound."
".IMALAN_46."".$iAVtoobig."
".IMALAN_47."".$iAVinternal."
".IMALAN_48."".$iAVexternal."
".IMALAN_49."".($iAVexternal+$iAVinternal)." (".(int)(100.0*(($iAVexternal+$iAVinternal)/$iUserCount)).'%, '.$iUserCount." ".IMALAN_50.")
".IMALAN_38."{$allowedWidth}
".IMALAN_39."{$allowedHeight}
".IMALAN_45."{$iAVnotfound}
".IMALAN_46."{$iAVtoobig}
".IMALAN_47."{$iAVinternal}
".IMALAN_48."{$iAVexternal}
".IMALAN_49."".($iAVexternal+$iAVinternal)." (".(int)(100.0*(($iAVexternal+$iAVinternal)/$iUserCount)).'%, '.$iUserCount." ".IMALAN_50.")
"; - $ns->tablerender(IMALAN_37, $text); + $ns->tablerender(IMALAN_37, $message.$text); } if(function_exists('gd_info')) @@ -406,12 +548,12 @@ if($pref['im_path'] != "") $text = "
-
+
".IMALAN_7." - - + + @@ -487,11 +629,16 @@ $text = " "; -$ns->tablerender(IMALAN_7, $text); +$ns->tablerender(IMALAN_7, $message.$text); +//Just in case... +if(!e_AJAX_REQUEST) require_once("footer.php"); -require_once("footer.php"); - +/** + * Handle page DOM within the page header + * + * @return string JS source + */ function headerjs() { require_once(e_HANDLER.'js_helper.php'); @@ -517,17 +664,18 @@ function headerjs() }, tCheckHandler: function(event) { - //do nothing if checkbox or its label is clicked - if(event.element().nodeName.toLowerCase() == 'input') return; + //do nothing if checkbox or link is clicked + var tmp = event.element(); + if(tmp.nodeName.toLowerCase() == 'input' || tmp.nodeName.toLowerCase() == 'a') return; //stop event event.stop(); - //td element - var element = event.findElement('td'), check = null; + //checkbox container element + var element = event.findElement('.options'), check = null; if(element) { check = element.select('input.checkbox'); //search for checkbox } //toggle checked property - if(check && check[0]) { + if(check && check[0] && !(\$(check[0]).disabled)) { \$(check[0]).checked = !(\$(check[0]).checked); } }, @@ -550,8 +698,7 @@ function headerjs() } /** - * Observe e107:loaded - * + * Observe e107:loaded event */ e107.runOnLoad(eCoreImage.init.bind(eCoreImage), document, true); @@ -559,11 +706,4 @@ function headerjs() return $ret; } -/* -XXX - remove this odd thing?! - -$pref['resize_method'] = $_POST['resize_method']; -$pref['im_path'] = $_POST['im_path']; - -*/ ?> \ No newline at end of file diff --git a/e107_files/jslib/e107.js.php b/e107_files/jslib/e107.js.php index 916dff468..0d3e9ae26 100644 --- a/e107_files/jslib/e107.js.php +++ b/e107_files/jslib/e107.js.php @@ -1,17 +1,17 @@ /* * e107 website system - * - * Copyright (c) 2001-2008 e107 Developers (e107.org) + * + * Copyright (C) 2001-2008 e107 Inc (e107.org) * Released under the terms and conditions of the - * GNU General Public License (http://gnu.org). - * + * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) + * * e107 Javascript API - * + * * $Source: /cvs_backup/e107_0.8/e107_files/jslib/e107.js.php,v $ - * $Revision: 1.13 $ - * $Date: 2008-12-03 13:03:54 $ + * $Revision: 1.14 $ + * $Date: 2008-12-10 16:59:19 $ * $Author: secretr $ - * + * */ var e107API = { @@ -932,7 +932,7 @@ Object.extend(e107Helper, { toggleChecked: function(form, state, selector, byId) { form = $(form); if(!form) { return; } if(byId) selector = 'id^=' + selector; - $A(form.select('input[type=checkbox][' + selector + ']')).each(function(element) { element.checked=state }); + $A(form.select('input[type=checkbox][' + selector + ']')).each(function(element) { if(!element.disabled) element.checked=state }); }, //This will be replaced later with upload_ui.php own JS method diff --git a/e107_handlers/js_helper.php b/e107_handlers/js_helper.php index f000dc912..b28f76363 100644 --- a/e107_handlers/js_helper.php +++ b/e107_handlers/js_helper.php @@ -1,28 +1,31 @@ encode($array); } - - function json_decode($json_obj) + + function json_decode($json_obj) { $json = new Services_JSON(); return $json->decode($json_obj); @@ -37,8 +40,8 @@ class e_jshelper * @var array */ var $_response_actions = array(); - - function addResponseAction($action, $data_array) + + function addResponseAction($action, $data_array) { if(!$action) $action = 'auto'; if(!isset($this->_response_actions[$action])) @@ -46,10 +49,10 @@ class e_jshelper $this->_response_actions[$action] = array(); } $this->_response_actions[$action] = array_merge($this->_response_actions[$action], $data_array); - + return $this; } - + /** * Response array getter * @@ -65,12 +68,12 @@ class e_jshelper } return $this->_response_actions; } - + /** * Buld XML response parsed by the JS API - * Quick & dirty, this will be extended to + * Quick & dirty, this will be extended to * e107 web service standard (communication protocol). - * + * * @return string XML response */ function buildXMLResponse() @@ -78,16 +81,16 @@ class e_jshelper $action_array = $this->getResponseActions(true); $ret = ''; $ret .= "\n\n"; - foreach ($action_array as $action => $field_array) + foreach ($action_array as $action => $field_array) { $ret .= "\t\n"; foreach ($field_array as $field => $value) { //associative arrays only - no numeric keys! - //to speed this up use $sql->db_Fetch(MYSQL_ASSOC); - //when passing large data from the DB + //to speed this up use $sql->db_Fetch(MYSQL_ASSOC); + //when passing large data from the DB if (is_numeric($field)) - continue; + continue; $transport_value = $value; if(!is_numeric($value) && !is_bool($value)) { $transport_value = ""; } $ret .= "\t\t{$transport_value}\n"; @@ -97,7 +100,7 @@ class e_jshelper $ret .= ''; return $ret; } - + /** * Convert (optional) and send array as XML response string * @@ -111,20 +114,20 @@ class e_jshelper { $this->addResponseAction($action, $data_array); } - + echo $this->buildXmlResponse(); } - + /** * Build JSON response string - * + * * @return string JSON response */ function buildJSONResponse() { return "/*-secure-\n".json_encode($this->getResponseActions(true))."\n*/"; } - + /** * Convert (optional) and send array as JSON response string * @@ -140,10 +143,10 @@ class e_jshelper } echo $this->buildJSONResponse(); } - + /** * Reset response action array to prevent duplicates - * + * * @access private * @return void */ @@ -151,7 +154,7 @@ class e_jshelper { $this->_response_actions = array(); } - + /** * Convert (optional) and send array as JSON response string * @@ -163,7 +166,7 @@ class e_jshelper header('Content-type: text/html; charset='.CHARSET, true); echo $data_text; } - + /** * Send error to the JS Ajax.response object * @@ -171,6 +174,7 @@ class e_jshelper * @param string $errmessage * @param string $errextended * @param bool $exit + * @access public static */ function sendAjaxError($errcode, $errmessage, $errextended = '', $exit = true) { @@ -181,17 +185,17 @@ class e_jshelper //Safari expects some kind of output, even empty echo ($errextended ? $errextended : ' '); - + if($exit) exit; } - + /** * Clean string to be used as JS string * Should be using for passing strings to e107 JS API - e.g Languages,Templates etc. - * + * * @param string $string * @return string - * @access static + * @access public static */ function toString($string) { diff --git a/e107_handlers/mysql_class.php b/e107_handlers/mysql_class.php index 560f5a048..d62d31b00 100644 --- a/e107_handlers/mysql_class.php +++ b/e107_handlers/mysql_class.php @@ -1,22 +1,17 @@ \ No newline at end of file diff --git a/e107_themes/_blank/admin_style.css b/e107_themes/_blank/admin_style.css index c841688ed..db67607f3 100644 --- a/e107_themes/_blank/admin_style.css +++ b/e107_themes/_blank/admin_style.css @@ -34,8 +34,8 @@ * { margin:0; padding:0; } body { font:12px/1.5em Arial, Helvetica, sans-serif; } img { border:0; vertical-align:top; } -a { text-decoration:underline; } -a:hover { text-decoration:underline; } +a { text-decoration:underline; color: #13394E; } +a:hover { text-decoration:underline; color: #CB0000; } a img { border:0; } :focus { outline:0; } @@ -49,7 +49,7 @@ h6 { font-size:11px; font-weight:bold; } /* Forms */ form { display:inline; } -fieldset { border:0; } +fieldset { border: 0; margin-bottom: 10px; } input, select{ vertical-align:middle; } textarea { overflow:auto; } @@ -104,25 +104,27 @@ ul,ol { list-style:none; } /* Form elements */ input.input-text, textarea, -select { +select, .tbox { border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; background:#fff; font:12px arial, helvetica, sans-serif; } -select { min-height:17px; /* to set the height for empty selects */ } -input.input-text, textarea { padding:2px; } +input.input-text, textarea, .tbox { padding:2px; } +select.tbox { min-height:17px; padding: 0px; /* to set the height for empty selects */ } /* custom fields CSS */ -#image-settings-form input.input-text { width: 300px; } - +#core-emoticon-configure input.input-text { width: 300px; } +.select.order { width: 40px; } .inline-help { width: 280px; } /* form used for settings */ +.col-label { width: 250px; } +.col-control {} + .adminform { width:100%; border:1px solid #ddd;} -.adminform col.label { width: 250px; } .adminform td { padding: 5px; text-align: left} @@ -258,16 +260,18 @@ button.edit:active span {} /* THEME SPECIFIC CSS *********************************************************************************************/ /******** Page Base */ -.admin-wrapper { min-width: 950px; } +.admin-wrapper { width: 100%; } .admin-header { padding: 20px 15px 0; } -.admin-header-content {border: 1px solid #DDDDDD;} +.admin-header-content { border: 1px solid #DDDDDD; } .admin-page-body { padding: 20px 15px 0; } .admin-footer {} /******** Layout */ -.col-left { float:left; width: 220px;} -.col-main { margin-left: 220px; padding: 0 0 0 20px;} -.inner-wrapper { float:left; width:100%; } +.main-table { width: 100%; border: 0 none; } +.col-left { width: 220px;} +.col-right { width: 220px;} +.col-main { padding: 0 15px 0 0;} +.inner-wrapper { } /******** Horizontal navigation ADMIN_NAV_ALT */ .admin-navigation { border: 1px solid #DDDDDD;} @@ -297,3 +301,54 @@ ul.plugin-navigation ul.sub-nav a.link-active {font-weight: bold;} .page-info { border: 1px solid #DDDDDD; margin-bottom: 10px; } .page-info p { padding: 10px; } + +#core-frontpage-edit-home { width: 50%; float: left; } +#core-frontpage-edit-post-login { width: 50%; float: left; } + +#core-frontpage-edit-home .adminlist { width: 99%; } +#core-frontpage-edit-post-login .adminlist { width: 99%; float: right; } + +#core-frontpage-edit .tbox { width: 80%;} +#core-frontpage-edit select.tbox { width: 50%;} + +#core-frontpage-edit .buttons-bar select.tbox { width: 140px; } +#core-frontpage-edit .buttons-bar { clear: both; } + + +/******** Core Block IDs */ +/* cache.php */ +#core-cache-settings {} /* General cache settings - Default front page */ + +/* emoticon.php */ +#core-emoticon-activate {} /* Emote activation - Default front page */ +#core-emoticon-packages {} /* Installed packs - Default front page */ +#core-emoticon-configure {} /* Configure an individual emote pack */ + +/* frontpage.php */ +#core-frontpage-settings {} /* Display list of current settings - Default front page */ +#core-frontpage-edit {} /* Add / Edit existing rule - form */ +#core-frontpage-edit-home {} /* Add / Edit existing rule for home page */ +#core-frontpage-edit-post-login {} /* Add / Edit existing rule for post-login page */ + +/* image.php */ +#core-image-check-avatar {} /* Check avatar sizes table */ +#core-image-settings {} /* General image settings - Default front page */ + +/* links.php */ +#core-links-list-1 {} /* Display list of current links - Default front page */ +#core-links-list-2 {} /* Display list of current links - Default front page */ +#core-links-list-3 {} /* Display list of current links - Default front page */ +#core-links-list-4 {} /* Display list of current links - Default front page */ + + +/* meta.php */ +#core-dataform {} /* Form tag ID - Default front page - old core definition */ +#core-meta-settings {} /* General meta settings - Default front page */ + +/* search.php */ +#core-search-configuration-main {} /* Search Configuration for Searchable Areas - Default front page */ +#core-search-configuration-comm {} /* Search Configuration for Searchable Comments Areas - Default front page */ +#core-search-edit {} /* Edit search settings for specific area */ +#core-search-settings {} /* General search settings */ + + diff --git a/e107_themes/_blank/admin_template.php b/e107_themes/_blank/admin_template.php index b0cc9a93d..6b6655093 100644 --- a/e107_themes/_blank/admin_template.php +++ b/e107_themes/_blank/admin_template.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $ -| $Revision: 1.1 $ -| $Date: 2008-12-09 15:19:03 $ +| $Revision: 1.2 $ +| $Date: 2008-12-10 16:59:19 $ | $Author: secretr $ +----------------------------------------------------------------------------+ */ @@ -38,38 +38,48 @@ $ADMIN_HEADER = "
-
-
- {ADMIN_LANG} - {SETSTYLE=admin_menu} - {ADMIN_NAV} - {ADMIN_MENU} - {SETSTYLE=bla} - {ADMIN_PWORD} - {ADMIN_STATUS=request} - {ADMIN_LATEST=request} - {ADMIN_LOG=request} - {ADMIN_MSG} - {ADMIN_PLUGINS} - - {ADMIN_PRESET} - {ADMIN_UPDATE} - {SETSTYLE=site_info} - - {ADMIN_HELP} - {ADMIN_SITEINFO} - {ADMIN_DOCS} - {SETSTYLE=bla} -
-
-
+
+ + + + + +
+
+
"; $ADMIN_FOOTER = " -
-
-
- + + + 		+
+ {SETSTYLE=admin_menu} + + {SETSTYLE=admin_menu} + {ADMIN_MENU} + + {SETSTYLE=none} + {ADMIN_LANG} + {ADMIN_PWORD} + {ADMIN_STATUS=request} + {ADMIN_LATEST=request} + {ADMIN_LOG=request} + {ADMIN_MSG} + {ADMIN_PLUGINS} + + {ADMIN_PRESET} + {ADMIN_UPDATE} + {SETSTYLE=site_info} + {ADMIN_HELP} + {ADMIN_SITEINFO} + {ADMIN_DOCS} +
+
{ADMIN_CREDITS} diff --git a/e107_themes/_blank/fs_admin_alt_nav.sc b/e107_themes/_blank/fs_admin_alt_nav.sc index 9e7751264..a7aeac961 100644 --- a/e107_themes/_blank/fs_admin_alt_nav.sc +++ b/e107_themes/_blank/fs_admin_alt_nav.sc @@ -1,32 +1,30 @@ -if (ADMIN) { +/* +* e107 website system (c) 2001-2008 Steve Dunstan (e107.org) +* $Id: fs_admin_alt_nav.sc,v 1.2 2008-12-10 16:59:19 secretr Exp $ +*/ + +if (ADMIN) +{ global $sql, $pref, $tp; parse_str($parm); require(e_ADMIN.'ad_links.php'); require_once(e_HANDLER.'admin_handler.php'); - function adnav_cat_fs($cat_title, $cat_link, $cat_img, $cat_id=FALSE) { $cat_link = ($cat_link ? $cat_link : "javascript:void(0);"); - $text = ''; return $text; } - function adnav_main_fs($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='') { $text = ""; + } else { + $text = ""; + } */ /* $text .= "
"; */ + $text .= ' +
'; return $text; diff --git a/e107_themes/_blank/ie_all.css b/e107_themes/_blank/ie_all.css index b781f2115..d7f2a635e 100644 --- a/e107_themes/_blank/ie_all.css +++ b/e107_themes/_blank/ie_all.css @@ -8,7 +8,21 @@ input.radio { width:13px; height:13px; } button { width:auto; overflow:visible; + vertical-align: middle } button span { margin-top:1px; + } + + +/* THEME SPECIFIC CSS *********************************************************************************************/ + +#core-frontpage-edit-home { width: 49%; float: left; margin-right: 10px; } +#core-frontpage-edit-post-login { width: 49%; float: left;} + +#core-frontpage-edit-home .adminlist { width: 100%; } +#core-frontpage-edit-post-login .adminlist { width: 100%; } + + + diff --git a/e107_themes/_blank/menu/menu.css b/e107_themes/_blank/menu/menu.css index dde326bcf..02263ee32 100644 --- a/e107_themes/_blank/menu/menu.css +++ b/e107_themes/_blank/menu/menu.css @@ -38,7 +38,8 @@ float: left; /* width: 158px; width needed or else Opera goes nuts */ } -ul.sub {border-top: 1px solid #CCCCCC;} +ul.sub {border-top: 1px solid #DDDDDD;} + #nav li ul { /* second-level lists */ position: absolute; z-index: 10; @@ -52,15 +53,15 @@ ul.sub {border-top: 1px solid #CCCCCC;} #nav li.sfhover li a { text-align: left; background-image: none; - background-color: #FBFEF1; + background-color: #FFFFFF; line-height: 28px; font-size: 11px; font-weight: bold; padding-left: 10px; padding-right: 0px; - border-left: 1px solid #B8DF30; - border-right: 1px solid #B8DF30; - border-bottom: 1px solid #B8DF30; + border-left: 1px solid #DDDDDD; + border-right: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; width: 188px; w\idth : 188px; text-transform: none; @@ -81,7 +82,7 @@ ul.sub {border-top: 1px solid #CCCCCC;} #nav li li a:hover{ - background-color: #DDF098; + background-color: #f6f6f6; color: #990000 }