diff options
| -rw-r--r-- | engine/lib/admin.php | 14 | ||||
| -rw-r--r-- | engine/lib/elgglib.php | 27 | ||||
| -rw-r--r-- | views/default/css/admin.php | 866 | ||||
| -rw-r--r-- | views/default/css/ie.php (renamed from views/default/css_ie.php) | 0 | ||||
| -rw-r--r-- | views/default/css/ie6.php (renamed from views/default/css_ie6.php) | 0 | ||||
| -rw-r--r-- | views/default/layouts/administration.php | 867 | ||||
| -rw-r--r-- | views/default/page_elements/html_begin.php | 4 | ||||
| -rw-r--r-- | views/default/page_elements/html_begin_admin.php | 39 | ||||
| -rw-r--r-- | views/default/page_shells/admin.php | 2 |
9 files changed, 908 insertions, 911 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php index 82351701c..3c070203e 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -157,6 +157,17 @@ function admin_init() { } /** + * Handles any set up required for administration pages + */ +function admin_pagesetup() { + if (elgg_in_context('admin')) { + $url = elgg_get_site_url() . 'pg/css/admin.css'; + elgg_register_css($url, 'admin'); + elgg_unregister_css('elgg'); + } +} + +/** * Handle admin pages. Expects corresponding views as admin/section/subsection * * @param array $page Array of pages @@ -310,6 +321,5 @@ function elgg_admin_notice_exists($id) { return ($notice) ? TRUE : FALSE; } -// Register init functions elgg_register_event_handler('init', 'system', 'admin_init'); -elgg_register_event_handler('pagesetup', 'system', 'admin_pagesetup'); +elgg_register_event_handler('pagesetup', 'system', 'admin_pagesetup', 1000); diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 8a8cecbfa..7bf23df5e 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -2138,6 +2138,32 @@ function js_page_handler($page) { } /** + * Serve CSS + * + * Serves CSS from the css views directory with headers for caching control + * + * @param array $page The page array + * + * @return void + * @elgg_pagehandler css + */ +function css_page_handler($page) { + if (!isset($page[0])) { + // default css + } + + $css = str_replace('.css', '', $page[0]); + $return = elgg_view("css/$css"); + + header("Content-type: text/css", true); + header('Expires: ' . date('r', time() + 86400000), true); + header("Pragma: public", true); + header("Cache-Control: public", true); + + echo $return; +} + +/** * Intercepts the index page when Walled Garden mode is enabled. * * @link http://docs.elgg.org/Tutorials/WalledGarden @@ -2192,6 +2218,7 @@ function elgg_init() { elgg_register_action('likes/delete'); register_page_handler('js', 'js_page_handler'); + register_page_handler('css', 'css_page_handler'); // Trigger the shutdown:system event upon PHP shutdown. register_shutdown_function('_elgg_shutdown_hook'); diff --git a/views/default/css/admin.php b/views/default/css/admin.php new file mode 100644 index 000000000..5a99ab3f8 --- /dev/null +++ b/views/default/css/admin.php @@ -0,0 +1,866 @@ +<?php +/** + * Elgg Admin CSS + */ +?> + +/* *************************************** + RESET CSS +*************************************** */ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + font-family: inherit; + vertical-align: baseline; +} +img { + border-width:0; + border-color:transparent; +} +:focus { + outline:0 none; + -moz-outline-style: none; +} +ol, ul { + /* list-style:none outside none; */ + margin: 0 0 10px 0; + padding-left: 20px; +} +em, i { + font-style:italic; +} +ins { + text-decoration:none; +} +del { + text-decoration:line-through; +} +strong { + font-weight:bold; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +caption, th, td { + text-align: left; + font-weight: normal; + vertical-align: top; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ""; +} +blockquote, q { + quotes: "" ""; +} + + + + +/* *************************************** + BASICS +*************************************** */ +body { + text-align:left; + margin:0 auto; + padding:0; + background-color: #444444; + font-size: 80%; + line-height: 1.4em; + font-family: "Lucida Grande",Arial,Tahoma,Verdana,sans-serif; +} +a { + color:#0054A7; + text-decoration: none; + -moz-outline-style: none; + outline: none; +} +a:hover, +a.selected { + color: black; + text-decoration: underline; +} +p { + margin-bottom:15px; +} +p:last-child { + margin-bottom:0; +} +small { + font-size: 90%; +} +h1, h2, h3, h4, h5, h6 { + font-weight: bold; + line-height: auto; + color:#0054A7; +} +h1 { font-size: 1.8em; } +h2 { font-size: 1.5em; line-height: 1.1em; } +h3 { font-size: 1.2em; } +h4 { font-size: 1.0em; } +h5 { font-size: 0.9em; } +h6 { font-size: 0.8em; } +dt { + font-weight: bold; +} +dd { + margin: 0 0 1em 1em; +} +pre, code { + font-family:Monaco,"Courier New",Courier,monospace; + font-size:12px; + background:#EBF5FF; + overflow:auto; + + overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */ + white-space: pre-wrap; /* css-3 */ + white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ +} +code { + padding:2px 3px; +} +pre { + padding:3px 15px; + margin:0px 0 15px 0; + line-height:1.3em; +} +blockquote { + padding:3px 15px; + margin:0px 0 15px 0; + line-height:1.3em; + background:#EBF5FF; + border:none; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; +} + + +/* *************************************** + GENERIC SELECTORS +*************************************** */ +h2 { + border-bottom:1px solid #CCCCCC; + padding-bottom:5px; +} +.clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.link { + cursor:pointer; +} +.small { + font-size: 90%; +} +.divider { + border-top:1px solid #cccccc; +} +.hidden { + display:none; +} +.radius8 { + -webkit-border-radius: 8px; + -moz-border-radius: 8px; +} +.margin_none { + margin:0; +} +.margin_top { + margin-top:10px; +} +.entity_title a { color:#0054A7; } +.elgg_horizontal_tabbed_nav a:hover { color:#0054A7; } +table.mceLayout { + width:100% !important; +} + + + + + + + +#admin_header { + background-color:#333333; + border-bottom:1px solid #555555; +} +#admin_footer { + background:#333333; + border-top:1px solid #222222; + clear:both; + height:30px; + width:100%; +} +#admin_header .network_title h2 { + height:45px; + line-height:45px; + margin:0; + padding:0 0 0 20px; + border:0; +} +#admin_header .network_title h2 a { + color:white; +} +#admin_header .network_title h2 a:hover { + color:white; + text-decoration: underline; +} +#admin_header .network_title h2 a.return_to_network { + font-size:12px; + font-weight: normal; + color:#666666; + float:right; + margin-right:40px; +} +#elgg_content.admin_area { + margin:20px; + min-height:400px; + position:relative; + width:auto; + background-image: none; + background-color: transparent; + -webkit-box-shadow: none; + -moz-box-shadow: none; +} +#elgg_content.admin_area #elgg_page_contents { + float:left; + margin:0; + padding:14px; + width:75%; + background-color: white; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; +} +#elgg_content.admin_area #elgg_sidebar { + float:left; + margin:0; + min-height:400px; + padding:0 0 0 3%; + position:relative; + width:17%; +} + +.admin_area h1, +.admin_area h2, +.admin_area h3, +.admin_area h4, +.admin_area h5, +.admin_area h6 { + color:#666666; +} +.admin_area #elgg_sidebar .submenu { + margin:0; + padding:0; + list-style: none; + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; +} +.admin_area .submenu li.selected a, +.admin_area .submenu li.selected li.selected a, +.admin_area .submenu li.selected li.selected li.selected a { + background-color: black; + color:white; +} +.admin_area .submenu li a { + display:block; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background-color:white; + margin:0 0 3px 0; + padding:2px 4px 2px 8px; + color:#333333; +} +.admin_area .submenu li a:hover { + background-color:black; + color:white; + text-decoration:none; +} +.admin_area #elgg_sidebar .submenu ul.child { + margin-bottom:10px; +} +.admin_area .submenu .child li a { + margin-left:15px; + background-color:#dedede; + color:#333333; +} +.admin_area .submenu .child li a:hover { + background-color:black; + color:white; +} + +.admin_settings h3 { + background:#999999; + color:white; + padding:5px; + margin-top:10px; + margin-bottom:10px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; +} +.admin_settings label { + color:#333333; + font-size:100%; + font-weight:normal; +} +.admin_area .input_textarea { + width:98%; +} +.admin_area form#plugin_settings { + margin-top: 10px; +} +.admin_area form#plugin_settings .action_button.disabled { + margin-top:10px; + float:right; +} + + +/* *************************************** + GENERAL FORM ELEMENTS +*************************************** */ +/* default elgg core input field classes */ +.admin_area .input_text, +.admin_area .input_tags, +.admin_area .input_url, +.admin_area .input_textarea { + width:98%; +} +.admin_area .input_access { + margin:5px 0 0 0; +} +.admin_area .input_password { + width:200px; +} +.admin_area .input_textarea { + height: 200px; + width:718px; +} +.admin_area input[type="checkbox"], +.admin_area input.input_radio { + margin:0 3px 0 0; + padding:0; + border:none; +} +.admin_area label { + font-weight: bold; + color:#333333; + font-size: 110%; +} +.admin_area input { + font: 120% Arial, Helvetica, sans-serif; + padding: 5px; + border: 1px solid #cccccc; + color:#666666; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} +.admin_area textarea { + font: 120% Arial, Helvetica, sans-serif; + border: solid 1px #cccccc; + padding: 5px; + color:#666666; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} +.admin_area textarea:focus, +.admin_area input[type="text"]:focus { + border: solid 1px #666666; + background: #f5f5f5; + color:#333333; +} +.admin_area .input_textarea.monospace { + font-family:Monaco,"Courier New",Courier,monospace; + font-size:13px; +} +.admin_area a.longtext_control { + float:right; + margin-left:14px; +} +.admin_area .submit_button { + font-size: 14px; + font-weight: bold; + color: white; + text-shadow:1px 1px 0px black; + text-decoration:none; + border: 1px solid #0054A7; + background-color:#0054A7; + background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + width: auto; + padding: 2px 4px; + margin:0 10px 10px 0; + cursor: pointer; + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); +} +.admin_area .submit_button:hover { + color: white; + border-color: #333333; + text-decoration:none; + background-color:#333333; + background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; +} +.admin_area input[type="password"]:focus { + border: solid 1px #666666; + background-color: #f5f5f5; + color:#333333; +} +.admin_area input[type="submit"] { + font-size: 14px; + font-weight: bold; + color: white; + text-shadow:1px 1px 0px black; + text-decoration:none; + border: 1px solid #0054A7; + background-color:#0054A7; + background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + width: auto; + padding: 2px 4px; + margin:10px 0 10px 0; + cursor: pointer; + -moz-outline-style: none; + outline: none; + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); +} +.admin_area input[type="submit"]:hover { + border-color: #333333; + text-decoration:none; + background-color:#333333; + background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; +} +.admin_area .cancel_button { + font-size: 14px; + font-weight: bold; + text-decoration:none; + color: #333333; + background-color:#dddddd; + background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); + background-repeat: repeat-x; + background-position: left 10px; + border: 1px solid #999999; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + width: auto; + padding: 2px 4px; + margin:10px 0 10px 10px; + cursor: pointer; +} +.admin_area .cancel_button:hover { + background-color: #999999; + background-position: left 10px; + text-decoration:none; + color:white; +} +.admin_area .content_header_options .action_button { + margin-top:0; + margin-left:10px; +} +.admin_area input.action_button, +.admin_area a.action_button { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + background-color:#cccccc; + background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); + background-repeat: repeat-x; + background-position: 0 0; + border:1px solid #999999; + color:#333333; + padding:2px 15px 2px 15px; + text-align:center; + font-weight:bold; + text-decoration:none; + text-shadow:0 1px 0 white; + cursor:pointer; + -webkit-box-shadow: none; + -moz-box-shadow: none; +} +.admin_area input.action_button:hover, +.admin_area a.action_button:hover, +.admin_area input.action_button:focus, +.admin_area a.action_button:focus { + background-position:0 -15px; + background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); + background-repeat: repeat-x; + color:#111111; + text-decoration: none; + background-color:#cccccc; + border:1px solid #999999; +} +.admin_area .action_button:active { + background-image:none; +} +.admin_area .action_button.disabled { + color:#999999; + padding:2px 7px 2px 7px; +} +.admin_area .action_button.disabled:hover { + background-position:0 -15px; + color:#111111; + border:1px solid #999999; +} +.admin_area .action_button.disabled:active { + background-image:none; +} +.admin_area .action_button.download { + padding: 5px 9px 5px 6px; +} +.admin_area .action_button.download:hover { + +} +.admin_area .action_button.download img { + margin-right:6px; + position:relative; + top:5px; +} +.admin_area .action_button.small { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + width: auto; + height:8px; + padding: 4px; + font-size: 0.9em; + line-height: 0.6em; +} +.admin_area .action_button.small:hover { + background-color: #0054A7; + background-image: none; + border-color: #0054A7; + color:white; + text-shadow:0 -1px 0 #999999; +} + + + +/* *************************************** + CONTENT HEADER +**************************************** */ +#content_header { + border-bottom:1px solid #CCCCCC; +} +#content_header:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.content_header_title { + float:left; +} +.content_header_title { + margin-right:10px; + max-width: 530px; +} +.content_header_title h2 { + border:none; + margin-bottom:0; + padding-bottom:5px; +} +.content_header_options { + float:right; +} +.content_header_options .action_button { + float:right; + margin:0 0 5px 10px; +} + + + +/* REPORTED CONTENT */ +.admin_settings.reported_content { + margin:5px 0 0 0; + padding:5px 7px 3px 9px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} +.admin_settings.reported_content p { + margin:0; +} +.active_report { + border:1px solid #D3322A; + background:#F7DAD8; +} +.archived_report { + border:1px solid #666666; + background:#dedede; +} +.admin_settings.reported_content .controls { + float:right; + margin:14px 5px 0 0; +} +.admin_settings.reported_content a.action_button { + display:inline; + float:right; + margin-left:15px; +} +.admin_settings.reported_content .details_link { + cursor: pointer; +} + + + +/* ECML */ +.ecml_admin_table { + width:100%; +} +.ecml_admin_table td, th { + border: 1px solid gray; + text-align: center; + padding: 5px; +} +.ecml_admin_table th, .ecml_keyword_desc { + font-weight: bold; +} +.ecml_row_odd { + background-color: #EEE; +} +.ecml_row_even { + +} +.ecml_restricted { + color: #555; +} + + + + + + + + +.admin_settings { + margin-bottom:20px; +} +.admin_settings table.styled { + width:100%; +} +.admin_settings table.styled { + border-top:1px solid #cccccc; +} +.admin_settings table.styled td { + padding:2px 4px 2px 4px; + border-bottom:1px solid #cccccc; +} +.admin_settings table.styled td.column_one { + width:200px; +} +.admin_settings table.styled tr:hover { + background: #E4E4E4; +} +.admin_settings.users_online .profile_status { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + line-height:1.2em; +} +.admin_settings.users_online .profile_status span { + font-size:90%; + color:#666666; +} +.admin_settings.users_online p.owner_timestamp { + padding-left:3px; +} +.admin_plugin_reorder { + float:right; + width:200px; + text-align: right; +} +.admin_plugin_reorder a { + padding-left:10px; + font-size:80%; + color:#999999; +} +.admin_area .manifest_file { + background-color:#eeeeee; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + padding:5px 10px 5px 10px; + margin:4px 0 4px 0; +} +.admin_area .admin_plugin_enable_disable { + width:150px; + margin:10px 0 0 0; + float:right; + text-align: right; +} +.admin_area .admin_plugin_enable_disable a { + margin:0; +} +.pluginsettings { + margin:15px 0 5px 0; + background-color:#eeeeee; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + padding:10px; +} +.pluginsettings h3 { + padding:0 0 5px 0; + margin:0 0 5px 0; + border-bottom:1px solid #999999; +} +#updateclient_settings h3 { + padding:0; + margin:0; + border:none; +} +.plugin_controls { + padding: 3px 3px 3px 0; + font-weight: bold; + float: left; + width: 150px; +} +form.admin_plugins_simpleview .submit_button { + margin-right:20px; +} +.plugin_info { + margin: 3px; + padding-left: 150px; + display: block; +} +.plugin_metadata { + display:block; + color:#999999; +} +.plugin_name input[type="checkbox"] { + margin-right: 10px; +} +ul.admin_plugins { + margin-bottom:0; + padding-left:0; + list-style: none; +} +.plugin_details { + margin:0 0 5px 0; + padding:0 7px 4px 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} +.plugin_details p { + margin:0; + padding:0; +} +.plugin_details h3 { + margin-top:-13px; + color:black; +} +.plugin_settings { + font-weight: normal; +} +.active { + border:1px solid #999999; + background:white; +} +.not_active { + border:1px solid #999999; + background:#dedede; +} +.configure_menuitems { + margin-bottom:30px; +} +.admin_settings.menuitems .input_pulldown { + margin-right:15px; + margin-bottom:10px; +} +.admin_settings.menuitems .custom_menuitems { + list-style: none; + padding:0; + margin:0; +} +.admin_settings.menuitems li.custom_menuitem { + margin-bottom:20px; +} +.admin_notices { + padding-bottom: 15px; +} +.admin_notices p { + background-color:#BDE5F8; + color: black; + border: 1px solid blue; + font-weight: bold; + padding:3px 10px; + -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); + -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; +} + +/* *************************************** + ELGG TABBED PAGE NAVIGATION +*************************************** */ +.elgg_horizontal_tabbed_nav { + margin-bottom:5px; + padding: 0; + border-bottom: 2px solid #cccccc; + display:table; + width:100%; +} +.elgg_horizontal_tabbed_nav ul { + list-style: none; + padding: 0; + margin: 0; +} +.elgg_horizontal_tabbed_nav li { + float: left; + border: 2px solid #cccccc; + border-bottom-width: 0; + background: #eeeeee; + margin: 0 0 0 10px; + -moz-border-radius-topleft:5px; + -moz-border-radius-topright:5px; + -webkit-border-top-left-radius:5px; + -webkit-border-top-right-radius:5px; +} +.elgg_horizontal_tabbed_nav a { + text-decoration: none; + display: block; + padding:3px 10px 0 10px; + text-align: center; + height:21px; + color:#999999; +} +.elgg_horizontal_tabbed_nav a:hover { + background: #dedede; + color:#4690D6; +} +.elgg_horizontal_tabbed_nav .selected { + border-color: #cccccc; + background: white; +} +.elgg_horizontal_tabbed_nav .selected a { + position: relative; + top: 2px; + background: white; +} diff --git a/views/default/css_ie.php b/views/default/css/ie.php index d22417ada..d22417ada 100644 --- a/views/default/css_ie.php +++ b/views/default/css/ie.php diff --git a/views/default/css_ie6.php b/views/default/css/ie6.php index 57890e62d..57890e62d 100644 --- a/views/default/css_ie6.php +++ b/views/default/css/ie6.php diff --git a/views/default/layouts/administration.php b/views/default/layouts/administration.php index 0e18eb7e8..cfc831a33 100644 --- a/views/default/layouts/administration.php +++ b/views/default/layouts/administration.php @@ -9,873 +9,6 @@ * @uses $vars['sidebar'] Optional sidebar content */ ?> -<style type="text/css"> -/** - * ELGG DEFAULT ADMIN AREA CSS -*/ - -/* *************************************** - RESET CSS -*************************************** */ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; -} -img { - border-width:0; - border-color:transparent; -} -:focus { - outline:0 none; - -moz-outline-style: none; -} -ol, ul { - /* list-style:none outside none; */ - margin: 0 0 10px 0; - padding-left: 20px; -} -em, i { - font-style:italic; -} -ins { - text-decoration:none; -} -del { - text-decoration:line-through; -} -strong { - font-weight:bold; -} -table { - border-collapse: collapse; - border-spacing: 0; -} -caption, th, td { - text-align: left; - font-weight: normal; - vertical-align: top; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ""; -} -blockquote, q { - quotes: "" ""; -} - - - - -/* *************************************** - BASICS -*************************************** */ -body { - text-align:left; - margin:0 auto; - padding:0; - background-color: #444444; - font-size: 80%; - line-height: 1.4em; - font-family: "Lucida Grande",Arial,Tahoma,Verdana,sans-serif; -} -a { - color:#0054A7; - text-decoration: none; - -moz-outline-style: none; - outline: none; -} -a:hover, -a.selected { - color: black; - text-decoration: underline; -} -p { - margin-bottom:15px; -} -p:last-child { - margin-bottom:0; -} -small { - font-size: 90%; -} -h1, h2, h3, h4, h5, h6 { - font-weight: bold; - line-height: auto; - color:#0054A7; -} -h1 { font-size: 1.8em; } -h2 { font-size: 1.5em; line-height: 1.1em; } -h3 { font-size: 1.2em; } -h4 { font-size: 1.0em; } -h5 { font-size: 0.9em; } -h6 { font-size: 0.8em; } -dt { - font-weight: bold; -} -dd { - margin: 0 0 1em 1em; -} -pre, code { - font-family:Monaco,"Courier New",Courier,monospace; - font-size:12px; - background:#EBF5FF; - overflow:auto; - - overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */ - white-space: pre-wrap; /* css-3 */ - white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ -} -code { - padding:2px 3px; -} -pre { - padding:3px 15px; - margin:0px 0 15px 0; - line-height:1.3em; -} -blockquote { - padding:3px 15px; - margin:0px 0 15px 0; - line-height:1.3em; - background:#EBF5FF; - border:none; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; -} - - -/* *************************************** - GENERIC SELECTORS -*************************************** */ -h2 { - border-bottom:1px solid #CCCCCC; - padding-bottom:5px; -} -.clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -.link { - cursor:pointer; -} -.small { - font-size: 90%; -} -.divider { - border-top:1px solid #cccccc; -} -.hidden { - display:none; -} -.radius8 { - -webkit-border-radius: 8px; - -moz-border-radius: 8px; -} -.margin_none { - margin:0; -} -.margin_top { - margin-top:10px; -} -.entity_title a { color:#0054A7; } -.elgg_horizontal_tabbed_nav a:hover { color:#0054A7; } -table.mceLayout { - width:100% !important; -} - - - - - - - -#admin_header { - background-color:#333333; - border-bottom:1px solid #555555; -} -#admin_footer { - background:#333333; - border-top:1px solid #222222; - clear:both; - height:30px; - width:100%; -} -#admin_header .network_title h2 { - height:45px; - line-height:45px; - margin:0; - padding:0 0 0 20px; - border:0; -} -#admin_header .network_title h2 a { - color:white; -} -#admin_header .network_title h2 a:hover { - color:white; - text-decoration: underline; -} -#admin_header .network_title h2 a.return_to_network { - font-size:12px; - font-weight: normal; - color:#666666; - float:right; - margin-right:40px; -} -#elgg_content.admin_area { - margin:20px; - min-height:400px; - position:relative; - width:auto; - background-image: none; - background-color: transparent; - -webkit-box-shadow: none; - -moz-box-shadow: none; -} -#elgg_content.admin_area #elgg_page_contents { - float:left; - margin:0; - padding:14px; - width:75%; - background-color: white; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; -} -#elgg_content.admin_area #elgg_sidebar { - float:left; - margin:0; - min-height:400px; - padding:0 0 0 3%; - position:relative; - width:17%; -} - -.admin_area h1, -.admin_area h2, -.admin_area h3, -.admin_area h4, -.admin_area h5, -.admin_area h6 { - color:#666666; -} -.admin_area #elgg_sidebar .submenu { - margin:0; - padding:0; - list-style: none; - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; -} -.admin_area .submenu li.selected a, -.admin_area .submenu li.selected li.selected a, -.admin_area .submenu li.selected li.selected li.selected a { - background-color: black; - color:white; -} -.admin_area .submenu li a { - display:block; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - background-color:white; - margin:0 0 3px 0; - padding:2px 4px 2px 8px; - color:#333333; -} -.admin_area .submenu li a:hover { - background-color:black; - color:white; - text-decoration:none; -} -.admin_area #elgg_sidebar .submenu ul.child { - margin-bottom:10px; -} -.admin_area .submenu .child li a { - margin-left:15px; - background-color:#dedede; - color:#333333; -} -.admin_area .submenu .child li a:hover { - background-color:black; - color:white; -} - -.admin_settings h3 { - background:#999999; - color:white; - padding:5px; - margin-top:10px; - margin-bottom:10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; -} -.admin_settings label { - color:#333333; - font-size:100%; - font-weight:normal; -} -.admin_area .input_textarea { - width:98%; -} -.admin_area form#plugin_settings { - margin-top: 10px; -} -.admin_area form#plugin_settings .action_button.disabled { - margin-top:10px; - float:right; -} - - -/* *************************************** - GENERAL FORM ELEMENTS -*************************************** */ -/* default elgg core input field classes */ -.admin_area .input_text, -.admin_area .input_tags, -.admin_area .input_url, -.admin_area .input_textarea { - width:98%; -} -.admin_area .input_access { - margin:5px 0 0 0; -} -.admin_area .input_password { - width:200px; -} -.admin_area .input_textarea { - height: 200px; - width:718px; -} -.admin_area input[type="checkbox"], -.admin_area input.input_radio { - margin:0 3px 0 0; - padding:0; - border:none; -} -.admin_area label { - font-weight: bold; - color:#333333; - font-size: 110%; -} -.admin_area input { - font: 120% Arial, Helvetica, sans-serif; - padding: 5px; - border: 1px solid #cccccc; - color:#666666; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; -} -.admin_area textarea { - font: 120% Arial, Helvetica, sans-serif; - border: solid 1px #cccccc; - padding: 5px; - color:#666666; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; -} -.admin_area textarea:focus, -.admin_area input[type="text"]:focus { - border: solid 1px #666666; - background: #f5f5f5; - color:#333333; -} -.admin_area .input_textarea.monospace { - font-family:Monaco,"Courier New",Courier,monospace; - font-size:13px; -} -.admin_area a.longtext_control { - float:right; - margin-left:14px; -} -.admin_area .submit_button { - font-size: 14px; - font-weight: bold; - color: white; - text-shadow:1px 1px 0px black; - text-decoration:none; - border: 1px solid #0054A7; - background-color:#0054A7; - background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - width: auto; - padding: 2px 4px; - margin:0 10px 10px 0; - cursor: pointer; - -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); - -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); -} -.admin_area .submit_button:hover { - color: white; - border-color: #333333; - text-decoration:none; - background-color:#333333; - background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; -} -.admin_area input[type="password"]:focus { - border: solid 1px #666666; - background-color: #f5f5f5; - color:#333333; -} -.admin_area input[type="submit"] { - font-size: 14px; - font-weight: bold; - color: white; - text-shadow:1px 1px 0px black; - text-decoration:none; - border: 1px solid #0054A7; - background-color:#0054A7; - background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - width: auto; - padding: 2px 4px; - margin:10px 0 10px 0; - cursor: pointer; - -moz-outline-style: none; - outline: none; - -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); - -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40); -} -.admin_area input[type="submit"]:hover { - border-color: #333333; - text-decoration:none; - background-color:#333333; - background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; -} -.admin_area .cancel_button { - font-size: 14px; - font-weight: bold; - text-decoration:none; - color: #333333; - background-color:#dddddd; - background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; - border: 1px solid #999999; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - width: auto; - padding: 2px 4px; - margin:10px 0 10px 10px; - cursor: pointer; -} -.admin_area .cancel_button:hover { - background-color: #999999; - background-position: left 10px; - text-decoration:none; - color:white; -} -.admin_area .content_header_options .action_button { - margin-top:0; - margin-left:10px; -} -.admin_area input.action_button, -.admin_area a.action_button { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - background-color:#cccccc; - background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); - background-repeat: repeat-x; - background-position: 0 0; - border:1px solid #999999; - color:#333333; - padding:2px 15px 2px 15px; - text-align:center; - font-weight:bold; - text-decoration:none; - text-shadow:0 1px 0 white; - cursor:pointer; - -webkit-box-shadow: none; - -moz-box-shadow: none; -} -.admin_area input.action_button:hover, -.admin_area a.action_button:hover, -.admin_area input.action_button:focus, -.admin_area a.action_button:focus { - background-position:0 -15px; - background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif); - background-repeat: repeat-x; - color:#111111; - text-decoration: none; - background-color:#cccccc; - border:1px solid #999999; -} -.admin_area .action_button:active { - background-image:none; -} -.admin_area .action_button.disabled { - color:#999999; - padding:2px 7px 2px 7px; -} -.admin_area .action_button.disabled:hover { - background-position:0 -15px; - color:#111111; - border:1px solid #999999; -} -.admin_area .action_button.disabled:active { - background-image:none; -} -.admin_area .action_button.download { - padding: 5px 9px 5px 6px; -} -.admin_area .action_button.download:hover { - -} -.admin_area .action_button.download img { - margin-right:6px; - position:relative; - top:5px; -} -.admin_area .action_button.small { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - width: auto; - height:8px; - padding: 4px; - font-size: 0.9em; - line-height: 0.6em; -} -.admin_area .action_button.small:hover { - background-color: #0054A7; - background-image: none; - border-color: #0054A7; - color:white; - text-shadow:0 -1px 0 #999999; -} - - - -/* *************************************** - CONTENT HEADER -**************************************** */ -#content_header { - border-bottom:1px solid #CCCCCC; -} -#content_header:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -.content_header_title { - float:left; -} -.content_header_title { - margin-right:10px; - max-width: 530px; -} -.content_header_title h2 { - border:none; - margin-bottom:0; - padding-bottom:5px; -} -.content_header_options { - float:right; -} -.content_header_options .action_button { - float:right; - margin:0 0 5px 10px; -} - - - -/* REPORTED CONTENT */ -.admin_settings.reported_content { - margin:5px 0 0 0; - padding:5px 7px 3px 9px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; -} -.admin_settings.reported_content p { - margin:0; -} -.active_report { - border:1px solid #D3322A; - background:#F7DAD8; -} -.archived_report { - border:1px solid #666666; - background:#dedede; -} -.admin_settings.reported_content .controls { - float:right; - margin:14px 5px 0 0; -} -.admin_settings.reported_content a.action_button { - display:inline; - float:right; - margin-left:15px; -} -.admin_settings.reported_content .details_link { - cursor: pointer; -} - - - -/* ECML */ -.ecml_admin_table { - width:100%; -} -.ecml_admin_table td, th { - border: 1px solid gray; - text-align: center; - padding: 5px; -} -.ecml_admin_table th, .ecml_keyword_desc { - font-weight: bold; -} -.ecml_row_odd { - background-color: #EEE; -} -.ecml_row_even { - -} -.ecml_restricted { - color: #555; -} - - - - - - - - -.admin_settings { - margin-bottom:20px; -} -.admin_settings table.styled { - width:100%; -} -.admin_settings table.styled { - border-top:1px solid #cccccc; -} -.admin_settings table.styled td { - padding:2px 4px 2px 4px; - border-bottom:1px solid #cccccc; -} -.admin_settings table.styled td.column_one { - width:200px; -} -.admin_settings table.styled tr:hover { - background: #E4E4E4; -} -.admin_settings.users_online .profile_status { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - line-height:1.2em; -} -.admin_settings.users_online .profile_status span { - font-size:90%; - color:#666666; -} -.admin_settings.users_online p.owner_timestamp { - padding-left:3px; -} -.admin_plugin_reorder { - float:right; - width:200px; - text-align: right; -} -.admin_plugin_reorder a { - padding-left:10px; - font-size:80%; - color:#999999; -} -.admin_area .manifest_file { - background-color:#eeeeee; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - padding:5px 10px 5px 10px; - margin:4px 0 4px 0; -} -.admin_area .admin_plugin_enable_disable { - width:150px; - margin:10px 0 0 0; - float:right; - text-align: right; -} -.admin_area .admin_plugin_enable_disable a { - margin:0; -} -.pluginsettings { - margin:15px 0 5px 0; - background-color:#eeeeee; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - padding:10px; -} -.pluginsettings h3 { - padding:0 0 5px 0; - margin:0 0 5px 0; - border-bottom:1px solid #999999; -} -#updateclient_settings h3 { - padding:0; - margin:0; - border:none; -} -.plugin_controls { - padding: 3px 3px 3px 0; - font-weight: bold; - float: left; - width: 150px; -} -form.admin_plugins_simpleview .submit_button { - margin-right:20px; -} -.plugin_info { - margin: 3px; - padding-left: 150px; - display: block; -} -.plugin_metadata { - display:block; - color:#999999; -} -.plugin_name input[type="checkbox"] { - margin-right: 10px; -} -ul.admin_plugins { - margin-bottom:0; - padding-left:0; - list-style: none; -} -.plugin_details { - margin:0 0 5px 0; - padding:0 7px 4px 10px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; -} -.plugin_details p { - margin:0; - padding:0; -} -.plugin_details h3 { - margin-top:-13px; - color:black; -} -.plugin_settings { - font-weight: normal; -} -.active { - border:1px solid #999999; - background:white; -} -.not_active { - border:1px solid #999999; - background:#dedede; -} -.configure_menuitems { - margin-bottom:30px; -} -.admin_settings.menuitems .input_pulldown { - margin-right:15px; - margin-bottom:10px; -} -.admin_settings.menuitems .custom_menuitems { - list-style: none; - padding:0; - margin:0; -} -.admin_settings.menuitems li.custom_menuitem { - margin-bottom:20px; -} -.admin_notices { - padding-bottom: 15px; -} -.admin_notices p { - background-color:#BDE5F8; - color: black; - border: 1px solid blue; - font-weight: bold; - padding:3px 10px; - -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); - -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; -} - -/* *************************************** - ELGG TABBED PAGE NAVIGATION -*************************************** */ -.elgg_horizontal_tabbed_nav { - margin-bottom:5px; - padding: 0; - border-bottom: 2px solid #cccccc; - display:table; - width:100%; -} -.elgg_horizontal_tabbed_nav ul { - list-style: none; - padding: 0; - margin: 0; -} -.elgg_horizontal_tabbed_nav li { - float: left; - border: 2px solid #cccccc; - border-bottom-width: 0; - background: #eeeeee; - margin: 0 0 0 10px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - -webkit-border-top-left-radius:5px; - -webkit-border-top-right-radius:5px; -} -.elgg_horizontal_tabbed_nav a { - text-decoration: none; - display: block; - padding:3px 10px 0 10px; - text-align: center; - height:21px; - color:#999999; -} -.elgg_horizontal_tabbed_nav a:hover { - background: #dedede; - color:#4690D6; -} -.elgg_horizontal_tabbed_nav .selected { - border-color: #cccccc; - background: white; -} -.elgg_horizontal_tabbed_nav .selected a { - position: relative; - top: 2px; - background: white; -} - -</style> <div id="admin_header"> <span class="network_title"><h2> diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php index 68607f1ec..a673d8ff6 100644 --- a/views/default/page_elements/html_begin.php +++ b/views/default/page_elements/html_begin.php @@ -67,11 +67,11 @@ foreach ($css as $link) { } ?> <!--[if IE 6]> - <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie6.php" /> + <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>pg/css/ie6.css" /> <![endif]--> <!--[if gt IE 6]> - <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie.php" /> + <link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>pg/css/ie.css" /> <![endif]--> <?php diff --git a/views/default/page_elements/html_begin_admin.php b/views/default/page_elements/html_begin_admin.php deleted file mode 100644 index fcb61c25c..000000000 --- a/views/default/page_elements/html_begin_admin.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php -/** -* Start html output. -* The standard HTML header for admin pages -*/ - -// we won't trust server configuration but specify utf-8 -header('Content-type: text/html; charset=utf-8'); - -$version = get_version(); -$release = get_version(true); -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <meta name="ElggRelease" content="<?php echo $release; ?>" /> - <meta name="ElggVersion" content="<?php echo $version; ?>" /> - <title><?php echo $vars['config']->sitename; echo " ".elgg_echo('admin'); ?></title> - <link rel="shortcut icon" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" /> - - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.4.2.min.js"></script> - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script> - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.form.js"></script> - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script> - - <?php - echo elgg_view('scripts/initialize_elgg'); - echo $feedref; - - if (elgg_view_exists('metatags')) { - echo elgg_view('metatags', $vars); - } -?> - <!-- include the admin css file - <link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>views/default/css_admin.php" type="text/css" />--> -</head> - -<body> diff --git a/views/default/page_shells/admin.php b/views/default/page_shells/admin.php index 6925608e9..cc65b6fda 100644 --- a/views/default/page_shells/admin.php +++ b/views/default/page_shells/admin.php @@ -23,7 +23,7 @@ if (empty($vars['title'])) { $title = $vars['config']->sitename . ": " . $vars['title'];
}
-echo elgg_view('page_elements/html_begin_admin', $vars);
+echo elgg_view('page_elements/html_begin', $vars);
echo elgg_view('messages/list', array('object' => $vars['sysmessages']));
echo elgg_view('page_elements/content', $vars);
echo elgg_view('page_elements/html_end', $vars);
\ No newline at end of file |