azkaban-uncached
Changes
src/java/azkaban/webapp/servlet/velocity/flowpage.vm 122(+15 -107)
src/web/css/azkaban.css 12(+6 -6)
src/web/js/azkaban.exflow.view.js 1(+0 -1)
src/web/js/azkaban.flow.view.js 87(+62 -25)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 4e60d43..fea2b3a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -20,7 +20,6 @@
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
<script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
<script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.10.1.custom.js"></script>
-
<script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
<script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
@@ -35,7 +34,6 @@
<script type="text/javascript" src="${context}/js/azkaban.flow.job.view.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.svg.graph.view.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.exflow.view.js"></script>
- <script type="text/javascript" src="${context}/js/azkaban.exflow.options.view.js"></script>
<script type="text/javascript" src="${context}/js/svgNavigate.js"></script>
<script type="text/javascript">
var contextURL = "${context}";
@@ -145,31 +143,6 @@
#parse( "azkaban/webapp/servlet/velocity/flowexecutionpanel.vm" )
#end
-
- <ul id="jobMenu" class="contextMenu">
- <li class="open"><a href="#open">Open...</a></li>
- <li class="openwindow"><a href="#openwindow">Open in New Window...</a></li>
- </ul>
-
- <ul id="disableJobMenu" class="contextMenu flowSubmenu">
- <li class="openwindow"><a href="#openwindow">Open in New Window...</a></li>
- <li id="disable" class="disable separator"><a href="#disable">Disable</a><div id="disableArrow" class="context-sub-icon"></div></li>
- <ul id="disableSub" class="subMenu">
- <li class="disableAll"><a href="#disableAll">All</a></li>
- <li class="parents"><a href="#disableParents">Parents</a></li>
- <li class="ancestors"><a href="#disableAncestors">All Ancestors</a></li>
- <li class="children"><a href="#disableChildren">Children</a></li>
- <li class="decendents"><a href="#disableDescendents">All Descendents</a></li>
- </ul>
- <li id="enable" class="enable"><a href="#enable">Enable</a> <div id="enableArrow" class="context-sub-icon"></div></li>
- <ul id="enableSub" class="subMenu">
- <li class="enableAll"><a href="#enableAll">All</a></li>
- <li class="parents"><a href="#enableParents">Parents</a></li>
- <li class="ancestors"><a href="#enableAncestors">All Ancestors</a></li>
- <li class="children"><a href="#enableChildren">Children</a></li>
- <li class="decendents"><a href="#enableDescendents">All Descendents</a></li>
- </ul>
- </ul>
</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index c51cf52..40a4ddd 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -18,11 +18,12 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.main.view.js"></script>
<script type="text/javascript">
src/java/azkaban/webapp/servlet/velocity/flowpage.vm 122(+15 -107)
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 102c43f..468c236 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -18,15 +18,15 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
- <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui.custom.min.js"></script>
- <script type="text/javascript" src="${context}/js/jqueryui/jquery.ui.datepicker.min.js"></script>
- <script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.10.1.custom.js"></script>
+
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.contextMenu.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+
+ <script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.ajax.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.layout.js"></script>
@@ -45,11 +45,10 @@
var projectId = ${project.id};
var projectName = "${project.name}";
- var flowName = "${flowid}";
+ var flowId = "${flowid}";
var execId = null;
</script>
- <link rel="stylesheet" type="text/css" href="${context}/js/jqueryui/themes/custom-theme/jquery-ui.custom.css" />
- <link rel="stylesheet" type="text/css" href="${context}/css/jquery.contextMenu.custom.css" />
+ <link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
</head>
<body>
#set($current_page="all")
@@ -72,8 +71,7 @@
<h4><a href="${context}/manager?project=${project.name}">Project <span>$project.name</span></a></h4>
</div>
- <div id="executebtn" class="btn1">Prepare Execution</div>
- <div id="scheduleflowbtn" class="btn2 scheduleflow">Schedule Flow</div>
+ <div id="executebtn" class="btn1">Schedule / Execute Flow</div>
</div>
<div id="headertabs" class="headertabs">
@@ -132,55 +130,7 @@
</div>
</div>
<!-- modal content -->
-
- <div id="schedule-flow" class="modal">
- <h3>Schedule Flow</h3>
- <div id="errorMsg" class="box-error-message">$errorMsg</div>
- <div class="box">
- <form id="sched-form" method="post" action="${context}/">
- <div class="sched-form">
- <dl>
- <dt>Schedule Time</dt>
- <dd>
- <input id="hour" type="text" size="2" value="12"/>
- <input id="minutes" type="text" size="2" value="00"/>
- <select id="am_pm">
- <option>pm</option>
- <option>am</option>
- </select>
- <select id="timezone">
- <option>PDT</option>
- <option>UTC</option>
- </select>
- </dd>
- <dt>Schedule Date</dt><dd><input type="text" id="datepicker" /></dd>
- <dt>Recurrence</dt>
- <dd>
- <input id="is_recurring" type="checkbox" checked />
- <span>repeat every</span>
- <input id="period" type="text" size="2" value="1"/>
- <select id="period_units">
- <option value="d">Days</option>
- <option value="h">Hours</option>
- <option value="m">Minutes</option>
- <option value="M">Months</option>
- <option value="w">Weeks</option>
- </select>
- </dd>
- </dl>
-
- </div>
-
- </form>
- </div>
-
- <div class="actions">
- <a class="yes btn2" id="schedule-btn" href="#">Schedule The Flow</a>
- <a class="no simplemodal-close btn3" href="#">Cancel</a>
- <a class="btn2" id="adv-schedule-opt-btn" href="#">Advanced Schedule Options</a>
- </div>
- </div>
<div id="invalid-session" class="modal">
<h3>Invalid Session</h3>
<p>Session has expired. Please re-login.</p>
@@ -188,57 +138,15 @@
<a class="yes btn3" id="login-btn" href="#">Re-login</a>
</div>
</div>
-#parse( "azkaban/webapp/servlet/velocity/scheduleoptionspanel.vm" )
-#parse( "azkaban/webapp/servlet/velocity/executionoptionspanel.vm" )
+#parse( "azkaban/webapp/servlet/velocity/flowexecutionpanel.vm" )
#end
- <ul id="jobMenu" class="contextMenu">
- <li class="open"><a href="#open">Open...</a></li>
- <li class="openwindow"><a href="#openwindow">Open in New Window...</a></li>
- </ul>
-
- <ul id="disableJobMenu" class="contextMenu flowSubmenu">
- <li class="openwindow"><a href="#openwindow">Open in New Window...</a></li>
- <li id="disable" class="disable separator"><a href="#disable">Disable</a><div id="disableArrow" class="context-sub-icon"></div></li>
- <ul id="disableSub" class="subMenu">
- <li class="disableAll"><a href="#disableAll">All</a></li>
- <li class="parents"><a href="#disableParents">Parents</a></li>
- <li class="ancestors"><a href="#disableAncestors">All Ancestors</a></li>
- <li class="children"><a href="#disableChildren">Children</a></li>
- <li class="decendents"><a href="#disableDescendents">All Descendents</a></li>
- </ul>
- <li id="enable" class="enable"><a href="#enable">Enable</a> <div id="enableArrow" class="context-sub-icon"></div></li>
- <ul id="enableSub" class="subMenu">
- <li class="enableAll"><a href="#enableAll">All</a></li>
- <li class="parents"><a href="#enableParents">Parents</a></li>
- <li class="ancestors"><a href="#enableAncestors">All Ancestors</a></li>
- <li class="children"><a href="#enableChildren">Children</a></li>
- <li class="decendents"><a href="#enableDescendents">All Descendents</a></li>
- </ul>
- </ul>
-
- <ul id="scheduleDisableJobMenu" class="contextMenu flowSubmenu">
- <li class="openwindow"><a href="#scheduleOpenwindow">Open in New Window...</a></li>
- <li id="scheduleDisable" class="disable separator"><a href="#disable">Disable</a><div id="scheduleDisableArrow" class="context-sub-icon"></div></li>
- <ul id="scheduleDisableSub" class="subMenu">
- <li class="disableAll"><a href="#disableAll">All</a></li>
- <li class="parents"><a href="#disableParents">Parents</a></li>
- <li class="ancestors"><a href="#disableAncestors">All Ancestors</a></li>
- <li class="children"><a href="#disableChildren">Children</a></li>
- <li class="decendents"><a href="#disableDescendents">All Descendents</a></li>
- </ul>
- <li id="scheduleEnable" class="enable"><a href="#enable">Enable</a> <div id="scheduleEnableArrow" class="context-sub-icon"></div></li>
- <ul id="scheduleEnableSub" class="subMenu">
- <li class="enableAll"><a href="#enableAll">All</a></li>
- <li class="parents"><a href="#enableParents">Parents</a></li>
- <li class="ancestors"><a href="#enableAncestors">All Ancestors</a></li>
- <li class="children"><a href="#enableChildren">Children</a></li>
- <li class="decendents"><a href="#enableDescendents">All Descendents</a></li>
- </ul>
- </ul>
</div>
+ <div id="contextMenu">
+ </div>
+ #parse( "azkaban/webapp/servlet/velocity/messagedialog.vm" )
</body>
</html>
diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index 71f6f07..03bdf6b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -18,16 +18,14 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-timepicker-addon.css" />
- <link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui.css" />
- <script type="text/javascript" src="${context}/js/jquery/jquery-1.8.3.min.js"></script>
- <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.9.2.custom.min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.10.1.custom.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
+ <script type="text/javascript" src="${context}/js/namespace.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
<script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-timepicker-addon.js"></script>
<script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-sliderAccess.js"></script>
- <script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.history.view.js"></script>
<script type="text/javascript">
@@ -35,6 +33,9 @@
var currentTime = ${currentTime};
var timezone = "${timezone}";
</script>
+
+ <link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
+ <link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-timepicker-addon.css" />
</head>
<body>
#set($current_page="history")
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index 5ee0f51..fed5e17 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -18,12 +18,11 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
- <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui.custom.min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/d3.v2.min.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
diff --git a/src/java/azkaban/webapp/servlet/velocity/joblogpage.vm b/src/java/azkaban/webapp/servlet/velocity/joblogpage.vm
index 4a9fa44..d3e577a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/joblogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/joblogpage.vm
@@ -18,11 +18,11 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.ajax.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.joblog.view.js"></script>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 536cdb5..e5efa4f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -18,14 +18,16 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
- <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui.custom.min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.10.1.custom.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.jobedit.view.js"></script>
+ <link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
<script type="text/javascript">
var contextURL = "${context}";
var currentTime = ${currentTime};
diff --git a/src/java/azkaban/webapp/servlet/velocity/login.vm b/src/java/azkaban/webapp/servlet/velocity/login.vm
index e539aff..9d8e069 100644
--- a/src/java/azkaban/webapp/servlet/velocity/login.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/login.vm
@@ -20,10 +20,12 @@
<title>#appname()</title>
<link rel="stylesheet" type="text/css" href="${context}/css/azkaban.css">
<link rel="shortcut icon" href="${context}/favicon.ico" />
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+
<script type="text/javascript" src="${context}/js/azkaban.login.js"></script>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
<script type="text/javascript">
diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index 9b13af6..046d1c0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -18,12 +18,12 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
- <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui.custom.min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.permission.view.js"></script>
<script type="text/javascript">
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index 874f468..4392510 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -18,11 +18,11 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.ajax.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index f354aff..3f25510 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -18,12 +18,12 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
- <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui.custom.min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript">
var contextURL = "${context}";
diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index 64d5a9d..9bf9b6b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -18,16 +18,18 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-timepicker-addon.css" />
+ <link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
<link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui.css" />
- <script type="text/javascript" src="${context}/js/jquery/jquery-1.8.3.min.js"></script>
- <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.9.2.custom.min.js"></script>
+
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.10.1.custom.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
+ <script type="text/javascript" src="${context}/js/namespace.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+
<script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-timepicker-addon.js"></script>
<script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-sliderAccess.js"></script>
- <script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.scheduled.view.js"></script>
<script type="text/javascript">
diff --git a/src/java/azkaban/webapp/servlet/velocity/viewer.vm b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
index 94853e7..09c5e2d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/viewer.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
@@ -18,11 +18,12 @@
<html>
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
+ <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal.js"></script>
+ <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
+ <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript">
var contextURL = "${context}";
src/web/css/azkaban.css 12(+6 -6)
diff --git a/src/web/css/azkaban.css b/src/web/css/azkaban.css
index 77da9ae..a0fb6d9 100644
--- a/src/web/css/azkaban.css
+++ b/src/web/css/azkaban.css
@@ -774,7 +774,7 @@ tr:hover td {
/* clean up */
.state-icon {
- background-image: url("../../js/jqueryui/themes/custom-theme/images/ui-icons_cccccc_256x240.png");
+ background-image: url("../css/images/ui-icons_cccccc_256x240.png");
cursor: pointer;
display: block;
float: left;
@@ -794,7 +794,7 @@ tr:hover td {
.context-sub-icon {
float: right;
- background-image: url("../../js/jqueryui/themes/custom-theme/images/ui-icons_cccccc_256x240.png");
+ background-image: url("../css/images/ui-icons_cccccc_256x240.png");
cursor: pointer;
display: block;
height: 16px;
@@ -995,7 +995,7 @@ tr:hover td {
#user-down {
float: right;
- background-image: url("../js/jqueryui/themes/custom-theme/images/ui-icons_cccccc_256x240.png");
+ background-image: url("../css/images/ui-icons_cccccc_256x240.png");
height: 16px;
width: 16px;
background-position: -64px -16px;
@@ -2833,7 +2833,7 @@ div.menuContent {
}
.contextMenu li.menuitem .expandSymbol {
- background-image: url("../../js/jqueryui/themes/custom-theme/images/ui-icons_cccccc_256x240.png");
+ background-image: url("../css/images/ui-icons_cccccc_256x240.png");
background-position: -32px -16px;
height: 16px;
width: 16px;
@@ -2902,7 +2902,7 @@ div.menuContent {
#schedule-panel-top {
width: 450px;
- margin-top: 300px;
+ margin-top: 250px;
position: absolute;
left: 50%;
}
@@ -2926,7 +2926,7 @@ div.menuContent {
/* old styles */
.azkaban-charts .hitarea {
- background-image: url("../../js/jqueryui/themes/custom-theme/images/ui-icons_cccccc_256x240.png");
+ background-image: url("../css/images/ui-icons_cccccc_256x240.png");
background-position: 0 -16px;
height: 16px;
margin-left: 15px;
diff --git a/src/web/css/images/ui-icons_cccccc_256x240.png b/src/web/css/images/ui-icons_cccccc_256x240.png
new file mode 100644
index 0000000..9254e05
Binary files /dev/null and b/src/web/css/images/ui-icons_cccccc_256x240.png differ
src/web/js/azkaban.exflow.view.js 1(+0 -1)
diff --git a/src/web/js/azkaban.exflow.view.js b/src/web/js/azkaban.exflow.view.js
index 391b91d..9c06584 100644
--- a/src/web/js/azkaban.exflow.view.js
+++ b/src/web/js/azkaban.exflow.view.js
@@ -685,7 +685,6 @@ $(function() {
jobsListView = new azkaban.JobListView({el:$('#jobList'), model: graphModel, contextMenuCallback: exJobClickCallback});
statusView = new azkaban.StatusView({el:$('#flow-status'), model: graphModel});
flowLogView = new azkaban.FlowLogView({el:$('#flowLogView'), model: logModel});
- executeFlowView = new azkaban.ExecuteFlowView({el:$('#executing-options'), model: graphModel});
executionListView = new azkaban.ExecutionListView({el: $('#jobListView'), model:graphModel});
contextMenuView = new azkaban.ContextMenuView({el:$('#contextMenu'), graph: svgGraph});
src/web/js/azkaban.flow.view.js 87(+62 -25)
diff --git a/src/web/js/azkaban.flow.view.js b/src/web/js/azkaban.flow.view.js
index 584e3a4..01049e1 100644
--- a/src/web/js/azkaban.flow.view.js
+++ b/src/web/js/azkaban.flow.view.js
@@ -14,7 +14,7 @@ var statusStringMap = {
var handleJobMenuClick = function(action, el, pos) {
var jobid = el[0].jobid;
- var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowName + "&job=" + jobid;
+ var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowId + "&job=" + jobid;
if (action == "open") {
window.location.href = requestURL;
}
@@ -263,7 +263,7 @@ azkaban.ExecutionsView = Backbone.View.extend({
var model = this.model;
$.get(
requestURL,
- {"project": projectName, "flow":flowName, "ajax": "fetchFlowExecutions", "start":page * pageSize, "length": pageSize},
+ {"project": projectName, "flow":flowId, "ajax": "fetchFlowExecutions", "start":page * pageSize, "length": pageSize},
function(data) {
model.set({"executions": data.executions, "total": data.total});
model.trigger("render");
@@ -274,11 +274,56 @@ azkaban.ExecutionsView = Backbone.View.extend({
}
});
+var exNodeClickCallback = function(event) {
+ console.log("Node clicked callback");
+ var jobId = event.currentTarget.jobid;
+ var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowId + "&job=" + jobId;
+
+ var menu = [
+ {title: "Open Job...", callback: function() {window.location.href=requestURL;}},
+ {title: "Open Job in New Window...", callback: function() {window.open(requestURL);}}
+ ];
+
+ contextMenuView.show(event, menu);
+}
+
+var exJobClickCallback = function(event) {
+ console.log("Node clicked callback");
+ var jobId = event.currentTarget.jobid;
+ var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowId + "&job=" + jobId;
+
+ var menu = [
+ {title: "Open Job...", callback: function() {window.location.href=requestURL;}},
+ {title: "Open Job in New Window...", callback: function() {window.open(requestURL);}}
+ ];
+
+ contextMenuView.show(event, menu);
+}
+
+var exEdgeClickCallback = function(event) {
+ console.log("Edge clicked callback");
+}
+
+var exGraphClickCallback = function(event) {
+ console.log("Graph clicked callback");
+ var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowId;
+
+ var menu = [
+ {title: "Open Flow...", callback: function() {window.location.href=requestURL;}},
+ {title: "Open Flow in New Window...", callback: function() {window.open(requestURL);}},
+ {break: 1},
+ {title: "Center Graph", callback: function() {graphModel.trigger("resetPanZoom");}}
+ ];
+
+ contextMenuView.show(event, menu);
+}
+
var graphModel;
azkaban.GraphModel = Backbone.Model.extend({});
var executionModel;
azkaban.ExecutionModel = Backbone.Model.extend({});
+var mainSvgGraphView;
$(function() {
var selected;
@@ -289,8 +334,9 @@ $(function() {
flowTabView = new azkaban.FlowTabView({el:$( '#headertabs'), selectedView: selected });
graphModel = new azkaban.GraphModel();
- svgGraphView = new azkaban.SvgGraphView({el:$('#svgDiv'), model: graphModel, rightClick: {id: 'jobMenu', callback: handleJobMenuClick}});
- jobsListView = new azkaban.JobListView({el:$('#jobList'), model: graphModel, rightClick: {id: 'jobMenu', callback: handleJobMenuClick}});
+ mainSvgGraphView = new azkaban.SvgGraphView({el:$('#svgDiv'), model: graphModel, rightClick: { "node": exNodeClickCallback, "edge": exEdgeClickCallback, "graph": exGraphClickCallback }});
+ jobsListView = new azkaban.JobListView({el:$('#jobList'), model: graphModel, contextMenuCallback: exJobClickCallback});
+
scheduleFlowView = new azkaban.ScheduleFlowView({el:$('#schedule-flow'), model: graphModel});
advancedScheduleView = new azkaban.AdvancedScheduleView({el:$('#schedule-options'), model: graphModel});
executeFlowView = new azkaban.ExecuteFlowView({el:$('#executing-options'), model: graphModel});
@@ -299,12 +345,21 @@ $(function() {
// Set up the Flow options view. Create a new one every time :p
$('#executebtn').click( function() {
- executeFlowView.show();
+ var data = graphModel.get("data");
+ var nodes = data.nodes;
+
+ var executingData = {
+ project: projectName,
+ ajax: "executeFlow",
+ flow: flowId
+ };
+
+ flowExecuteDialogView.show(executingData);
});
$.get(
requestURL,
- {"project": projectName, "ajax":"fetchflowgraph", "flow":flowName},
+ {"project": projectName, "ajax":"fetchflowgraph", "flow":flowId},
function(data) {
// Create the nodes
var nodes = {};
@@ -360,23 +415,5 @@ $(function() {
},
"json"
);
-
-
- $('#scheduleflowbtn').click( function() {
- console.log("schedule button clicked");
- $('#schedule-flow').modal({
- closeHTML: "<a href='#' title='Close' class='modal-close'>x</a>",
- position: ["20%",],
- containerId: 'confirm-container',
- containerCss: {
- 'height': '220px',
- 'width': '500px'
- },
- onShow: function (dialog) {
- var modal = this;
- $("#errorMsg").hide();
- }
- });
- });
-
+
});