From 950e68091c868f67c6c1b0c39ac4f3987db2f0f4 Mon Sep 17 00:00:00 2001
From: gojomo <gojomo@daa5b2f2-a927-0410-8b2d-f5f262fa301a>
Date: Thu, 3 Dec 2009 18:28:21 +0000
Subject: [PATCH] UI touchup * EngineResource.java     give add-job options
 their own header, reorder/reword for clarity * JobResource.java     return to
 always showing 'checkpoint' button, disable if necessary, so main control
 buttons aren't appearing/disappearing or moving

---
 .../crawler/restlet/EngineResource.java       | 23 +++++++++++--------
 .../archive/crawler/restlet/JobResource.java  | 10 ++++----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java b/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java
index 1dd34a49..6bffb88f 100644
--- a/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java
+++ b/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java
@@ -261,26 +261,29 @@ public class EngineResource extends Resource {
             pw.println("</li>");
         }
         pw.println("</ul>");
-        pw.println(
-            "To create a new job, use the 'copy' functionality on " +
-            "an existing job's detail page. Or, create a new job " +
-            "directory manually the main jobs directory and use the " +
-            "'rescan' button above. Or, supply a full path to another " +
-            "valid job directory at the engine machine below.<br/><br/>");
+        
+        pw.println("<h2>Add Job Directory</h2>");
         
         // create new job with defaults
         pw.println("<form method=\'POST\'>\n"
-        		+ "Create new job with recommended defaults<br />\n"
-        		+ jobsDir.getAbsolutePath() + "/\n"
-        		+ "<input size='16' name='addpath'/>\n"
+        		+ "Create new job directory with recommended starting configuration<br/>\n"
+        		+ "<b>Path:</b> " + jobsDir.getAbsolutePath() + "/\n"
+        		+ "<input size='25' name='addpath'/>\n"
         		+ "<input type='submit' name='action' value='create'>\n"
         		+ "</form>\n");
 
         pw.println("<form method=\'POST\'>");
-        pw.println("Add job directory: <input size='50' name='addpath'/>");
+        pw.println("Specify a path to a pre-existing job directory<br/>");
+        pw.println("<b>Path:</b> " + "<input size='53' name='addpath'/>");
         pw.println("<input type='submit' name='action' value='add'>");
         pw.println("</form>");
 
+        pw.println(
+                "You may also compose or copy a valid job directory into " +
+                "the main jobs directory via outside means, then use the " +
+                "'rescan' button above to make it appear in this interface. Or, " +
+                "use the 'copy' functionality at the botton of any existing " +
+                "job's detail page.");
         pw.println("</body>");
         pw.flush();
     }
diff --git a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java
index f8d1d209..92fc43f7 100644
--- a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java
+++ b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java
@@ -274,13 +274,11 @@ public class JobResource extends Resource {
             pw.println(" disabled ");
         }
         pw.println(" type='submit' name='action' value='unpause'/>");
-        if(cj.getCheckpointService()!=null) {
-            pw.println("<input ");
-            if(!cj.isRunning()) { // TODO: not yet implemented
-                pw.println(" disabled ");
-            }
-            pw.println(" type='submit' name='action' value='checkpoint'/>");
+        pw.println("<input ");
+        if(!cj.isRunning()) { 
+            pw.println(" disabled ");
         }
+        pw.println(" type='submit' name='action' value='checkpoint'/>");
         
         // TERMINATE, RESET
         pw.println("&nbsp;&nbsp;&nbsp;<input ");