Merge branch 'master' into improved-chain-gui

Conflicts:
	application/layouts/scripts/unl_wdn.phtml

application/layouts/scripts/unl_wdn.phtml

@@ -2,10 +2,7 @@
 
 $this->headLink()->appendStylesheet($this->baseUrl() . '/css/index.css', 'all');
 $this->headLink()->appendStylesheet($this->baseUrl() . '/css/print.css', 'print');
-$this->headLink()->appendStylesheet('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/base/jquery.ui.all.css', 'all');
 $this->headScript()->prependFile($this->baseUrl() . '/javascript/index.js');
-$this->headScript()->prependFile('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
-$this->headScript()->prependFile('https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js');
 
 // Put this in  a try block because unknown browsers throw exceptions
 try {

application/modules/bulletin/views/scripts/edit/index.phtml

 <?php
+
+$this->headScript()->prependFile('https://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js');
+$this->headScript()->prependFile('https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js');
 $this->headLink()->appendStylesheet($this->baseUrl() . '/css/bulletin/edit.css', 'all');
 $this->headScript()->appendFile($this->baseUrl() . '/ice/lib/rangy-1.2/rangy-core.js');
 $this->headScript()->appendFile($this->baseUrl() . '/ice/lib/rangy-1.2/rangy-cssclassapplier.js');

document_root/css/bulletin/view.css

@@ -2,8 +2,9 @@
 
 .current del,
 .current del a {
-    color: #880000 !important;
-    text-decoration: line-through;
+    box-shadow: 0 0 0.5em #c80, inset 0 0 2em #fc8;
+    background-color: #fec;
+    text-decoration: none;
 }
 .current ins {
     display: none;
@@ -13,14 +14,11 @@
 }
 .proposed ins,
 .proposed ins a {
-    color: #008800 !important;
+    box-shadow: 0 0 0.5em #08c, inset 0 0 2em #8cf;
+    background-color: #cef;
     text-decoration: none;
 }
 
-.bulletinEntry a {
-    color: #0000cc !important;
-}
-
 #otherInfo caption {
     margin-top: 1em;
     text-align: left;

document_root/css/courses/view/course-info.css

@@ -2,7 +2,8 @@
 
 .courseInfo .deleted,
 .courseInfo .current del {
-    color:#880000;
+    box-shadow: 0 0 0.5em #c80, inset 0 0 2em #fc8;
+    background-color: #fec;
     text-decoration: none;
 }
 .courseInfo .current ins {
@@ -13,7 +14,8 @@
 }
 .courseInfo .new,
 .courseInfo .proposed ins {
-    color:#008800;
+    box-shadow: 0 0 0.5em #08c, inset 0 0 2em #8cf;
+    background-color: #cef;
     text-decoration: none;
 }
 .courseInfo div#justification {
@@ -43,8 +45,9 @@
     margin-bottom:2px;
     padding-left:5px;
 }
-.courseInfo div.removed {
-    color:#880000;
+.courseInfo div.removed del {
+    box-shadow:  0 0 0.2em #c80, inset 0 0 2em #fc8;
+    background-color: #fec;
     text-decoration:line-through;
 }
 

document_root/css/fouryearplans/view.css

-.change-removed {
-    color: #c00;
+.change-removed td {
+    box-shadow: 0 0 0.5em #c80, inset 0 0 2em #fc8;
+    background-color: #fec !important;
     text-decoration: line-through;
 }
 
-.change-added {
-    color: #0c0;
+.change-added td {
+    box-shadow: 0 0 0.5em #08c, inset 0 0 2em #8cf;
+    background-color: #cef !important;
 }
 #otherInfo caption {
     margin-top: 1em;

document_root/javascript/jquery.tablesorter.js

@@ -934,7 +934,7 @@
         is: function (s) {
             return /^(https?|ftp|file):\/\/$/.test(s);
         }, format: function (s) {
-            return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), ''));
+            return $.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), ''));
         }, type: "text"
     });
 

document_root/javascript/requests/queue-manager.js

 var queueManager = {};
 
-$().ready(function() {
-	$('#period').change(queueManager.handleChangePeriod);
+WDN.jQuery().ready(function() {
+    WDN.jQuery('#period').change(queueManager.handleChangePeriod);
 });
 
 queueManager.handleChangePeriod = function()