Details
diff --git a/src/java/azkaban/executor/ExecutorManager.java b/src/java/azkaban/executor/ExecutorManager.java
index 8370103..60701b7 100644
--- a/src/java/azkaban/executor/ExecutorManager.java
+++ b/src/java/azkaban/executor/ExecutorManager.java
@@ -9,6 +9,7 @@ import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -180,6 +181,13 @@ public class ExecutorManager {
}
File[] archivePartitionsDir = archivePath.listFiles();
+ Arrays.sort(archivePartitionsDir, new Comparator<File>() {
+ @Override
+ public int compare(File arg0, File arg1) {
+ // TODO Auto-generated method stub
+ return arg1.getName().compareTo(arg0.getName());
+ }});
+
for (File archivePartition: archivePartitionsDir) {
File[] listArchivePartitions = archivePartition.listFiles();
if (skip > listArchivePartitions.length) {
diff --git a/src/java/azkaban/webapp/servlet/velocity/nav.vm b/src/java/azkaban/webapp/servlet/velocity/nav.vm
index fd9a236..63bd069 100644
--- a/src/java/azkaban/webapp/servlet/velocity/nav.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/nav.vm
@@ -1,10 +1,16 @@
<div id="header" class="header">
#parse( "azkaban/webapp/servlet/velocity/title.vm" )
+ <script type="text/javascript">
+ function navMenuClick(url) {
+ window.location.href=url;
+ }
+ </script>
+
<ul id="nav" class="nav">
- <li id="all-jobs-tab" #if($current_page == 'all')class="selected"#end><a href="/#all">Projects</a></li>
- <li id="scheduled-jobs-tab" #if($current_page == 'schedule')class="scheduled"#end><a href="$!context/schedule">Scheduled</a></li>
- <li id="executing-jobs-tab" #if($current_page == 'executing')class="selected"#end><a href="$!context/executions">Executing</a></li>
- <li id="history-jobs-tab" #if($current_page == 'history')class="selected"#end><a href="$!context/history">History</a></li>
+ <li id="all-jobs-tab" #if($current_page == 'all')class="selected"#end onClick="navMenuClick('$!context/#all')"><a href="$!context/#all">Projects</a></li>
+ <li id="scheduled-jobs-tab" #if($current_page == 'schedule')class="scheduled"#end onClick="navMenuClick('$!context/schedule')"><a href="$!context/schedule">Scheduled</a></li>
+ <li id="executing-jobs-tab" #if($current_page == 'executing')class="selected"#end onClick="navMenuClick('$!context/executions')"><a href="$!context/executions">Executing</a></li>
+ <li id="history-jobs-tab" #if($current_page == 'history')class="selected"#end onClick="navMenuClick('$!context/history')"><a href="$!context/history">History</a></li>
<li><a href="$!context/fs">HDFS</a></li>
</ul>
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 4c76af7..97fe423 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -56,7 +56,7 @@
<tr><td class="first">Name:</td><td>$project.name</td></tr>
<tr><td class="first">Created Date:</td><td>$utils.formatDate($project.lastModifiedTimestamp)</td></tr>
<tr><td class="first">Modified Date:</td><td>$utils.formatDate($project.createTimestamp)</td></tr>
- <tr><td class="first">Last Modified by:</td><td>$project.lastModifiedUser</td></tr>
+ <tr><td class="first">Modified by:</td><td>$project.lastModifiedUser</td></tr>
<tr><td class="first">Description:</td><td id="pdescription">$project.description</td>
#if($admin)
<td><div id="edit" class="btn5">Edit</div></td>
