gui: update static version

91afdabb · Jérome Perrin · 437edb06 · 91afdabb · 91afdabb · 91afdabb
Commit 91afdabb authored Jul 23, 2015 by Jérome Perrin
5 changed files
--- a/dream/platform/static/daff/daff.js
+++ b/dream/platform/static/daff/daff.js
@@ -11,7 +11,7 @@
        diff2html.render(table_diff);
        table_diff_html = diff2html.html();
        return this.getElement().push(function(element) {
-            $(element).html(table_diff_html);
+            $(element).addClass("highlighter").html(table_diff_html);
        });
    });
 })(window, jQuery, rJS, JSON, daff);
\ No newline at end of file
--- a/dream/platform/static/daff/daff_handsontable.css
+++ b/dream/platform/static/daff/daff_handsontable.css
+.highlighter .add { 
+  background-color: #7fff7f;
+}
+
+.highlighter .remove { 
+  background-color: #ff7f7f;
+}
+
+.highlighter td.modify { 
+  background-color: #7f7fff;
+}
+
+.highlighter td.conflict { 
+  background-color: #f00;
+}
+
+.highlighter .spec { 
+  background-color: #aaa;
+}
+
+.highlighter .move { 
+  background-color: #ffa;
+}
+
+.highlighter .null { 
+  color: #888;
+}
+
+.highlighter table { 
+  border-collapse:collapse;
+}
+
+.highlighter td, .highlighter th {
+  border: 1px solid #2D4068;
+  padding: 3px 7px 2px;
+}
+
+.highlighter th, .highlighter .header { 
+  background-color: #aaf;
+  font-weight: bold;
+  padding-bottom: 4px;
+  padding-top: 5px;
+  text-align:left;
+}
+
+.highlighter tr.header th {
+  border-bottom: 2px solid black;
+}
+
+.highlighter .gap {
+  color: #888;
+}
+
+.highlighter td {
+  empty-cells: show;
+}
+
+.highlighter tr:first-child td {
+  border-top: 1px solid #2D4068;
+}
+
+.highlighter td:first-child { 
+  border-left: 1px solid #2D4068;
+}
+
+.highlighter tr.index td, .highlighter .index, .highlighter tr.header th.index, .highlighter td.index:first-child, .highlighter tr:first-child td.index {
+  background-color: white;
+  border: none;
+}
--- a/dream/platform/static/daff/index.html
+++ b/dream/platform/static/daff/index.html
@@ -2,6 +2,7 @@
 <html>
  <head>
    <meta charset="utf-8">
+    <link rel="stylesheet" href="./daff_handsontable.css"></link>

    <script src="../lib/jquery.js"></script>
    <script src="../lib/rsvp.min.js"></script>

--- a/dream/platform/static/dream/Output_viewSpreadsheetComparison.html
+++ b/dream/platform/static/dream/Output_viewSpreadsheetComparison.html
@@ -14,10 +14,11 @@
    <script src="Output_viewSpreadsheetComparison.js" type="text/javascript"></script>
  </head>
  <body>
+    <a class="set_reference_schedule_button ui-btn ui-btn-b ui-btn-inline
+              ui-icon-refresh ui-btn-icon-right">Set current schedule as reference</a>
+
    <div data-gadget-url="../daff/index.html"
         data-gadget-scope="tablediff"></div>

-    <a class="set_reference_schedule_button ui-btn ui-btn-b ui-btn-inline
-              ui-icon-refresh ui-btn-icon-right">Set current schedule as reference</a>
  </body>
 </html>
--- a/dream/platform/static/manifest.appcache
+++ b/dream/platform/static/manifest.appcache
 CACHE MANIFEST
 # This manifest was generated by grunt-manifest HTML5 Cache Manifest Generator
-# Time: Fri Jul 17 2015 18:40:35 GMT+0200 (CEST)
+# Time: Thu Jul 23 2015 16:28:21 GMT+0200 (CEST)

 CACHE:
 daff/daff.js
@@ -61,6 +61,7 @@ list_field/listfield.js
 number_field/numberfield.js
 string_field/stringfield.js
 toolbox/toolbox.js
+daff/daff_handsontable.css
 dream/index.css
 jsplumb/jsplumb.css
 lib/codemirror.css