From ac3331cd3d69077d61f9379bc4284bdcd1d1656e Mon Sep 17 00:00:00 2001
From: kordan <kordan@mclink.it>
Date: Sun, 14 Jul 2013 23:09:36 +0200
Subject: [PATCH] MDL-39695 theme_formal_white: added a colour hover for
 coursebox following trendcolour setting

---
 theme/formal_white/lib.php            | 30 ++++++++++++++++++++++++++-
 theme/formal_white/style/block.css    |  2 +-
 theme/formal_white/style/calendar.css |  4 ++--
 theme/formal_white/style/course.css   | 15 ++++++--------
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/theme/formal_white/lib.php b/theme/formal_white/lib.php
index 7993eb1adb2..88ddc9590f7 100644
--- a/theme/formal_white/lib.php
+++ b/theme/formal_white/lib.php
@@ -150,9 +150,13 @@ function formal_white_set_trendcolor($css, $trendcolor) {
     $tag = urlencode('__setting_trendcolor__'); // urlencode is useless but it is correct to put it here
     $css = str_replace($tag, $trendcolor, $css);
 
-    // of the basis of the general choosed trend, I need the right background color.
+    // of the basis of the general choosed trend, I need some colour definition.
     switch ($trendcolor) {
         case 'blueberry':
+            // .courses .coursebox
+            $tag = '[[setting:hovercolor]]';
+            $css = str_replace($tag, '#CEE5FD', $css);
+
             // page background
             $tag = '[[setting:pagebackground]]';
             $css = str_replace($tag, '#DAF1FF', $css);
@@ -162,6 +166,10 @@ function formal_white_set_trendcolor($css, $trendcolor) {
             $css = str_replace($tag, '#CDE2F3', $css);
             break;
         case 'lemon':
+            // .courses .coursebox
+            $tag = '[[setting:hovercolor]]';
+            $css = str_replace($tag, '#FFEA68', $css);
+
             // page background
             $tag = '[[setting:pagebackground]]';
             $css = str_replace($tag, '#FFEB9A', $css);
@@ -171,6 +179,10 @@ function formal_white_set_trendcolor($css, $trendcolor) {
             $css = str_replace($tag, '#F7DA41', $css);
             break;
         case 'lime':
+            // .courses .coursebox
+            $tag = '[[setting:hovercolor]]';
+            $css = str_replace($tag, '#EBEDB1', $css);
+
             // page background
             $tag = '[[setting:pagebackground]]';
             $css = str_replace($tag, '#F0F5BB', $css);
@@ -180,6 +192,10 @@ function formal_white_set_trendcolor($css, $trendcolor) {
             $css = str_replace($tag, '#E2E499', $css);
             break;
         case 'mink':
+            // .courses .coursebox
+            $tag = '[[setting:hovercolor]]';
+            $css = str_replace($tag, '#E3DFD4', $css);
+
             // page background
             $tag = '[[setting:pagebackground]]';
             $css = str_replace($tag, '#EFEFEF', $css);
@@ -189,6 +205,10 @@ function formal_white_set_trendcolor($css, $trendcolor) {
             $css = str_replace($tag, '#E3DFD4', $css);
             break;
         case 'orange':
+            // .courses .coursebox
+            $tag = '[[setting:hovercolor]]';
+            $css = str_replace($tag, '#FFCF88', $css);
+
             // page background
             $tag = '[[setting:pagebackground]]';
             $css = str_replace($tag, '#FFD46C', $css);
@@ -198,6 +218,10 @@ function formal_white_set_trendcolor($css, $trendcolor) {
             $css = str_replace($tag, '#FDC06D', $css);
             break;
         case 'peach':
+            // .courses .coursebox
+            $tag = '[[setting:hovercolor]]';
+            $css = str_replace($tag, '#FFCEB8', $css);
+
             // page background
             $tag = '[[setting:pagebackground]]';
             $css = str_replace($tag, '#FCD3BC', $css);
@@ -207,6 +231,10 @@ function formal_white_set_trendcolor($css, $trendcolor) {
             $css = str_replace($tag, '#F7C099', $css);
             break;
         case 'silver':
+            // .courses .coursebox
+            $tag = '[[setting:hovercolor]]';
+            $css = str_replace($tag, '#E0DFDD', $css);
+
             // page background
             $tag = '[[setting:pagebackground]]';
             $css = str_replace($tag, '#EFF0F2', $css);
diff --git a/theme/formal_white/style/block.css b/theme/formal_white/style/block.css
index f48bb5fb361..3ba884116ee 100644
--- a/theme/formal_white/style/block.css
+++ b/theme/formal_white/style/block.css
@@ -7,7 +7,7 @@
 .block .header .title {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;clear:both;line-height:2em;}
 .block .header .title .commands {padding-left:0.3em;text-align:right;}
 .block .content {background-color:[[setting:blockcontentbgc]];}
-.block img.icon {padding-right:5px}
+.block img.icon {padding-right:0.2em}
 
 /* block login */
 .block_login .btn {margin-top:0.5em;text-align:center;}
diff --git a/theme/formal_white/style/calendar.css b/theme/formal_white/style/calendar.css
index 5f85f1aa361..e8496e8d8c6 100644
--- a/theme/formal_white/style/calendar.css
+++ b/theme/formal_white/style/calendar.css
@@ -31,8 +31,8 @@
 
 /* if a duration exists... in the calendartable */
 /* take care: it is not needed because I might have more than one duration
- * this is why the cell must not be equipped with a border-bottom
- * but events need to to drown inside
+ * this is why the cell must not be displayed with a border-bottom
+ * but events need to to drawn inside
  */
 
 .path-calendar .maincalendar .calendarmonth th,
diff --git a/theme/formal_white/style/course.css b/theme/formal_white/style/course.css
index b81f2ddc48f..ba38786f778 100644
--- a/theme/formal_white/style/course.css
+++ b/theme/formal_white/style/course.css
@@ -10,11 +10,11 @@
 .course-content .single-section .section-navigation {margin-bottom:0;}
 
 /** coursebox **/
-.coursebox {border:1px solid #DDD;border-color:#DDDDDD;}
 #page-enrol-index .generalbox.info,
 #page-course-info .generalbox.info {border:none;}
+.coursebox {border:none}
 .coursebox .info {margin:0;font-size:100%;}
-.coursebox .name {margin:5px;}
+.coursebox .name {margin:5px; width: 80%;}
 .coursebox .content {font-size:90%;}
 .coursebox .teachers {margin:5px 1em;}
 .coursebox .summary,
@@ -93,10 +93,10 @@
 .path-report-outline .loginfo {text-align:center;margin:1em;}
 
 /* Course */
-/*.courses .coursebox.even {background-color:white; border-color:white;}*/
-.courses .coursebox.odd {background-color:[[setting:rblockcolumnbgc]];border-color:[[setting:rblockcolumnbgc]];}
-.courses .coursebox:hover,
-.course_category_tree .courses > .paging:hover {background-color:#eee;}
+.courses .coursebox.even {background-color:[[setting:lblockcolumnbgc]];border-color:#eee;}
+.courses .coursebox.odd {background-color:[[setting:blockcontentbgc]];border-color:#eee;}
+.courses .coursebox.even:hover, .course_category_tree .courses > .paging:hover {background-color:[[setting:hovercolor]];}
+.courses .coursebox.odd:hover, .course_category_tree .courses > .paging:hover {background-color:[[setting:hovercolor]];}
 
 /* Category listings */
 .course_category_tree .controls {margin-bottom:5px;text-align:right;float:right;}
@@ -106,9 +106,6 @@
 .course_category_tree .category > .info {margin: 5px 0;}
 .course_category_tree .category > .info .name {margin:5px;padding-left:16px;}
 .dir-rtl .course_category_tree .category > .info .name {padding-left:0;padding-right:16px;}
-.courses .coursebox.even {background-color:#f6f6f6;border-color:#eee;}
-.courses .coursebox:hover,
-.course_category_tree .courses > .paging:hover {background-color:#eee;}
 .course_category_tree .courses > .paging,
 .course_category_tree .subcategories > .paging {padding:5px;}