New version of Splash theme

carolinekennedy · Jan 24, 2012 · 134936b · 134936b
1 parent f6b4ec2
commit 134936b
Show file tree

Hide file tree

Showing 80 changed files with 1,170 additions and 575 deletions.
diff --git a/theme/splash/config.php b/theme/splash/config.php
@@ -41,11 +41,14 @@
 
 
 $THEME->sheets = array(
-    'sl',
-    'green',
-    'blue',
-    'orange',
-    'ie',
+   'core' ,    /** Must come first**/
+   'sl' ,
+   'menus' ,
+   'green' ,
+   'blue' ,
+   'orange' ,
+   'ie' ,
+
 );
 
 ////////////////////////////////////////////////////

diff --git a/theme/splash/lang/en/theme_splash.php b/theme/splash/lang/en/theme_splash.php
diff --git a/theme/splash/layout/embedded.php b/theme/splash/layout/embedded.php
@@ -0,0 +1,23 @@
+<?php echo $OUTPUT->doctype() ?>
+<html <?php echo $OUTPUT->htmlattributes() ?>>
+<head>
+    <title><?php echo $PAGE->title ?></title>
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
+    <?php echo $OUTPUT->standard_head_html() ?>
+</head>
+<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<?php echo $OUTPUT->standard_top_of_body_html() ?>
+
+<div id="page">
+
+<!-- END OF HEADER -->
+
+    <div id="content" class="clearfix">
+        <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+    </div>
+
+<!-- START OF FOOTER -->
+</div>
+<?php echo $OUTPUT->standard_end_of_body_html() ?>
+</body>
+</html>
diff --git a/theme/splash/layout/general.php b/theme/splash/layout/general.php
@@ -94,17 +94,20 @@
             <?php } // End of if ($hasheading)?>
                 <!-- DROP DOWN MENU -->
                 <div class="clearer"></div>
-                <div id="dropdownmenu">
+
                     <?php if ($hascustommenu) { ?>
+                    <div id="moodlemenu">
                     <div id="custommenu"><?php echo $custommenu; ?></div>
                     <?php } ?>
+                       </div>
                     <div class="navbar">
                         <div class="wrapper clearfix">
                             <div class="breadcrumb"><?php if ($hasnavbar) echo $OUTPUT->navbar(); ?></div>
                             <div class="navbutton"> <?php echo $PAGE->button; ?></div>
                         </div>
                     </div>
-                </div>
+
+
                 <!-- END DROP DOWN MENU -->
             </div>
         </div>

diff --git a/theme/splash/layout/report.php b/theme/splash/layout/report.php
diff --git a/theme/splash/lib.php b/theme/splash/lib.php
@@ -16,15 +16,15 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Library functions for the Splash theme
+ * Library functions for the splash theme
  *
  * @package   theme_splash
- * @copyright 2010 Caroline Kennedy of Synergy Learning
+ * @copyright 2011 Synergy Learning
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
- * Splash theme post process function for CSS
+ * splash theme post process function for CSS
  * @param string $css Incoming CSS to process
  * @param stdClass $theme The theme object
  * @return string The processed CSS
@@ -88,6 +88,7 @@ function splash_set_customcss($css, $customcss) {
     return $css;
 }
 
+
 /**
  * Adds the JavaScript for the colour switcher to the page.
  *

diff --git a/theme/splash/pagebg.jpg b/theme/splash/pagebg.jpg
diff --git a/theme/splash/pix/arrow-menu.gif b/theme/splash/pix/arrow-menu.gif
diff --git a/theme/splash/pix/bg.jpg b/theme/splash/pix/bg.jpg
diff --git a/theme/splash/pix/bgblue.jpg b/theme/splash/pix/bgblue.jpg
diff --git a/theme/splash/pix/bggreen.jpg b/theme/splash/pix/bggreen.jpg
diff --git a/theme/splash/pix/bgorange.jpg b/theme/splash/pix/bgorange.jpg
diff --git a/theme/splash/pix/blue-theme.jpg b/theme/splash/pix/blue-theme.jpg
diff --git a/theme/splash/pix/blue-theme2.gif b/theme/splash/pix/blue-theme2.gif
diff --git a/theme/splash/pix/blue-theme2.jpg b/theme/splash/pix/blue-theme2.jpg
diff --git a/theme/splash/pix/blue.jpg b/theme/splash/pix/blue.jpg
diff --git a/theme/splash/pix/bottomborder copy.jpg b/theme/splash/pix/bottomborder copy.jpg
diff --git a/theme/splash/pix/bottomborder.jpg b/theme/splash/pix/bottomborder.jpg
diff --git a/theme/splash/pix/colour.jpg b/theme/splash/pix/colour.jpg
diff --git a/theme/splash/pix/contentbg.jpg b/theme/splash/pix/contentbg.jpg
diff --git a/theme/splash/pix/contentbgright.jpg b/theme/splash/pix/contentbgright.jpg
diff --git a/theme/splash/pix/csmenubg.jpg b/theme/splash/pix/csmenubg.jpg
diff --git a/theme/splash/pix/dropdownbg.jpg b/theme/splash/pix/dropdownbg.jpg
diff --git a/theme/splash/pix/footerbg.jpg b/theme/splash/pix/footerbg.jpg
diff --git a/theme/splash/pix/green-theme.jpg b/theme/splash/pix/green-theme.jpg
diff --git a/theme/splash/pix/green-theme2.gif b/theme/splash/pix/green-theme2.gif
diff --git a/theme/splash/pix/green-theme2.jpg b/theme/splash/pix/green-theme2.jpg
diff --git a/theme/splash/pix/green.jpg b/theme/splash/pix/green.jpg
diff --git a/theme/splash/pix/header.jpg b/theme/splash/pix/header.jpg
diff --git a/theme/splash/pix/lbgv2.jpg b/theme/splash/pix/lbgv2.jpg
diff --git a/theme/splash/pix/lbgv2blue.jpg b/theme/splash/pix/lbgv2blue.jpg
diff --git a/theme/splash/pix/lbgv2green.jpg b/theme/splash/pix/lbgv2green.jpg
diff --git a/theme/splash/pix/lbgv2orange.jpg b/theme/splash/pix/lbgv2orange.jpg
diff --git a/theme/splash/pix/loginpanel.jpg b/theme/splash/pix/loginpanel.jpg
diff --git a/theme/splash/pix/logo.png b/theme/splash/pix/logo.png
diff --git a/theme/splash/pix/logobgleft.jpg b/theme/splash/pix/logobgleft.jpg
diff --git a/theme/splash/pix/logobgleftblue.jpg b/theme/splash/pix/logobgleftblue.jpg
diff --git a/theme/splash/pix/logobgleftgreen.jpg b/theme/splash/pix/logobgleftgreen.jpg
diff --git a/theme/splash/pix/logobgleftorange.jpg b/theme/splash/pix/logobgleftorange.jpg
diff --git a/theme/splash/pix/logobgright.jpg b/theme/splash/pix/logobgright.jpg
diff --git a/theme/splash/pix/logobgrightblue.jpg b/theme/splash/pix/logobgrightblue.jpg
diff --git a/theme/splash/pix/logobgrightgreen.jpg b/theme/splash/pix/logobgrightgreen.jpg
diff --git a/theme/splash/pix/logobgrightorange.jpg b/theme/splash/pix/logobgrightorange.jpg
diff --git a/theme/splash/pix/orange-theme.jpg b/theme/splash/pix/orange-theme.jpg
diff --git a/theme/splash/pix/orange-theme2.gif b/theme/splash/pix/orange-theme2.gif
diff --git a/theme/splash/pix/orange-theme2.jpg b/theme/splash/pix/orange-theme2.jpg
diff --git a/theme/splash/pix/orange.jpg b/theme/splash/pix/orange.jpg
diff --git a/theme/splash/pix/pageheaderbgblue.jpg b/theme/splash/pix/pageheaderbgblue.jpg
diff --git a/theme/splash/pix/pageheaderbggreen.jpg b/theme/splash/pix/pageheaderbggreen.jpg
diff --git a/theme/splash/pix/pageheaderbgorange.jpg b/theme/splash/pix/pageheaderbgorange.jpg
diff --git a/theme/splash/pix/pageheaderbgred.jpg b/theme/splash/pix/pageheaderbgred.jpg
diff --git a/theme/splash/pix/post-sbbg.jpg b/theme/splash/pix/post-sbbg.jpg
diff --git a/theme/splash/pix/post-sbheaderbg.jpg b/theme/splash/pix/post-sbheaderbg.jpg
diff --git a/theme/splash/pix/pre-sbbg.jpg b/theme/splash/pix/pre-sbbg.jpg
diff --git a/theme/splash/pix/pre-sbheaderbg.jpg b/theme/splash/pix/pre-sbheaderbg.jpg
diff --git a/theme/splash/pix/red-theme.jpg b/theme/splash/pix/red-theme.jpg
diff --git a/theme/splash/pix/red-theme2.gif b/theme/splash/pix/red-theme2.gif
diff --git a/theme/splash/pix/red-theme2.jpg b/theme/splash/pix/red-theme2.jpg
diff --git a/theme/splash/pix/red.jpg b/theme/splash/pix/red.jpg
diff --git a/theme/splash/pix/sbheaderbg.jpg b/theme/splash/pix/sbheaderbg.jpg
diff --git a/theme/splash/pix/sbheaderbg2.jpg b/theme/splash/pix/sbheaderbg2.jpg
diff --git a/theme/splash/pix/sbheaderbg2blue.jpg b/theme/splash/pix/sbheaderbg2blue.jpg
diff --git a/theme/splash/pix/sbheaderbg2green.jpg b/theme/splash/pix/sbheaderbg2green.jpg
diff --git a/theme/splash/pix/sbheaderbg2orange.jpg b/theme/splash/pix/sbheaderbg2orange.jpg
diff --git a/theme/splash/pix/screenshot.jpg b/theme/splash/pix/screenshot.jpg
diff --git a/theme/splash/pix/screenshot.png b/theme/splash/pix/screenshot.png
diff --git a/theme/splash/pix/selectbg.jpg b/theme/splash/pix/selectbg.jpg
diff --git a/theme/splash/pix/switchbg.jpg b/theme/splash/pix/switchbg.jpg
diff --git a/theme/splash/pix/userinfobg.jpg b/theme/splash/pix/userinfobg.jpg
diff --git a/theme/splash/settings.php b/theme/splash/settings.php
@@ -20,7 +20,7 @@
  * Settings for the splash theme
  *
  * @package   theme_splash
- * @copyright 2010 Caroline Kennedy of Synergy Learning
+ * @copyright 2011 Caroline Kennedy - Synergy Learning
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 

diff --git a/theme/splash/style/blue.css b/theme/splash/style/blue.css
@@ -2,11 +2,12 @@
 **
 ** Theme name: Splash
 ** Creation Date: 30/06/09
-** Author: Synergy Learning
+** Author: Caroline Kennedy - Synergy Learning
 ** Author URI: http://synergylearning.com
 **
 *********************************************************/
 
+
 /* Global 
 ------------------------*/
 
@@ -41,61 +42,163 @@ body.splash-blue {                /* Define margins and background colour/image
     padding: 0;
     margin:0;
     color: #fff;
-    height: 308px;
+    height: 315px;
     background: url([[pix:theme|pageheaderbgblue]]) top center no-repeat;
 
 }
 
 .splash-blue #logobox{  /* holder background for logo*/
     height: 185px;
-    width: 252px;
+    width: 200px;
     margin: auto;
     text-align: center;
     background: url([[pix:theme|lbgv2blue]]) no-repeat;
     float: left;
+    padding: 0 10px 0 10px;
 }
 
 
 .splash-blue #colourswitcher p{
-    color:#3d6276
+    color:#3d6276;
 }
 
+.headermain  {margin:0; padding:0px; float:left;}
+.langmenu{
+	text-align: left;
+}
+
+.headermain.inside{
+	font-size: 1.0em;
+	margin-top: 45px;
+	margin-left: 10px;
+	color: #000;
+}
+
+.splash-blue #region-main h1 {color:#3d6276; font-size:1.8em; font-weight:normal; padding:10px 0; line-height:1.8em;}
+.splash-blue #region-main h2 {color:#333; font-size:1.6em; font-weight:normal; padding:10px 0; line-height:1.6em; padding:3px; margin: 0 !important; border-bottom:1px solid #d1cece;}
+.splash-blue #region-main h3 {color:#3d6276; font-size:1.4em; font-weight:normal; padding:10px 0; line-height:1.4em;}
+.splash-blue #region-main h4 {color:#3d6276; font-size:1.2em; font-weight:bold; padding:10px 0; line-height:1.2em;}
+.splash-blue #region-main h5 {color:#333; font-size:1.1em; font-weight:bold; padding:10px 0; line-height:1em; text-decoration:italic;}
+.splash-blue #region-main h6 {color:#3d6276; font-size:1.1em; font-weight:bold; padding:10px 0; line-height:1em;}
+
+
+/*Navbar *----*/
+
+.splash-blue .navbar {padding:0 10px; background:url([[pix:theme|navbarbg]]) left repeat-x;  border:none; clear:both; width:100; margin:0; padding-top:8px; color:#000;}
+.splash-blue .navbar .breadcrumb {margin:0; padding:10px 0 10px 0px; font-size:0.9em;}
+.splash-blue .navbar .breadcrumb ul{display:inline; padding-left:0px;}
+.splash-blue .navbar .breadcrumb a {color:#cc000; text-decoration:underline;}
+.splash-blue .navbar .breadcrumb a:hover {color:#000; text-decoration:underline;}
+.splash-blue .navbar .arrow {color:#3d6276;}
+.splash-blue .navbar .navbutton {margin:0; padding:5px 0 0 0;}
+.splash-blue .navbutton input[type=submit] {background:#000; color: #fff; padding:3px 5px 3px 5px; border: none; margin: 0; cursor:pointer;}
+.splash-blue .navbutton input[type=submit]:hover {background:#8e8e8e; color: #fff; border: none;}
+
+.splash-blue #region-main .coursebox h3{font-size:1.0em !important;}
 
 /* Custom Menu
 -----------------------*/
-.splash-blue #custommenu .yui3-menu-content ul.first-of-type li{
+//.splash-blue #custommenu .yui3-menu-content ul.first-of-type li{
     border-right: 1px solid #bfced7;
 }
 
-.splash-blue #custommenu div.yui3-menu.custom_menu_submenu .yui3-menu-content{
+//.splash-blue #custommenu div.yui3-menu.custom_menu_submenu .yui3-menu-content{
     background:#3d6276;
     border:1px solid #fff;
     color: #fff;
 }
 
 /* Content
 -----------------------*/
+.splash-blue .course-content ul.topics li.section .left {font-size:1.2em; color:#3d6276; font-weight:bold; padding:10px 0 0 0;}
+
+.splash-blue .mform fieldset legend {font-size:1.3em; color:#3d6276;}
 
 .splash-blue .coursebox{
     padding-left:5px;
     border-bottom: 1px dashed #cbd3d6;
 }
 
 .splash-blue ul.topics li#section-0, ul.weeks li#section-0 {
-    background: #386377;
+    //background: #386377;
     border: 1px solid #ccc;
 }
 
-/* Sideblocks
------------------------*/
 
-.splash-blue #region-pre .block .header,
-.splash-blue #region-post .block .header {  /*-- right block header   --*/
-    background: url([[pix:theme|sbheaderbg2blue]]) center no-repeat;
-    padding: 12px 5px 5px;
-    color: #fff;
+.splash-blue #categoryquestions tr th{background:#3d6276; border-bottom:none !important; color:#fff;}
+
+
+
+/*quiz navigation */
+.splash-blue .path-mod-quiz .qnbutton {background:#3d6276; color:#fff;}
+.splash-blue .path-mod-quiz .qnbutton.open {background:#3d6276;}
+.splash-blue .path-mod-quiz .qnbutton.thispage {border-color:#ff9933;}
+
+
+
+/**********************************
+Sideblocks
+**********************************/
+
+.splash-blue .block {margin-bottom: 20px; border: none; width:210px !important;}
+.splash-blue .block hr { display: none;}
+
+.splash-blue .searchform {padding-top: 10px;}
+.splash-blue .block-region {background: #fff;}
+
+.splash-blue .block-region .block .header {background: url([[pix:theme|sbheaderbg2blue]]) top center no-repeat #f2f2f2;}
+
+.splash-blue .block .header .block_action { /*--  show/hide --*/
+	padding:15px 10px 0 0;}
+
+.splash-blue .block-region .block .header h2{  /*--  block text --*/
+    color: #333; padding: 15px 0px 10px 10px; margin:0; font-size: 1.2em;}
+
+.splash-blue .block-region .commands {/*--  editing options --*/
+	padding:5px 0 0 10px; margin:0; clear:both;   background: #f2f2f2; border:none;}
+
+	.block-region .block .content .commands {/*--  editing options with in block--*/
+	padding:5px 0 0 10px; margin:0; clear:both;  background: #f2f2f2; border:none;}
+
+	.block .header .commands {
+	    margin-left: 0px;
+	}
+
+.splash-blue .block-region .block .content {  /*--  block content   --*/
+    background: #f2f2f2;
+    padding: 10px; }
+
+/**********************************
+Sideblocks - tree navs
+**********************************/
+.splash-blue .tree_item {  /* tree item seperator for sideblocks */
+    border-bottom: #ddd 1px solid; padding:5px;}
+
+
+.splash-blue .block_navigation .block_tree li.depth_2 ul {padding-left:8px;}
+
+
+.splash-blue .unlist, .splash-blue .unlist li, .splash-blue .inline-list, .splash-blue .inline-list li, .splash-blue .block .list, .splash-blue .block .list li, .splash-blue .sitetopic .section li, .splash-blue .course-content .section li.activity, .splash-blue .tabtree li {
+	padding-bottom: 5px;
 }
 
+/**********************************
+Sideblock Calendar
+**********************************/
+.splash-blue .minicalendar {background:none; font-size:1em;}
+.splash-blue .minicalendar td, .minicalendar th {border:none; padding:5px 0 !important;}
+.splash-blue .minicalendar th {font-weight:bold;}
+.splash-blue .block .minicalendar td.weekend {color:#666;}
+
+/**********************************
+Sideblock My Profile
+**********************************/
+
+.block-region .block_myprofile .fullname {clear:both; font-size:1.2em; text-align:center; padding-bottom:10px;}
+.block_myprofile img.profilepicture {margin-left:50px;}
+
+
+
 /* Mini Calendar
 ------------------------*/
 
@@ -107,10 +210,10 @@ body.splash-blue {                /* Define margins and background colour/image
 /* Forum
 ------------------------*/
 
-.splash-blue .forumpost .topic .subject,
-.path-blog.splash-blue .forumpost .subject a,
-.path-blog.splash-blue .forumpost .subject a:link,
-.path-blog.splash-blue .forumpost .subject a:visited {    /* forum subject section inside topic header */
+//.splash-blue .forumpost .topic .subject,
+//.path-blog.splash-blue .forumpost .subject a,
+//.path-blog.splash-blue .forumpost .subject a:link,
+//.path-blog.splash-blue .forumpost .subject a:visited {    /* forum subject section inside topic header */
     font-weight: bold;
     font-size: 1.1em;
     padding-left: 5px;