Merge branch 'MDL-36629-master' of git://github.com/FMCorz/moodle

Andmat7 · Nov 27, 2012 · 9c8969a · 9c8969a
2 parents a58be8a + 94972cc
commit 9c8969a
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 1 deletion.
diff --git a/mod/workshop/pix/userplan/task-done.png b/mod/workshop/pix/userplan/task-done.png
diff --git a/mod/workshop/pix/userplan/task-done.svg b/mod/workshop/pix/userplan/task-done.svg
diff --git a/mod/workshop/pix/userplan/task-fail.png b/mod/workshop/pix/userplan/task-fail.png
diff --git a/mod/workshop/pix/userplan/task-fail.svg b/mod/workshop/pix/userplan/task-fail.svg
diff --git a/mod/workshop/pix/userplan/task-info.png b/mod/workshop/pix/userplan/task-info.png
diff --git a/mod/workshop/pix/userplan/task-info.svg b/mod/workshop/pix/userplan/task-info.svg
diff --git a/mod/workshop/pix/userplan/task-todo.png b/mod/workshop/pix/userplan/task-todo.png
diff --git a/mod/workshop/pix/userplan/task-todo.svg b/mod/workshop/pix/userplan/task-todo.svg
diff --git a/mod/workshop/styles.css b/mod/workshop/styles.css
@@ -285,11 +285,16 @@
     background-color: #e7f1c3;
 }
 
+.path-mod-workshop .userplan th .actions {
+    display: inline;
+}
 .path-mod-workshop .userplan tr.phasetasks li {
     background-image: url([[pix:mod_workshop|userplan/task-todo]]);
     background-position: top left;
     background-repeat: no-repeat;
     list-style-type: none;
+    min-height: 16px;
+    margin: .3em 0;
 }
 
 .path-mod-workshop .userplan tr.phasetasks li.completed {
@@ -557,3 +562,5 @@
     margin: 2em auto;
     text-align: center;
 }
+
+.path-mod-workshop .workshop-risk-dataloss { vertical-align: text-bottom; }
diff --git a/mod/workshop/view.php b/mod/workshop/view.php
@@ -462,7 +462,8 @@
         echo $output->help_icon('clearassessments', 'workshop');
         echo html_writer::empty_tag('img', array('src' => $output->pix_url('i/risk_dataloss'),
                                                  'title' => get_string('riskdatalossshort', 'admin'),
-                                                 'alt' => get_string('riskdatalossshort', 'admin')));
+                                                 'alt' => get_string('riskdatalossshort', 'admin'),
+                                                 'class' => 'workshop-risk-dataloss'));
         echo $output->container_end();
 
         echo $output->box_end();

diff --git a/pix/i/scheduled.png b/pix/i/scheduled.png
diff --git a/pix/i/scheduled.svg b/pix/i/scheduled.svg