From fb95c775d0339c5bf180362c01c6cd433ee3ea97 Mon Sep 17 00:00:00 2001 From: Owen Date: Mon, 21 Jul 2014 15:08:08 +0300 Subject: Save Load done, Gantt scrolling much better Save now asks if you wish to discard your changes Load now load everything perfectly, no bugs with dates or the gantt chart Scrolling for the gantt area new works much much better, it deactivates zooming controls and enables horizontal scrolling. Zooming and background clicking is left intact in Graph mode. --- index.html | 5 +--- scripts/buttons.js | 13 ++++++---- scripts/gant.js | 67 +++++++++++++++++++++++++++++----------------------- scripts/rhizicore.js | 45 ++++++++++++++++++++--------------- style.css | 24 +++++++++++++++++-- 5 files changed, 95 insertions(+), 59 deletions(-) diff --git a/index.html b/index.html index c6d1cab7..5680f2ef 100644 --- a/index.html +++ b/index.html @@ -20,11 +20,8 @@ - - -
Connect between people and the projects they are working on by describing their main contribution:
diff --git a/scripts/buttons.js b/scripts/buttons.js index e1e39a68..472b58ff 100644 --- a/scripts/buttons.js +++ b/scripts/buttons.js @@ -46,20 +46,23 @@ $('.save').click(function(){ }); $('.load').click(function(){ + if (confirm('All unsaved changes will be deleted, are you sure?')) { + links=[]; + nodes=[]; var data = JSON.parse(JSON.parse(localStorage.getItem(key))); console.log(data); for(var i=0; inodes[startindex].start){ @@ -629,7 +637,6 @@ function mousedown() { $('.editinfo').css('left', 0); $('.editlinkinfo').css('top', -100); $('.editlinkinfo').css('left', 0); - d3.event.stopPropagation(); graph.removeHighlight(); $('.info').fadeOut(300); } diff --git a/style.css b/style.css index 740a338f..0ca60d12 100644 --- a/style.css +++ b/style.css @@ -7,7 +7,8 @@ html{ } body { - overflow: hidden; + overflow-y: hidden; + overflow-x:auto; margin: 0; min-width: 980px; padding: 0; @@ -52,6 +53,23 @@ font-size:14px; -o-transition: all 0.04s ease-in-out; } +a{ + text-decoration: none; + font-style: italic; +} +a:link { + color: #FFF; +} +a:visited { + color: #FFF; +} +a:hover { + color: #EDE275; +} +a:active { + color: #FFF; +} + #textanalyser{ width:900px; height:30px; @@ -242,6 +260,7 @@ input:focus { .overlay { fill:none; pointer-events: all; + z-index:0; } @@ -327,6 +346,7 @@ input:focus { .axis{ stroke: #ccc; + fill: #ccc; } #editlinkname{ @@ -348,7 +368,7 @@ input:focus { .axis path,.axis line { fill: none; - stroke: #000; + stroke: #ccc; shape-rendering: crispEdges; } -- cgit v1.3.1