From 61cf49aff2620be935758eb13bb96c16c102eaeb Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Sat, 1 May 2010 07:10:22 +0000 Subject: [PATCH] theme-anomarly MDL-20175 Upgraded after recent theme changes --- theme/anomaly/config.php | 2 +- theme/anomaly/layout/general.php | 86 +++++++++++++++--------------- theme/anomaly/style/navigation.css | 65 ---------------------- 3 files changed, 44 insertions(+), 109 deletions(-) delete mode 100644 theme/anomaly/style/navigation.css diff --git a/theme/anomaly/config.php b/theme/anomaly/config.php index 497b7cfb238..33f22506f01 100644 --- a/theme/anomaly/config.php +++ b/theme/anomaly/config.php @@ -7,7 +7,7 @@ $THEME->name = 'anomaly'; -$THEME->sheets = array('base', 'general', 'layout', 'browser','navigation'); +$THEME->sheets = array('base', 'general', 'layout', 'browser'); /// This variable is an array containing the names of all the /// stylesheet files you want included in this theme, and in what order //////////////////////////////////////////////////////////////////////////////// diff --git a/theme/anomaly/layout/general.php b/theme/anomaly/layout/general.php index 8d6ad58b024..eb893fbe7c3 100644 --- a/theme/anomaly/layout/general.php +++ b/theme/anomaly/layout/general.php @@ -1,24 +1,19 @@ sidepre = theme_enable_block_region('side-pre'); -$properties->sidepost = theme_enable_block_region('side-post'); -$properties->hasnavbar = false; + +$hasheading = ($PAGE->heading); +$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); +$hasfooter = (empty($PAGE->layout_options['nofooter'])); +$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); +$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT)); $bodyclasses = array(); - -if ($properties->sidepre && !$properties->sidepost) { +if ($hassidepre && !$hassidepost) { $bodyclasses[] = 'side-pre-only'; -} else if ($properties->sidepost && !$properties->sidepre) { +} else if ($hassidepost && !$hassidepre) { $bodyclasses[] = 'side-post-only'; -} - -if (!$properties->sidepost && !$properties->sidepre) { +} else if (!$hassidepost && !$hassidepre) { $bodyclasses[] = 'content-only'; } -if (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()) { - $bodyclasses[] = 'hasnavbar'; - $properties->hasnavbar = true; -} echo $OUTPUT->doctype() ?> htmlattributes() ?>> @@ -27,12 +22,13 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - -standard_top_of_body_html(); ?> + +standard_top_of_body_html() ?> +
+
-
-
+

heading ?>

login_info(); @@ -40,49 +36,53 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->lang_menu(); } echo $PAGE->headingmenu - ?>
- hasnavbar) { // This is the navigation bar with breadcrumbs ?> -
-
navbar(); ?>
-
button; ?>
-
+ ?>
+ +
+
navbar(); ?>
+
button; ?>
+
+ + +
-
-
-
-
+
+
+ +
+
- -
+ +
-
sidepre) { - echo $OUTPUT->blocks_for_region('side-pre'); - } ?> +
+ blocks_for_region('side-pre') ?>
+ + +
-
sidepost) { - echo $OUTPUT->blocks_for_region('side-post'); - } ?> +
+ blocks_for_region('side-post') ?>
+
- layout_options['nofooter'])) { ?> -
-

- -

+ + + +
+

login_info(); echo $OUTPUT->home_link(); diff --git a/theme/anomaly/style/navigation.css b/theme/anomaly/style/navigation.css deleted file mode 100644 index 086126bcdb6..00000000000 --- a/theme/anomaly/style/navigation.css +++ /dev/null @@ -1,65 +0,0 @@ -/** Core overrides **/ -body.has_dock {margin-left:60px;margin-right:60px;} - -/** Navigation and settings block **/ -.block_tree {list-style: none;padding-left:0px;margin:0px;text-align: left;overflow-x:auto;overflow-y:visible;} -.block_tree ul {margin-left: 0px;padding-left:16px;} -.block_tree li {list-style: none;} -.block_tree .tree_item { white-space:nowrap; padding-left: 16px; margin:3px 0px;} -.block_tree .tree_item.note { white-space:normal; font-size:90%;} -.block_tree .tree_item.branch, .block_tree .tree_item.emptybranch {background-image: url([[pix:t/expanded]]);background-position: center left;background-repeat: no-repeat;} -.block_tree .root_node.leaf {padding-left:0px;} -.jsenabled .dock_on_load, .jsenabled .block_tree .collapsed ul {display: none;} -.jsenabled .block_tree .tree_item.branch {cursor:pointer;} -.jsenabled .block_tree .collapsed .tree_item.branch {background-image: url([[pix:t/collapsed]]);} -.jsenabled .block_tree .tree_item.emptybranch {background-image: url([[pix:t/collapsed_empty]]);background-position: center left;background-repeat: no-repeat;} -.block_tree_box .requiresjs {display:none;} -.jsenabled .block_tree_box .requiresjs {display:inline;} - -/* This CSS is for the dock */ -.dock {width:30px;position:fixed;top:0px;left:0px;height:100%;border-color:#222;border-width:0px 5px 1px 0px;border-style: solid;background-color:#333;background-image:url([[pix:theme|navigation_gradient]]);background-position:60px 0px;} -.dock .dockeditem {background-color:#DDD;} -.dock .dockeditem .firstdockitem {margin-top:1em;} -.dock .dockeditem .dockedtitle {border-bottom:1px solid #000;border-top:1px solid #666;cursor:pointer;background-image:url([[pix:theme|navigation_gradient]]);background-position:30px 0px;} -.dock .dockeditem .dockedtitle.activeitem {background-color:#E3E3E3;background-position:0px 0px;} -.dock .dockeditem .dockedtitle h2 {font-size:0.8em;line-height:100%;text-transform:uppercase;text-align:center;margin:12px 0px;} -.dock .block_tree .current_branch {background-color:#D5E1F4;} -.dock .controls {position:absolute;bottom:1em;text-align:center;width:100%;} -.dock .controls img {cursor:pointer;} -.dock .bd.oversized_content {overflow-y:auto;overflow-x:visible;height:inherit;} -.dock .bd.oversized_content .content {margin:6px 6px 6px 0px;padding-bottom:6px;} -/** YUI overrides **/ -.yui-skin-sam .dock .yui-panel {border-width:1px 5px 1px 0;border-color:#222;} -.yui-skin-sam .dock .yui-panel .bd {border-width:0;background-color:#E3E3E3;} -/** Override the above if the dock is on the right **/ -.dock.dock_right_vertical {left:auto;right:0px;border-width:0px 0px 1px 5px;} -.dock.dock_right_vertical .commands {text-align:right;} -.yui-skin-sam .dock.dock_right_vertical .yui-panel {border-width:1px 0 1px 5px;} - -/* Sideblock expansion code */ -.block_js_expansion .block_tree {overflow-x:scroll;} -.block_js_expansion.mouseover .content {width:200%;z-index:1000;position:relative;} -.block_js_expansion.mouseover .content .block_tree {width:100%; background-color:#fcfcfc; padding-bottom:0px;} - -/* CSS for shadows */ -.divshadow div {position:absolute;width:3px;height:3px;background-color:#333;} -.divshadow .shadow_top {top:-3px;right:0px;width:100%;} -.divshadow .shadow_bottom {bottom:-3px;right:0px;width:100%;} -.divshadow .shadow_left {top:0px;left:-3px;height:100%;} -.divshadow .shadow_right {bottom:0px;right:-3px;height:100%;} -.divshadow .shadow_top_right {top:-3px;right:-3px;} -.divshadow .shadow_bottom_right {bottom:-3px;right:-3px;} -.divshadow .shadow_top_left {top:-3px;left:-3px;} -.divshadow .shadow_bottom_left {bottom:-3px;left:-3px;} - -/** IE stylings */ -.ie6 .sideblock .block_tree {width:160px;overflow-x:scroll;} -.ie7 .sideblock .block_tree {overflow-x:scroll;} -.ie6 .block_tree .tree_item {width:100%;} -.ie6 .dock {position:absolute;} -.ie6 .dock hr {display:none;margin:0px;height:0px;padding:0px;} -.ie6 .dock li p {background-color:inherit;} -.ie6 .dock .bd.oversized_content .content, .ie7 .dock .bd.oversized_content .content {padding-bottom:0px;} -.ie6 .block_js_expansion.mouseover .content, .ie7 .block_js_expansion.mouseover .content{ padding-bottom:2px;} -.ie6 .dock .bd.oversized_content {width:100%;} -.ie7 .dock .bd.oversized_content {width:400px;} \ No newline at end of file