diff options
| -rw-r--r-- | scripts/autocomplete.js | 2 | ||||
| -rw-r--r-- | scripts/rhizicore.js | 11 | ||||
| -rw-r--r-- | scripts/textanalysis.js | 5 | ||||
| -rw-r--r-- | style.css | 6 | ||||
| -rw-r--r-- | ui.css | 1 |
5 files changed, 13 insertions, 12 deletions
diff --git a/scripts/autocomplete.js b/scripts/autocomplete.js index 24396ea5..e70f8a10 100644 --- a/scripts/autocomplete.js +++ b/scripts/autocomplete.js @@ -48,7 +48,7 @@ * }); */ -; + (function ($, window, document, undefined) { $.widget("ui.autocompleteTrigger", { diff --git a/scripts/rhizicore.js b/scripts/rhizicore.js index 9a7c518f..0c3028e5 100644 --- a/scripts/rhizicore.js +++ b/scripts/rhizicore.js @@ -410,7 +410,7 @@ function myGraph(el) { } else return "link graph"; }) - .style("stroke-dasharray", function(d,i){if(d.name)if(d.name.replace(/ /g,"")=="and")return"3, 3";else return "0,0";}) + .style("stroke-dasharray", function(d,i){if(d.name)if(d.name.replace(/ /g,"")=="and" && d.state==="temp")return"3, 3";else return "0,0";}) .attr("marker-end", "url(#end)") .on("click", function(d, i) { //$('#textanalyser').val("node("+d.source.id+") -> "+d.name+" -> node("+d.target.id+")"); @@ -779,11 +779,12 @@ function showInfo(d, i) { $('.info').fadeIn(300); if (d.type === "deliverable") { - $('.info').html('Name: ' + d.id + '<br/><form id="editbox"><label>description:</label><input id="editdescription"/><br/><label>Status</label><select id="editstatus"><option value="waiting">Waiting</option><option value="current">Current</option><option value="done">Done</option></select><br/><label>Start date:</label><input id="editstartdate"/><br/><label>End date:</label><input id="editenddate"/><br/><button>Save</button><button id="deletenode">Delete</button></form>'); + $('.info').html('Name: ' + d.id + '<br/><form id="editbox"><label>description:</label><input id="editdescription"/><br/><label>Type:</label><select id="edittype"><option value="person">Person</option><option value="project">Project</option><option value="skill">Skill</option><option value="deliverable">Deliverable</option><option value="objective">Objective</option></select><br/><label>Status</label><select id="editstatus"><option value="waiting">Waiting</option><option value="current">Current</option><option value="done">Done</option></select><br/><label>Start date:</label><input id="editstartdate"/><br/><label>End date:</label><input id="editenddate"/><br/><button>Save</button><button id="deletenode">Delete</button></form>'); } else { - $('.info').html('Name: ' + d.id + '<br/><form id="editbox"><label>description:</label><input id="editdescription"/><br/><label>URL:</label><input id="editurl"/><br/><button>Save</button><button id="deletenode">Delete</button></form>'); + $('.info').html('Name: ' + d.id + '<br/><form id="editbox"><label>description:</label><input id="editdescription"/><br/><label>Type:</label><select id="edittype"><option value="person">Person</option><option value="project">Project</option><option value="skill">Skill</option><option value="deliverable">Deliverable</option><option value="objective">Objective</option></select><br/><label>URL:</label><input id="editurl"/><br/><button>Save</button><button id="deletenode">Delete</button></form>'); } + $('.info').css("border-color", customColor(d.type)); $("#editenddate").datepicker({ @@ -800,7 +801,7 @@ function showInfo(d, i) { $('#editdescription').val(d.type); - $('#editstatus').val(d.status); + $('#edittype').val(d.type); if (d.type === "deliverable") { $('#editstartdate').val(d.start); @@ -809,7 +810,7 @@ function showInfo(d, i) { $("#editbox").submit(function() { if (d.type === "deliverable") graph.editDates(d.id, null, new Date($("#editstartdate").val()), new Date($("#editenddate").val())); - + graph.editType(d.id,d.type,$('#edittype').val()); graph.update(); return false; }); diff --git a/scripts/textanalysis.js b/scripts/textanalysis.js index 77c158be..311a1ae8 100644 --- a/scripts/textanalysis.js +++ b/scripts/textanalysis.js @@ -88,7 +88,7 @@ window.setInterval(function() { $('.typeselection').css('top', -300); $('.typeselection').css('left', 0); - if(text.length*8>300)$('#textanalyser').css('width',text.length*8); + if(text.length*8>500)$('#textanalyser').css('width',text.length*8+20); // text changed text = $('#textanalyser').val(); TextAnalyser2(text, false); @@ -147,6 +147,7 @@ function TextAnalyser2(newtext, finalize) { case "and": case "+": case ",": + case "&": sentence[m]=" and "; ANDcount++; //orderStack.push("AND"); @@ -220,7 +221,7 @@ function TextAnalyser2(newtext, finalize) { if (orderStack.length > 0) graph.addNode("", "bubble", "temp"); var abnormalGraph=false; - if(newlinks.length >= 4 && ANDcount<2 )abnormalGraph=true; + if(newlinks.length >= 3 && ANDcount<2 )abnormalGraph=true; //0-N ORDER STACK for (var m = 0; m < orderStack.length - 1; m++) { @@ -71,7 +71,7 @@ a:active { } #textanalyser{ - width:300px; + width:500px; height:30px; } @@ -253,7 +253,6 @@ input:focus { } .help{ - font-weight: bold; font-size: 20px; position: fixed; top: 5px; @@ -308,11 +307,10 @@ input:focus { } .info{ - background-color: rgba(17,17,17,0.8); position:fixed; top:150px; - width:300px; + width:140px; right:10px; font-size: 14px; border: 1px solid; @@ -20,6 +20,7 @@ float: left; font-size: 16px; padding-top:30px; + border-left: 1px solid #222; max-width: 400px; line-height:1.5; |