MDL-22840 - Adding fixes to custom menu CSS and adding a screenshot

theme/fusion/lang/en/theme_fusion.php

@@ -26,7 +26,37 @@
 $string['pluginname'] = 'Fusion';
 $string['region-side-post'] = 'Right';
 $string['region-side-pre'] = 'Left';
-$string['choosereadme'] = '<div class="clearfix"><div class="theme_screenshot"><h2>Fusion</h2><img src="fusion/pix/screenshot.png" /><h3>Theme Discussion Forum:</h3><p><a href="http://moodle.org/mod/forum/view.php?id=46">http://moodle.org/mod/forum/view.php?id=46</a></p><h3>Theme Credits</h3><p><a href="http://docs.moodle.org/en/Theme_credits">http://docs.moodle.org/en/Theme_credits</a></p><h3>Theme Documentation:</h3><p><a href="http://docs.moodle.org/en/Themes">http://docs.moodle.org/en/Themes</a></p><h3>Report a bug:</h3><p><a href="http://tracker.moodle.org">http://tracker.moodle.org</a></p></div><div class="theme_description"><h2>About</h2><p>Fusion is a simple two-column, fluid-width theme for Moodle 2.0. <h2>Tweaks</h2><p>This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you want to modify this theme, we recommend that you first duplicate it, then rename it before making your changes. This will prevent your customized theme from being overwritten by future Moodle upgrades, and you\'ll still have the original files if you make a mess. More information on modifying themes can be found in the <a href="http://docs.moodle.org/en/Theme">MoodleDocs</a>.</p><h3>License</h3><p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.</div></div>';
+$string['choosereadme'] = '
+<div class="clearfix">
+	<div class="theme_screenshot">
+		
+		<h2>Fusion</h2>
+		<img src="fusion/pix/screenshot.jpg" />
+		
+		<h3>Theme Discussion Forum:</h3>
+		<p><a href="http://moodle.org/mod/forum/view.php?id=46">http://moodle.org/mod/forum/view.php?id=46</a></p>
+		
+		<h3>Theme Credits</h3>
+		<p><a href="http://docs.moodle.org/en/Theme_credits">http://docs.moodle.org/en/Theme_credits</a></p>
+		
+		<h3>Theme Documentation:</h3>
+		<p><a href="http://docs.moodle.org/en/Themes">http://docs.moodle.org/en/Themes</a></p><h3>Report a bug:</h3><p><a href="http://tracker.moodle.org">http://tracker.moodle.org</a></p>
+	</div>
+
+	<div class="theme_description">
+		
+		<h2>About</h2>
+		<p>Fusion is a two-column, fluid-width theme coded for Moodle 2.0. It makes use of custom menus that appear above the site title on every page. It also includes a basic settings page allowing you to change link color, add a tagline above the site name on the front page, and add text to the footer.</p>
+		
+		<h2>Parents</h2>
+		<p>This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you wish to modify aspects of this theme beyond the settings offered, we advise creating a new  theme using this theme, Base and Canvas all as parents so updates to any of those themes in the core will find their way into your new theme.</p>
+		
+		<h2>Credits</h2>
+		<p>This design was originally created by Digital Nature ([email protected]) before being ported to Moodle by Patrick Malley ([email protected]).
+		<h2>License</h2>
+		<p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.
+	</div>
+</div>';
 
 $string['linkcolor'] = 'Link Color';
 $string['linkcolordesc'] = 'This sets the link color for the theme.';

theme/fusion/layout/frontpage.php

@@ -25,14 +25,6 @@
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
-	<style>
-		.yui3-skin-sam .yui3-menu-content, 
-		.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content,
-		.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label,
-		.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content {
-			border: none !important;
-		}
-	</style>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 

theme/fusion/layout/general.php

@@ -25,14 +25,6 @@
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-	<style>
-		.yui3-skin-sam .yui3-menu-content, 
-		.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content,
-		.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label,
-		.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content {
-			border: none !important;
-		}
-	</style>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 

theme/fusion/style/core.css

@@ -167,9 +167,8 @@ h6{
 
 .headermenu {
 	color: #fff;
-	margin-right: 25px;
 	float: none;
-	margin-bottom: 0;
+	margin:5px 25px 0 0;
 }
 
 .headermenu a {

theme/fusion/style/menus.css

@@ -182,29 +182,6 @@
 
 }
 
-/**
- * Custom menu
-
-.pagelayout-frontpage #custommenu {padding:0 2px;}
-#custommenu {padding:0 10px;}
-#custommenu .yui3-menu {background-image:url([[pix:theme|hgradient]]);background-repeat: repeat-x;background-color:#e1e1df;}
-#custommenu .yui3-menu .yui3-menu {background-image:none;background-color:#FFF;}
-#custommenu .yui3-menu .yui3-menu-label,
-#custommenu .yui3-menu .yui3-menuitem-content,
-#custommenu .yui3-menu .yui3-menu-content,
-#custommenu .yui3-menu .yui3-menu .yui3-menu-content,
 #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content,
-#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content ul {border-color:#CCC;}
-#custommenu .yui3-menu .yui3-menuitem-content,
-#custommenu .yui3-menu .yui3-menu .yui3-menuitem-content {cursor:pointer;}
-#custommenu .yui3-menu .yui3-menu-label-menuvisible,
-#custommenu .yui3-menu .yui3-menuitem-active {background-color:#e1e1df;}
-#custommenu .yui3-menu-horizontal.javascript-disabled a {color:inherit;}
-#custommenu .yui3-menu-horizontal.javascript-disabled a:hover {color:blue;text-decoration:none;}
-
-.smartselect .smartselect_menuitem:hover,
-.smartselect .smartselect_submenuitem:hover {background-color:#C2EAFF;}
-.smartselect .smartselect_submenu {border-color:#999;}
-.smartselect .smartselect_menu,
-.smartselect .smartselect_submenu {-moz-border-radius:4px;-webkit-border-radius: 5px;}
-*/
+#custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content .ul {border:none !important;}
+#custommenu .yui3-menu-horizontal.javascript-disabled li a {padding:0 20px 0 0;}