From 93aca4d8e1c3d01b10b6635eaf8f7d9a34951e46 Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 26 Nov 2012 18:42:11 -0800 Subject: [PATCH] More bootstrap changes. --- e107_admin/admin.php | 2 +- e107_admin/credits.php | 287 ++++-------------- e107_admin/db.php | 5 +- e107_admin/emoticon.php | 2 +- e107_admin/includes/infopanel.php | 27 +- e107_admin/language.php | 7 +- e107_admin/prefs.php | 1 + e107_admin/users.php | 16 +- e107_admin/users_extended.php | 23 +- .../shortcodes/batch/admin_shortcodes.php | 28 +- e107_images/admin_images/credits_logo.png | Bin 0 -> 18764 bytes e107_themes/bootstrap/admin_style.css | 19 +- e107_themes/bootstrap/admin_template.php | 14 +- e107_themes/bootstrap/admin_theme.php | 15 +- e107_themes/bootstrap/img/e107_adminlogo.png | Bin 0 -> 3285 bytes e107_web/js/core/admin.jquery.js | 1 + 16 files changed, 164 insertions(+), 283 deletions(-) create mode 100644 e107_images/admin_images/credits_logo.png create mode 100644 e107_themes/bootstrap/img/e107_adminlogo.png diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 7dc91471c..a6dc5e0ac 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -179,7 +179,7 @@ function render_links($link, $title, $description, $perms, $icon = FALSE, $mode else { - if($mode != "div") + if($mode != "div" && $mode != 'div-icon-only') { if ($td == (ADLINK_COLS+1)) { diff --git a/e107_admin/credits.php b/e107_admin/credits.php index 774ffeb2f..e70823845 100644 --- a/e107_admin/credits.php +++ b/e107_admin/credits.php @@ -1,249 +1,66 @@ "MagpieRSS", - "url" => "http://magpierss.sourceforge.net/", - "description" => CRELAN_10, - "version" => "0.71.1", - "licence" => "GPL, ".CRELAN_8 - ), - array( "name" => "PCLZip", - "url" => "http://www.phpconcept.net/pclzip/", - "description" => CRELAN_11, - "version" => "2.3", - "licence" => "GPL" - ), - array( "name" => "PCLTar", - "url" => "http://www.phpconcept.net/pcltar/", - "description" => CRELAN_12, - "version" => "1.3", - "licence" => "GPL" - ), - array( "name" => "TinyMCE", - "url" => "http://tinymce.moxiecode.com/", - "description" => CRELAN_13, - "version" => "2.08", - "licence" => "GPL" - ), - array( "name" => "Nuvolo Icons", - "url" => "http://www.icon-king.com", - "description" => CRELAN_14, - "version" => "1.0", - "licence" => "GPL" - ), - array( "name" => "PHPMailer", - "url" => "http://phpmailer.sourceforge.net/", - "description" => CRELAN_15, - "version" => "1.72", - "licence" => "GPL" - ), - array( "name" => "Brainjar DHTML Menu", - "url" => "http://www.brainjar.com/dhtml/menubar/", - "description" => CRELAN_16, - "version" => "0.1", - "licence" => "GPL, ".CRELAN_8 - ), - array( "name" => "FPDF", - "url" => "http://www.fpdf.org/", - "description" => CRELAN_18, - "version" => "1.53", - "licence" => "Freeware" - ), - array( "name" => "UFPDF", - "url" => "http://www.acko.net/node/56", - "description" => CRELAN_19, - "version" => "0.1", - "licence" => "GPL" - ), - ); - -$contentA = array( // ORDER BY FirstName ASC ;) - "

".CRELAN_6."<\/h3>", - "

Cameron Hanly<\/h1>[ CaMer0n ]


".CRELAN_21, - "

Carl Cedergren<\/h1>[ asperon ]


".CRELAN_20, - "

Eric Vanderfeesten<\/h1> [ lisa ]


".CRELAN_23, - "

James Currie<\/h1>[ SweetAs ]


".CRELAN_27, - "

Martin Nicholls<\/h1>[ streaky ]


".CRELAN_26, - "

Miroslav Yovchev<\/h1>[ SecretR ]


".defset('CRELAN_29'), - "

Pete Holzmann<\/h1>[ MrPete ]


".CRELAN_28, - "

Steve Dunstan<\/h1>[ jalist ]


".CRELAN_22, - "

Steven Davies<\/h1>[ steved ]


".defset('CRELAN_30'), - "

Thom Michelbrink<\/h1>[ McFly ]


".CRELAN_24, - "

William Moffett<\/h1>[ que ]


".CRELAN_25, -); - -echo " - - -".PAGE_NAME." - - - - - - -
-
".CRELAN_7." ".$e107info['e107_version'].", build ".($e107info['e107_build'] ? $e107info['e107_build'] : "zero")."
© 2002-2008, ".CRELAN_3."
- -"; +require_once(e_ADMIN."auth.php"); -$fadejs = " - - -TEXT; - -echo $fadejs; - -echo " -
-
". -(e_QUERY && e_QUERY == "stps" ? "" : "")."
-
-
- -
- - -"; +?> \ No newline at end of file diff --git a/e107_admin/db.php b/e107_admin/db.php index dc9d71d12..bd40b650d 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -75,6 +75,8 @@ if(isset($_POST['exportXmlFile'])) } + + require_once ("auth.php"); $st = new system_tools; @@ -956,10 +958,11 @@ class system_tools //XXX - what is this for (backup core)? -function db_adminmenu() +function db_adminmenu() //FIXME - has problems when navigation is on the LEFT instead of the right. { global $st; + foreach($st->_options as $key=>$val) { $var[$key]['text'] = $val['label']; diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index 18228f54f..25b5ced7c 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -234,7 +234,7 @@ class emotec - $text .= $frm->admin_button('subPack_'.$pack,'edit','submit',EMOLAN_12); + $text .= $frm->admin_button('subPack_'.$pack,'edit','submit',LAN_CONFIGURE); if ($can_scan && ($pack != 'default')) { diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index fae7031e5..5bab0e0e8 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -222,25 +222,32 @@ function render_infopanel_options($render = false) // $frm = e107::getSingleton('e_form'); $frm = e107::getForm(); $mes = e107::getMessage(); + $ns = e107::getRender(); + $start = "
To customize this page, please click here.
"; - if($render == false){ return $start; } + if($render == false){ return ""; } $text2 = "
-
-

Icons

"; - $text2 .= render_infopanel_icons(); + "; + + $text2 .= $ns->tablerender("Personalize Icons",render_infopanel_icons(),'personalize',true); $text2 .= "
 
"; - $text2 .= "

Menus

"; - $text2 .= render_infopanel_menu_options(); + $text2 .= $ns->tablerender("Personalize Menus",render_infopanel_menu_options(),'personalize',true); +// $text2 .= render_infopanel_icons(); + //$text2 .= "
 
"; +// $text2 .= "

Menus

"; +// $text2 .= render_infopanel_menu_options(); $text2 .= "
 
"; $text2 .= "
"; - $text2 .= $frm->admin_button('submit-mye107', 'Save', 'Save'); - $text2 .= "
"; - $end = ""; + $text2 .= $frm->admin_button('submit-mye107', 'Save', 'create'); + $text2 .= ""; +// $text2 .= ""; + +// $end = ""; return $mes->render().$text2.$end; @@ -276,6 +283,7 @@ function render_infopanel_icons() } } } + $text .= "
 
"; return $text; } @@ -308,6 +316,7 @@ function render_infopanel_menu_options() } } } + $text .= "
 
"; return $text; } ?> diff --git a/e107_admin/language.php b/e107_admin/language.php index 274b20889..6f52088c0 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -749,7 +749,10 @@ function available_langpacks() function language_adminmenu() { - global $action,$pref; + global $pref; + + $action = e_QUERY; + if ($action == "") { $action = "main"; @@ -758,8 +761,10 @@ function language_adminmenu() { $action = "db"; } + $var['main']['text'] = LAN_PREFS; $var['main']['link'] = e_SELF; + if (isset($pref['multilanguage']) && $pref['multilanguage']) { $var['db']['text'] = LANG_LAN_03; diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index a18655ff5..6ed4106bb 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -1688,6 +1688,7 @@ function prefs_adminmenu() $var['core-prefs-uploads']['text'] = "File Uploading"; // TODO LAN $var['core-prefs-javascript']['text'] = "Javascript Framework"; // TODO LAN $var['core-prefs-advanced']['text'] = PRFLAN_149; + e_admin_menu(LAN_OPTIONS.'--id--prev_nav', 'core-prefs-main', $var); } diff --git a/e107_admin/users.php b/e107_admin/users.php index 510098b00..7c83f62b1 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -3134,15 +3134,13 @@ function showRanks() ".RankImageDropdown($imageList,'new_calc_img')." - - - -
- - - - "; - $text .= ''; + "; + + $text .= ' +
+ '.$frm->admin_button('updateRanks','no-value','submit',USRLAN_215).' +
+ '; echo $emessage->render().$text; diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index 5f1e8cb98..3bce27a80 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -34,15 +34,20 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $e_sub_cat = 'user_extended'; $curtype = '1'; -require_once(e_HANDLER.'message_handler.php'); - require_once("auth.php"); -require_once(e_HANDLER.'user_extended_class.php'); -require_once(e_HANDLER.'userclass_class.php'); +require_once(e_HANDLER.'message_handler.php'); +$ue = new e107_user_extended; +$user = new users_ext; $frm = e107::getForm(); -$ue = new e107_user_extended; + +require_once(e_HANDLER.'user_extended_class.php'); +require_once(e_HANDLER.'userclass_class.php'); + + + + $message = ''; @@ -123,7 +128,7 @@ if (isset($_POST['catdown_x']) || isset($_POST['catdown'])) } } -$user = new users_ext; + if (isset($_POST['add_field'])) { @@ -1212,7 +1217,11 @@ class users_ext function users_extended_adminmenu() { global $user, $action, $ns, $curtype, $action; - $user->show_options($action); + // $user->show_options($action); + $ac = e_QUERY; + $action = vartrue($ac,'main'); + + users_ext::show_options($action); if($action == 'editext' || $action == 'continue') { $ns->tablerender(EXTLAN_46." -  ", "
 
"); diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 17317a796..baae83f2e 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -1443,14 +1443,7 @@ class admin_shortcodes } elseif($type == 'logout') { - $tmp[0]['text'] = ADLAN_46; - $tmp[0]['description'] = ADLAN_151; - $tmp[0]['link'] = e_ADMIN_ABS.'admin.php?logout'; - $tmp[0]['image'] = "".ADLAN_151.""; - $tmp[0]['image_large'] = ''; - $tmp[0]['image_src'] = ''; - $tmp[0]['image_large_src'] = ''; - $tmp[0]['perm'] = ''; + $tmp = array(); $tmp[1]['text'] = ADLAN_CL_1; $tmp[1]['description'] = ADLAN_151; @@ -1461,6 +1454,25 @@ class admin_shortcodes $tmp[1]['image_large_src'] = ''; $tmp[1]['perm'] = ''; + + $tmp[2]['text'] = "Personalize"; // TODO - generic LAN in lan_admin.php + $tmp[2]['description'] = "Customize administration panels"; + $tmp[2]['link'] = e_ADMIN.'admin.php?mode=customize'; + $tmp[2]['image'] = E_16_ADMIN; // "".ADLAN_151.""; + $tmp[2]['image_large'] = ''; + $tmp[2]['image_src'] = ''; + $tmp[2]['image_large_src'] = ''; + $tmp[2]['perm'] = ''; + + + $tmp[3]['text'] = ADLAN_46; + $tmp[3]['description'] = ADLAN_151; + $tmp[3]['link'] = e_ADMIN_ABS.'admin.php?logout'; + $tmp[3]['image'] = "".ADLAN_151.""; + $tmp[3]['image_large'] = ''; + $tmp[3]['image_src'] = ''; + $tmp[3]['image_large_src'] = ''; + $tmp[3]['perm'] = ''; $menu_vars['logout']['text'] = ADMINNAME; $menu_vars['logout']['link'] = '#'; diff --git a/e107_images/admin_images/credits_logo.png b/e107_images/admin_images/credits_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b89f92b5759747dfe6b05c24ce74f9f67d2ab831 GIT binary patch literal 18764 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 V5-peia>)Py002ovPDHLkV1i5I?9l)K literal 0 HcmV?d00001 diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index f48dc7864..b605ff925 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -6,9 +6,17 @@ padding:10px; } +.navbar { + background-color: #081D28; +} + #core-infopanel_mye107 a { } + +.tipsy-inner { + font-size:15px; +} /* Core Formatting */ .left { text-align: left } @@ -87,7 +95,16 @@ img.edit, img.delete, input.delete { } -.buttons-bar { padding: 10px 0px; background-color: #d0fbfd; } +.buttons-bar { padding: 10px 0px; } + + i.icon-chevron-right { + float:right; + opacity: 0.3 +} + +a.link-active i { + opacity: 1.0; +} /*******************************************************************************************************************/ /* Admin List Table */ .adminlist, .adminform { width:100%; border:1px solid #ddd;} diff --git a/e107_themes/bootstrap/admin_template.php b/e107_themes/bootstrap/admin_template.php index 95e16734d..2e5c2a767 100644 --- a/e107_themes/bootstrap/admin_template.php +++ b/e107_themes/bootstrap/admin_template.php @@ -52,7 +52,7 @@ $E_ADMIN_NAVIGATION['button_active'] = ' $E_ADMIN_NAVIGATION['button_other'] = '
  • - {LINK_TEXT} + {LINK_TEXT}
    • '; @@ -90,10 +90,8 @@ $E_ADMIN_NAVIGATION['end'] = ''; $ADMIN_HEADER = '
    -
    - - - e107 e107 Admin +
    + e107
    @@ -170,7 +168,7 @@ $ADMIN_FOOTER = '
    - {ADMIN_CREDITS} + Copyright © 2008-2012 e107 Inc (e107.org)
    '; @@ -273,13 +271,13 @@ $E_ADMIN_MENU['start'] = ' $E_ADMIN_MENU['button'] = '
  • -  {LINK_TEXT} +  {LINK_TEXT} {SUB_MENU}
    • '; $E_ADMIN_MENU['button_active'] = '
  • -  {LINK_TEXT} +  {LINK_TEXT} {SUB_MENU}
    • '; diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php index b79603ee8..e24006120 100644 --- a/e107_themes/bootstrap/admin_theme.php +++ b/e107_themes/bootstrap/admin_theme.php @@ -4,7 +4,6 @@ if ( ! defined('e107_INIT')) { exit(); } define('STANDARDS_MODE', TRUE); // include_lan(e_THEME."_blank/languages/".e_LANGUAGE.".php"); - e107::js('theme','js/bootstrap.js'); e107::css('theme','css/bootstrap.css'); e107::css('theme','css/bootstrap-responsive.css'); @@ -124,6 +123,19 @@ function tablestyle($caption, $text, $mode) '; return; } + + if($mode == 'personalize') + { + echo '
    +
    '.$caption.'
    + '.$text.' +
    '; + + return; + } + + + if($style == 'core-infopanel') { @@ -142,7 +154,6 @@ function tablestyle($caption, $text, $mode) - switch(varset($style, 'admin_content')) { case 'admin_menu' : diff --git a/e107_themes/bootstrap/img/e107_adminlogo.png b/e107_themes/bootstrap/img/e107_adminlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..d52cdfe2d1c953065d2e74103dfe3d00a77b993e GIT binary patch literal 3285 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 WG6uCGHcwzwKN=J_Z*r*%Bl*9-#R~cW literal 0 HcmV?d00001 diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js index 74a6d4889..eeb81767d 100644 --- a/e107_web/js/core/admin.jquery.js +++ b/e107_web/js/core/admin.jquery.js @@ -102,6 +102,7 @@ $(document).ready(function() $(id).show({ effect: "slide" }); + return false; //FIXME See admin/prefs navigation. });