azkaban-uncached

Improve main page project expanders.

12/18/2013 12:18:15 AM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 8d69e34..768f6ea 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -113,9 +113,9 @@
             <tbody>
 #if(!$projects.isEmpty())
 	#foreach($project in $projects)
-              <tr>
+              <tr class="az-project-row">
                 <td id="${project.name}" class="tb-name project-expand expanded">
-                  <span class="glyphicon glyphicon-plus"></span>
+                  <span class="glyphicon glyphicon-chevron-down az-expander"></span>
                   <a href="${context}/manager?project=${project.name}">$project.name</a>
                 </td>
                 <td class="tb-up-date">$utils.formatDate($project.lastModifiedTimestamp)</td>
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index d84902b..0b971be 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -95,7 +95,7 @@
 									<span class="glyphicon glyphicon-upload"></span> Upload
 								</button>
 								<button id="project-delete-btn" class="btn btn-xs btn-danger">
-									<span class="glyphicon glyphicon-remove-circle"></span> Delete Project
+									<span class="glyphicon glyphicon-trash"></span> Delete Project
 								</button>
 							</div>
 							Flows
diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index 3795278..4a85270 100644
--- a/src/less/bootstrap-azkaban.less
+++ b/src/less/bootstrap-azkaban.less
@@ -20,6 +20,10 @@
   margin-bottom: 15px;
 }
 
+.az-project-row {
+	cursor: pointer;
+}
+
 // Flow panel heading.
 .flow-expander {
   cursor: pointer;
diff --git a/src/web/js/azkaban.main.view.js b/src/web/js/azkaban.main.view.js
index e0d10c6..62dc8f5 100644
--- a/src/web/js/azkaban.main.view.js
+++ b/src/web/js/azkaban.main.view.js
@@ -26,7 +26,7 @@ azkaban.ProjectTableView = Backbone.View.extend({
 	},
 	
 	expandProject: function(evt) {
-		if (evt.target.tagName != "SPAN") {
+		if (evt.target.tagName == "A") {
 			return;
 		}
 		
@@ -44,10 +44,16 @@ azkaban.ProjectTableView = Backbone.View.extend({
 		else if (target.loaded) {
 			if ($(targetExpanded).is(':visible')) {
 				$(target).addClass('expanded').removeClass('collapsed');
+				var expander = $(target).children('.az-expander')[0];
+				$(expander).removeClass('glyphicon-chevron-up');
+				$(expander).addClass('glyphicon-chevron-down');
 				$(targetExpanded).fadeOut("fast");
 			}
 			else {
 				$(target).addClass('collapsed').removeClass('expanded');
+				var expander = $(target).children('.az-expander')[0];
+				$(expander).removeClass('glyphicon-chevron-down');
+				$(expander).addClass('glyphicon-chevron-up');
 				$(targetExpanded).fadeIn();
 			}
 		}
@@ -69,6 +75,9 @@ azkaban.ProjectTableView = Backbone.View.extend({
 				createFlowListFunction(data, targetTBody);
 				
 				$(target).addClass('collapsed').removeClass('wait');
+				var expander = $(target).children('.az-expander')[0];
+				$(expander).removeClass('glyphicon-chevron-down');
+				$(expander).addClass('glyphicon-chevron-up');
 				$(targetExpanded).fadeIn("fast");
 			};