From fc43269ad5fa3ad5e91543bc3be2b198cef42fbd Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 13 Dec 2010 20:13:10 +0000
Subject: [PATCH] NIHVIVO-1493: Defining app level classes.

---
 webapp/web/commentsForm.jsp                               | 4 ++--
 webapp/web/css/edit.css                                   | 8 ++++++++
 webapp/web/jenaIngest/csv2rdf.jsp                         | 4 ++--
 webapp/web/jenaIngest/listModels.jsp                      | 4 ++--
 webapp/web/jenaIngest/mergeIndividuals.jsp                | 4 ++--
 webapp/web/jenaIngest/merge_result.jsp                    | 4 ++--
 webapp/web/jenaIngest/permanentURI.jsp                    | 4 ++--
 webapp/web/jenaIngest/renameBNodes.jsp                    | 4 ++--
 webapp/web/jenaIngest/renameResource.jsp                  | 4 ++--
 webapp/web/jenaIngest/renameResult.jsp                    | 4 ++--
 webapp/web/jenaIngest/smushSingleModel.jsp                | 4 ++--
 webapp/web/jenaIngest/sparqlConstruct.jsp                 | 2 +-
 webapp/web/jenaIngest/subtractModels.jsp                  | 4 ++--
 webapp/web/jenaIngest/xmlFileUpload.jsp                   | 2 +-
 webapp/web/jenaIngest/xmlFileUploadSuccess.jsp            | 2 +-
 webapp/web/siteAdmin/ontologyEditor.jsp                   | 2 +-
 webapp/web/templates/edit/specific/merge_result.jsp       | 4 ++--
 .../freemarker/body/siteAdmin/siteAdmin-dataInput.ftl     | 2 +-
 .../body/siteAdmin/siteAdmin-ontologyEditor.ftl           | 2 +-
 webapp/web/templates/parts/emailUsers.jsp                 | 4 ++--
 20 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/webapp/web/commentsForm.jsp b/webapp/web/commentsForm.jsp
index b3497d8fb..9a4d47f3d 100644
--- a/webapp/web/commentsForm.jsp
+++ b/webapp/web/commentsForm.jsp
@@ -64,8 +64,8 @@
 
 		<textarea name="s34gfd88p9x1" rows="10" cols="90"></textarea>
 		<div>
-  		<input type="submit" value="Send Mail" class="yellowbutton"/>
-  		<input type="reset" value="Clear Form" class="plainbutton"/>
+  		<input type="submit" id="submit" value="Send Mail" />
+  		<input type="reset" id="delete" value="Clear Form" />
 		</div
 
 		<p style="font-weight: bold; margin-top: 1em">Thank you!</p>
diff --git a/webapp/web/css/edit.css b/webapp/web/css/edit.css
index 63ac514ff..f226e73be 100644
--- a/webapp/web/css/edit.css
+++ b/webapp/web/css/edit.css
@@ -333,4 +333,12 @@ span.entityRelationsSpan {
 .hideFromVivoWeb {
     display: none;
     height: 0;
+}
+.notice{ 
+    padding: .8em; 
+    margin-bottom: 1em; 
+    border: 1px solid #ddd;
+    display: block;
+    background: #FFF6BF; 
+    color: #7F7034;
 }
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/csv2rdf.jsp b/webapp/web/jenaIngest/csv2rdf.jsp
index 0dc30cb1d..c5bc8bfcf 100644
--- a/webapp/web/jenaIngest/csv2rdf.jsp
+++ b/webapp/web/jenaIngest/csv2rdf.jsp
@@ -17,9 +17,9 @@
 
 %>
 
-    <p><a href="ingest">Ingest Home</a></p>
+    <h2><a href="ingest">Ingest Home</a></h2>
 
-    <h2>Convert CSV to RDF</h2>
+    <h3>Convert CSV to RDF</h3>
 
     <form action="csv2rdf" method="post" enctype="multipart/form-data">
         <input type="hidden" name="action" value="csv2rdf"/>
diff --git a/webapp/web/jenaIngest/listModels.jsp b/webapp/web/jenaIngest/listModels.jsp
index 644d1c0c7..a3e9f5770 100644
--- a/webapp/web/jenaIngest/listModels.jsp
+++ b/webapp/web/jenaIngest/listModels.jsp
@@ -26,9 +26,9 @@ function init(){
     }
 %>
 
-    <p><a href="ingest">Ingest Home</a></p>
+    <h2><a href="ingest">Ingest Home</a></h2>
 
-    <h2>Available Jena Models</h2>
+    <h3>Available Jena Models</h3>
     <table>
     <tr>
     <td>
diff --git a/webapp/web/jenaIngest/mergeIndividuals.jsp b/webapp/web/jenaIngest/mergeIndividuals.jsp
index 66d6119f6..2787de207 100644
--- a/webapp/web/jenaIngest/mergeIndividuals.jsp
+++ b/webapp/web/jenaIngest/mergeIndividuals.jsp
@@ -17,9 +17,9 @@
 <script type="text/javascript" src="js/jquery.js"></script>
 <script type="text/javascript" src="js/jenaIngest/ingestUtils.js"></script>
 
-<p><a href="ingest">Ingest Home</a></p>
+<h2><a href="ingest">Ingest Home</a></h2>
 
-<h2>Merge Individuals</h2>
+<h3>Merge Individuals</h3>
 
 <p>This tool allows two individuals with different URIs to be collapsed into a 
    single URI.  Any statements using the "duplicate individual URI" will be 
diff --git a/webapp/web/jenaIngest/merge_result.jsp b/webapp/web/jenaIngest/merge_result.jsp
index e3c469014..21a254e9f 100644
--- a/webapp/web/jenaIngest/merge_result.jsp
+++ b/webapp/web/jenaIngest/merge_result.jsp
@@ -3,9 +3,9 @@
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 <%@ page import="com.hp.hpl.jena.rdf.model.Model"%>
-<p><a href="ingest">Ingest Home</a></p>
+<h2><a href="ingest">Ingest Home</a></h2>
 
-<h2>Merge Individuals</h2>
+<h3>Merge Individuals</h3>
 <form action="ingest" method="get">
 <input type="hidden" name="action" value="mergeResult"/>
 <%String result = (String) request.getAttribute("result");%>
diff --git a/webapp/web/jenaIngest/permanentURI.jsp b/webapp/web/jenaIngest/permanentURI.jsp
index cbd522a34..13d9eef5d 100644
--- a/webapp/web/jenaIngest/permanentURI.jsp
+++ b/webapp/web/jenaIngest/permanentURI.jsp
@@ -15,9 +15,9 @@
 
 %>
 
-<p><a href="ingest">Ingest Home</a></p>
+<h2><a href="ingest">Ingest Home</a></h2>
 
-<h2>Assign Permanent URIs To Resources</h2>
+<h3>Assign Permanent URIs To Resources</h3>
 
 <p>This tool will rename the resources in the selected model to with new
 randomly-generated URIs following the pattern used in the main application.  
diff --git a/webapp/web/jenaIngest/renameBNodes.jsp b/webapp/web/jenaIngest/renameBNodes.jsp
index dc2cb7e6c..0726f493f 100644
--- a/webapp/web/jenaIngest/renameBNodes.jsp
+++ b/webapp/web/jenaIngest/renameBNodes.jsp
@@ -17,9 +17,9 @@
 
 %>
 
-    <p><a href="ingest">Ingest Home</a></p>
+    <h2><a href="ingest">Ingest Home</a></h2>
 
-    <h2>Convert Blank Nodes to Named Resources</h2>
+    <h3>Convert Blank Nodes to Named Resources</h3>
 
     <form action="ingest" method="get"i>
         <input type="hidden" name="action" value="renameBNodes"/>
diff --git a/webapp/web/jenaIngest/renameResource.jsp b/webapp/web/jenaIngest/renameResource.jsp
index b5c23dd59..1022ff3be 100644
--- a/webapp/web/jenaIngest/renameResource.jsp
+++ b/webapp/web/jenaIngest/renameResource.jsp
@@ -10,9 +10,9 @@
 <script type="text/javascript" src="js/jquery.js"></script>
 <script type="text/javascript" src="js/jenaIngest/ingestUtils.js"></script>
 
-<p><a href="ingest">Ingest Home</a></p>
+<h2><a href="ingest">Ingest Home</a></h2>
 
-<h2>Change Namespace of Resources</h2>
+<h3>Change Namespace of Resources</h3>
 
 <p>This tool will change all resources in the supplied "old namespace" 
 to be in the "new namespace."  Additionally, the local names will be updated
diff --git a/webapp/web/jenaIngest/renameResult.jsp b/webapp/web/jenaIngest/renameResult.jsp
index 8ead5cf4a..9e1490e13 100644
--- a/webapp/web/jenaIngest/renameResult.jsp
+++ b/webapp/web/jenaIngest/renameResult.jsp
@@ -3,8 +3,8 @@
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
-<p><a href="ingest">Ingest Home</a></p>
+<h2><a href="ingest">Ingest Home</a></h2>
 
-<h2>Rename Resource</h2>
+<h3>Rename Resource</h3>
 <%String result = (String) request.getAttribute("result");%>
 <p><b><%=result%></b></p>
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/smushSingleModel.jsp b/webapp/web/jenaIngest/smushSingleModel.jsp
index 23d6d779c..925c3e32b 100644
--- a/webapp/web/jenaIngest/smushSingleModel.jsp
+++ b/webapp/web/jenaIngest/smushSingleModel.jsp
@@ -17,9 +17,9 @@
 
 %>
 
-    <p><a href="ingest">Ingest Home</a></p>
+    <h2><a href="ingest">Ingest Home</a></h2>
 
-    <h2>Smush Resources</h2>
+    <h3>Smush Resources</h3>
 
     <form action="ingest" method="get"i>
         <input type="hidden" name="action" value="smushSingleModel"/>
diff --git a/webapp/web/jenaIngest/sparqlConstruct.jsp b/webapp/web/jenaIngest/sparqlConstruct.jsp
index 044b2c070..086f91114 100644
--- a/webapp/web/jenaIngest/sparqlConstruct.jsp
+++ b/webapp/web/jenaIngest/sparqlConstruct.jsp
@@ -26,7 +26,7 @@
 <%@page import="java.util.ArrayList"%><h2>Execute SPARQL CONSTRUCT
 Query</h2>
 
-<p><a href="ingest">Ingest Home</a></p>
+<h2><a href="ingest">Ingest Home</a></h2>
 
 <c:if test="${requestScope.constructedStmtCount != null}">
 	<h3 class="notice">${requestScope.constructedStmtCount} statements
diff --git a/webapp/web/jenaIngest/subtractModels.jsp b/webapp/web/jenaIngest/subtractModels.jsp
index eed495a6d..f113fabb1 100644
--- a/webapp/web/jenaIngest/subtractModels.jsp
+++ b/webapp/web/jenaIngest/subtractModels.jsp
@@ -17,9 +17,9 @@
 
 %>
 
-    <p><a href="ingest">Ingest Home</a></p>
+    <h2><a href="ingest">Ingest Home</a></h2>
 
-    <h2>Subtract One Model from Another</h2>
+    <h3>Subtract One Model from Another</h3>
 
     <form action="ingest" method="get"i>
         <input type="hidden" name="action" value="subtractModels"/>
diff --git a/webapp/web/jenaIngest/xmlFileUpload.jsp b/webapp/web/jenaIngest/xmlFileUpload.jsp
index d17cc799d..10274a80b 100644
--- a/webapp/web/jenaIngest/xmlFileUpload.jsp
+++ b/webapp/web/jenaIngest/xmlFileUpload.jsp
@@ -14,7 +14,7 @@
 
 %>
 
-    <p><a href="ingest">Ingest Home</a></p>
+    <h3><a href="ingest">Ingest Home</a></h3>
     
 
     <form action="jenaXmlFileUpload" method="post" enctype="multipart/form-data">
diff --git a/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp b/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp
index fc4b7d78c..c92ef6fab 100644
--- a/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp
+++ b/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp
@@ -12,6 +12,6 @@
 <p>Uploaded XML files and converted to RDF.</p>
 <p>Loaded <%= request.getAttribute("statementCount") %> statements to the model <%= request.getAttribute("targetModel") %>.</p>
 
-<p><a href="ingest">Ingest Home</a></p>
+<h2><a href="ingest">Ingest Home</a></h2>
        
     
diff --git a/webapp/web/siteAdmin/ontologyEditor.jsp b/webapp/web/siteAdmin/ontologyEditor.jsp
index 3f6ec5d01..83a957944 100644
--- a/webapp/web/siteAdmin/ontologyEditor.jsp
+++ b/webapp/web/siteAdmin/ontologyEditor.jsp
@@ -50,7 +50,7 @@
             <form id="verbosePropertyForm" action="${Controllers.SITE_ADMIN}#verbosePropertyForm" method="get">
                 <input type="hidden" name="verbose" value="${!verbosePropertyListing}" />
                 <span>Verbose property display for this session is <b>${verbosePropertyListing == true ? 'on' : 'off'}</b>.</span>
-                <input type="submit" value="Turn ${verbosePropertyListing == true ? 'off' : 'on'}" />
+                <input type="submit" id="submit" value="Turn ${verbosePropertyListing == true ? 'off' : 'on'}" />
             </form>   
 
     </div>               
diff --git a/webapp/web/templates/edit/specific/merge_result.jsp b/webapp/web/templates/edit/specific/merge_result.jsp
index 8176e8535..98ab69f9b 100644
--- a/webapp/web/templates/edit/specific/merge_result.jsp
+++ b/webapp/web/templates/edit/specific/merge_result.jsp
@@ -3,8 +3,8 @@
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
-<p><a href="ingest">Ingest Home</a></p>
+<h2><a href="ingest">Ingest Home</a></h2>
 
-<h2>Merge Individuals</h2>
+<h3>Merge Individuals</h3>
 <%String result = (String) request.getAttribute("result");%>
 <p><b><%=result%></b></p>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
index 56bd94334..bfb94af0c 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
@@ -14,7 +14,7 @@
                 <@form.optionGroups groups=dataInput.groupedClassOptions />
             </select>
             <input type="hidden" name="editform" value="newIndividualForm.jsp"/>
-            <input type="submit" class="add-action-button" value="Add individual of this class"/>
+            <input type="submit" id="submit" value="Add individual of this class"/>
         </form>
             
     </div>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
index 506a4326f..5f8e73207 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
@@ -37,7 +37,7 @@
         <form id="${formId}" action="${ontologyEditor.verbosePropertyForm.action}#${formId}" method="get">
             <input type="hidden" name="verbose" value="${ontologyEditor.verbosePropertyForm.verboseFieldValue}" />
             <span>Verbose property display for this session is <b>${ontologyEditor.verbosePropertyForm.currentValue}</b>.</span>
-            <input type="submit" value="Turn ${ontologyEditor.verbosePropertyForm.newValue}" />
+            <input type="submit" id="submit" value="Turn ${ontologyEditor.verbosePropertyForm.newValue}" />
         </form>  
          
     </div>                       
diff --git a/webapp/web/templates/parts/emailUsers.jsp b/webapp/web/templates/parts/emailUsers.jsp
index 489348f5a..75e437792 100644
--- a/webapp/web/templates/parts/emailUsers.jsp
+++ b/webapp/web/templates/parts/emailUsers.jsp
@@ -30,8 +30,8 @@
 
 		<textarea name="s34gfd88p9x1" rows="10" cols="90"></textarea>
 		<div>
-  		<input type="submit" value="Send Mail" class="yellowbutton"/>
-  		<input type="reset" value="Clear Form" class="plainbutton"/>
+  		<input type="submit" id="submit" value="Send Mail" />
+  		<input type="reset" id="delete" value="Clear Form" />
 		</div
 
 		<p style="font-weight: bold; margin-top: 1em">Thank you!</p>