diff --git a/e107_admin/auth.php b/e107_admin/auth.php index b1bd50ca3..75a7ee615 100644 --- a/e107_admin/auth.php +++ b/e107_admin/auth.php @@ -150,9 +150,9 @@ else border-color:#aaa #c8c8c8 #c8c8c8 #aaa; background:#fff; font:16px arial, helvetica, sans-serif; - -moz-border-radius:3px; - -webkit-border-radius:3px; - border-radius:3px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; -moz-box-shadow: 1px 1px 2px #999 inset; -webkit-box-shadow: 1px 1px 2px #999 inset; box-shadow: 1px 1px 2px #999 inset; @@ -189,13 +189,13 @@ else .submit { } - .placeholder { color: #bbb; } + .placeholder { color: #bbb; font-style:italic } - ::-webkit-input-placeholder { color: #bbb; } + ::-webkit-input-placeholder { font-style:italic; color: #bbb; } - :-moz-placeholder { color: #bbb; } + :-moz-placeholder { font-style:italic; color: #bbb; } - h1 { text-align: center } + h1 { text-align: center; color: #646667; text-transform:uppercase; } #username {background: url(".e_IMAGE."admin_images/admins_16.png) no-repeat scroll 7px 7px; padding-left:30px; } diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index ecd20fa67..2029cc290 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -25,7 +25,7 @@ require_once('../class2.php'); -if (!getperms("5|J")) { header('location:'.e_BASE.'index.php'); exit; } +if (!getperms("5|J")) { header('location:'.e_ADMIN.'admin.php'); exit; } include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); diff --git a/e107_admin/includes/tabbed.php b/e107_admin/includes/tabbed.php index ea0625d9c..cb49a0e38 100644 --- a/e107_admin/includes/tabbed.php +++ b/e107_admin/includes/tabbed.php @@ -16,8 +16,7 @@ if (!defined('e107_INIT')) { exit; } -require_once(e_HANDLER."message_handler.php"); -$emessage = &eMessage::getInstance(); +$mes = e107::getMessage(); $text = "
@@ -25,7 +24,8 @@ $text = "
foreach ($admin_cat['id'] as $cat_key => $cat_id) { - $text .= "
  • ".$admin_cat['title'][$cat_key]."
  • "; + // $text .= "
  • ".$admin_cat['title'][$cat_key]."
  • "; + $text .= "
  • ".$admin_cat['title'][$cat_key]."
  • "; } $text .= ""; @@ -80,8 +80,7 @@ foreach ($admin_cat['id'] as $cat_key => $cat_id) $text .= "
    "; -$ns->tablerender(ADLAN_47." ".ADMINNAME, $emessage->render().$text); +$ns->tablerender(ADLAN_47." ".ADMINNAME, $mes->render().$text); - -?> +?> \ No newline at end of file diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 7ba0fb11d..ad50682b3 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -314,21 +314,16 @@ function update_706_to_800($type='') */ - $setCorePrefs = array( //modified prefs during upgrade. + $setCorePrefs = array( //modified prefs during upgrade. 'adminstyle' => 'infopanel', 'admintheme' => 'jayya' ); - - - - - $do_save = TRUE; - foreach($setCorePrefs as $k=>$v) - { - $pref[$k] = $v; - } + + + + $do_save = TRUE; // List of changed menu locations. @@ -362,6 +357,13 @@ function update_706_to_800($type='') $just_check = $type == 'do' ? FALSE : TRUE; // TRUE if we're just seeing whether an update is needed + if (!$just_check) + { + foreach($setCorePrefs as $k=>$v) + { + $pref[$k] = $v; + } + } if (!$just_check) { diff --git a/e107_files/jslib/core/admin.jquery.js b/e107_files/jslib/core/admin.jquery.js index 09809c267..f2593d8c0 100644 --- a/e107_files/jslib/core/admin.jquery.js +++ b/e107_files/jslib/core/admin.jquery.js @@ -268,7 +268,7 @@ $(document).ready(function() }); - $(".e-shake" ).effect("shake","",100); + $(".e-shake" ).effect("shake",{times: 10, distance: 2},20); $("select.filter").change(function() {