p78543092
/
haflow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #19 from justinliucs/master 

Merge from base project.
This commit is contained in:
Zhen Tang 2013-07-08 08:41:37 -07:00
parent 2ddabc3ada e15b461414
commit fc2fcf84f5
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/views/admin.jsp
View File

@ -16,7 +16,7 @@
<title>HA Flow Administration</title> <title>HA Flow Administration</title>
<link rel="stylesheet" href="<%=basePath%>/style/site.css"> <link rel="stylesheet" href="<%=basePath%>/style/site.css">
<body> <body>
<h1>HA Flow Administration</h1> <h1>Haflow Administration</h1>
<h2>Module List</h2> <h2>Module List</h2>
<table> <table>
<tr> <tr>

2
src/main/webapp/WEB-INF/views/main.jsp
View File

@ -10,7 +10,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>HA Flow</title> <title>Haflow - a big data analysis service platform!</title>
<link rel="stylesheet" <link rel="stylesheet"
href="http://ajax.googleapis.com/ajax/libs/dojo/1.9.0/dijit/themes/claro/claro.css"> href="http://ajax.googleapis.com/ajax/libs/dojo/1.9.0/dijit/themes/claro/claro.css">
<link rel="stylesheet" <link rel="stylesheet"

8
src/main/webapp/script/haflow.main.js
View File

@ -1181,8 +1181,8 @@ HAFlow.Main.prototype.onFlowClicked = function(instance, flowId) {
text += "<div class=\"configuration-content\"><strong>Flow Info:</strong></div>"; text += "<div class=\"configuration-content\"><strong>Flow Info:</strong></div>";
text += "<div class=\"configuration-content\"><span><strong>Id:</strong> " text += "<div class=\"configuration-content\"><span><strong>Id:</strong> "
+ flowBrief.id + "</span></div>"; + flowBrief.id + "</span></div>";
text += "<div class=\"configuration-content\"><span><strong>Name:</strong></span></div>"; text += "<div class=\"configuration-content\"><span><strong>Name:</strong></span>";
text += "<div id=\"flow_name_text_box\" class=\"configuration-content\"></div>"; text += "<span id=\"flow_name_text_box\" class=\"configuration-content\"></span></div>";
text += "<div id=\"save_flow_name_button\" class=\"configuration-content\"></div>"; text += "<div id=\"save_flow_name_button\" class=\"configuration-content\"></div>";
text += "</div>"; text += "</div>";
$("#" + instance.informationContainerId).html(text); $("#" + instance.informationContainerId).html(text);
@ -1232,7 +1232,7 @@ HAFlow.Main.prototype.onNodeClicked = function(instance, flowId, nodeId) {
+ module.name + "</span></div>"; + module.name + "</span></div>";
text += "<div class=\"configuration-content\">"; text += "<div class=\"configuration-content\">";
text += "<span><strong>Name:</strong> </span>"; text += "<span><strong>Name:</strong> </span>";
text += "<div id=\"node_name_text_box\" class=\"configuration-content\"></div>"; text += "<span id=\"node_name_text_box\" class=\"configuration-content\"></span>";
text += "<div id=\"save_node_name_button\" class=\"configuration-content\"></div>"; text += "<div id=\"save_node_name_button\" class=\"configuration-content\"></div>";
text += "</div>"; text += "</div>";
text += "<div class=\"configuration-content\"><strong>Delete?</strong></div>"; text += "<div class=\"configuration-content\"><strong>Delete?</strong></div>";
@ -1271,7 +1271,7 @@ HAFlow.Main.prototype.onNodeClicked = function(instance, flowId, nodeId) {
var form = ""; var form = "";
form += "<div class=\"configuration\">"; form += "<div class=\"configuration\">";
form += "<div class=\"configuration-content\"><strong>Configuration:</strong></div>"; //form += "<div class=\"configuration-content\"><strong>Configuration:</strong></div>";
var i; var i;
for (i = 0; i < module.configurations.length; i++) { for (i = 0; i < module.configurations.length; i++) {
var textBoxId = "flow_" + flowId + "_node_" + nodeId + "_" var textBoxId = "flow_" + flowId + "_node_" + nodeId + "_"

10
src/main/webapp/style/haflow.main.css
View File

@ -60,7 +60,15 @@
} }
._jsPlumb_endpoint { ._jsPlumb_endpoint {
z-index: 3; z-index: 9;
}
._jsPlumb_overlay {
z-index: 4;
}
._jsPlumb_endpoint_anchor_ {
z-index: 9;
} }
.dragHover { .dragHover {