azkaban-memoizeit

Fix project expanders.

1/6/2014 10:25:38 PM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index a96dfe0..71bff5b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -96,11 +96,11 @@
               </tr>
             </thead>
             <tbody>
-#if(!$projects.isEmpty())
-	#foreach($project in $projects)
+#if (!$projects.isEmpty())
+	#foreach ($project in $projects)
               <tr class="az-project-row">
                 <td id="${project.name}" class="tb-name project-expand expanded">
-                  <span class="glyphicon glyphicon-chevron-down az-expander"></span>
+                  <span class="state-icon state-icon-expand 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/javascript.vm b/src/java/azkaban/webapp/servlet/velocity/javascript.vm
index 40b35fd..2b2c316 100644
--- a/src/java/azkaban/webapp/servlet/velocity/javascript.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/javascript.vm
@@ -16,7 +16,6 @@
 
 		<script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>    
 		<script type="text/javascript" src="${context}/js/bootstrap.min.js"></script>    
-		<script type="text/javascript" src="${context}/js/bootstrap-fileinput.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>

src/less/base.less 22(+22 -0)

diff --git a/src/less/base.less b/src/less/base.less
index 4893de6..189f268 100644
--- a/src/less/base.less
+++ b/src/less/base.less
@@ -59,3 +59,25 @@
 		margin-left: 5px;
 	}
 }
+
+.state-icon {
+  background-image: url("../css/images/ui-icons_cccccc_256x240.png");
+  cursor: pointer;
+  display: block;
+  float: left;
+  height: 16px;
+  width: 16px;
+  margin-right: 5px;
+
+  &.state-icon-expand {
+    background-position: -32px -16px;
+  }
+
+  &.state-icon-collapse {
+    background-position: -64px -16px;
+  }
+
+  &.state-icon-wait {
+    background-position: -64px -80px;
+  }
+}
diff --git a/src/web/js/azkaban.main.view.js b/src/web/js/azkaban.main.view.js
index 62dc8f5..56fba73 100644
--- a/src/web/js/azkaban.main.view.js
+++ b/src/web/js/azkaban.main.view.js
@@ -45,15 +45,15 @@ azkaban.ProjectTableView = Backbone.View.extend({
 			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');
+				$(expander).removeClass('state-icon-collapse');
+				$(expander).addClass('state-icon-expand');
 				$(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');
+				$(expander).removeClass('state-icon-expand');
+				$(expander).addClass('state-icon-collapse');
 				$(targetExpanded).fadeIn();
 			}
 		}
@@ -76,8 +76,8 @@ azkaban.ProjectTableView = Backbone.View.extend({
 				
 				$(target).addClass('collapsed').removeClass('wait');
 				var expander = $(target).children('.az-expander')[0];
-				$(expander).removeClass('glyphicon-chevron-down');
-				$(expander).addClass('glyphicon-chevron-up');
+				$(expander).removeClass('state-icon-expand');
+				$(expander).addClass('state-icon-collapse');
 				$(targetExpanded).fadeIn("fast");
 			};