Restyling embargo jsp and tag class

dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/AccessSettingTag.java

@@ -128,19 +128,19 @@ public class AccessSettingTag extends TagSupport
             if (!advanced) {
                 disabled = "";
             }
-
-            sb.append("<center>\n");
-            sb.append("<table class=\"miscTable\" width=\"80%\">\n");
+                        
             if (embargo)
             {
                 // Name
-                sb.append("<tr><th class=\"accessOdd\">").append(label_name).append("</th>\n");
-                sb.append("<td class=\"accessOdd\">");
-                sb.append("<input name=\"name\" id=\"policy_name\" type=\"text\" value=\"").append(name).append("\" />\n");
-                sb.append("</td></tr>\n");
+            	sb.append("<div class=\"form-group\">");
+                sb.append(label_name).append("\n");                
+                sb.append("<input class=\"form-control\" name=\"name\" id=\"policy_name\" type=\"text\" value=\"").append(name).append("\" />\n");
+                sb.append("</div>"); 
+                		
                 // Group
-                sb.append("<tr><th class=\"accessEven\">").append(label_group).append("</th>\n");
-                sb.append("<td class=\"accessEven\"><select name=\"group_id\" id=\"select_group\">\n");
+                sb.append("<div class=\"form-group\">");
+                sb.append(label_group).append("\n");
+                sb.append("<select class=\"form-control\" name=\"group_id\" id=\"select_group\">\n");
 
                 Group[] groups = getGroups(context, hrq, subInfo);
                 if (groups != null)
@@ -159,12 +159,16 @@ public class AccessSettingTag extends TagSupport
                     sb.append("<option value=\"0\" selected=\"selected\">Anonymous</option>\n");
                 }
                 sb.append("</select>\n");
-                sb.append("</td></tr>\n");
+                sb.append("</div>"); 
                 // Select open or embargo
-                sb.append("<tr><th class=\"accessOdd\">").append(label_embargo).append("</th>\n");
-                sb.append("<td class=\"accessOdd\"><label><input name=\"open_access_radios\" type=\"radio\" value=\"0\"").append(radio0Checked).append(" />").append(radio0).append("</label>\n");
+                sb.append(label_embargo).append("\n");
+                sb.append("<div class=\"radio\">");                
+                sb.append("<label><input name=\"open_access_radios\" type=\"radio\" value=\"0\"").append(radio0Checked).append(" />").append(radio0).append("</label>\n");
+                sb.append("</div>");
+                sb.append("<div class=\"radio\">");  
                 sb.append("<label><input name=\"open_access_radios\" type=\"radio\" value=\"1\"").append(radio1Checked).append(" />").append(radio1).append("</label>\n");
-                sb.append("</td></tr>\n");
+                sb.append("</div>");
+                 
             }
 
             // Embargo Date
@@ -175,26 +179,24 @@ public class AccessSettingTag extends TagSupport
             }
             else
             {
-                sb.append("<tr><th class=\"accessEven\">").append(label_date).append("</th>\n");
-                sb.append("<td class=\"accessEven\">\n");
-                sb.append("<input name=\"embargo_until_date\" id=\"embargo_until_date\" type=\"text\" value=\"").append(startDate).append("\"").append(disabled).append(" />\n");;
-                sb.append(radio_help);
-                sb.append("</td></tr>\n");
-                // Reason
-                sb.append("<tr>\n");
-                sb.append("<th class=\"accessOdd\">").append(label_reason).append("</th>\n");
-                sb.append("<td class=\"accessOdd\"><textarea name=\"reason\" id=\"reason\" cols=\"30\" rows=\"5\"").append(disabled).append(">").append(reason).append("</textarea>\n");
-                sb.append("</td></tr>\n");
+            	sb.append("<div class=\"form-group\">");
+            	sb.append(label_date).append("\n");                
+                sb.append("<input class=\"form-control\" name=\"embargo_until_date\" id=\"embargo_until_date\" type=\"text\" value=\"").append(startDate).append("\"").append(disabled).append(" />\n");;
+                sb.append("<span class=\"help-block\">"+radio_help+"</span></br>");                
+                // Reason                
+                sb.append(label_reason).append("\n");                
+                sb.append("<textarea class=\"form-control\" name=\"reason\" id=\"reason\" cols=\"30\" rows=\"5\"").append(disabled).append(">").append(reason).append("</textarea>\n");
+                sb.append("</div>");
             }
 
             // Add policy button
             if (addpolicy)
             {
-                sb.append("<tr>\n");
-                sb.append("<td class=\"accessOdd\" colspan=\"2\" align=\"center\"><input name=\"submit_add_policy\" type=\"submit\" value=\"").append(button_confirm).append("\" />\n");
-                sb.append("</</td></tr>\n");
+                
+                sb.append("<input class=\"btn btn-primary col-md-offset-5\" name=\"submit_add_policy\" type=\"submit\" value=\"").append(button_confirm).append("\" />\n");
+                
             }
-            sb.append("</table></center>\n");
+            
 
             out.println(sb.toString());
         }

dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/PoliciesListTag.java

@@ -59,8 +59,7 @@ public class PoliciesListTag extends TagSupport
             Context context = UIUtil.obtainContext(hrq);
 
             sb.append("<center>\n");
-            sb.append("<table class=\"miscTable\">\n");
-            sb.append("<table class=\"miscTable\">\n");
+            sb.append("<table class=\"table\">\n");            
             sb.append("<tr>\n");
             sb.append("<th class=\"accessHeadOdd\">").append(label_name).append("</th>\n");
             sb.append("<th class=\"accessHeadEven\">").append(label_action).append("</th>\n");
@@ -90,7 +89,7 @@ public class PoliciesListTag extends TagSupport
                     sb.append("<td class=\"access").append(column2).append("\">").append(startDate).append("</td>\n");
                     sb.append("<td class=\"access").append(column1).append("\">").append(endDate).append("</td>\n");
                     sb.append("<td class=\"accessButton\">\n");
-                    sb.append("<input name=\"submit_edit_edit_policies_").append(policy.getID()).append("\" type=\"submit\" value=\"Edit\" /> <input name=\"submit_delete_edit_policies_").append(policy.getID()).append("\" type=\"submit\" value=\"Remove\" />\n");
+                    sb.append("<input class=\"btn btn-primary\" name=\"submit_edit_edit_policies_").append(policy.getID()).append("\" type=\"submit\" value=\"Edit\" /> <input class=\"btn btn-danger\" name=\"submit_delete_edit_policies_").append(policy.getID()).append("\" type=\"submit\" value=\"Remove\" />\n");
                     sb.append("</td></tr>\n");
                 }
             }

dspace-jspui/src/main/webapp/submit/access-step.jsp

@@ -53,7 +53,7 @@
 
 %>
 
-<dspace:layout locbar="off" navbar="off" titlekey="jsp.submit.access.title" nocache="true">
+<dspace:layout style="submission" locbar="off" navbar="off" titlekey="jsp.submit.access.title" nocache="true">
 
     <form action="<%= request.getContextPath() %>/submit" method="post" onkeydown="return disableEnterKey(event);">
 
@@ -72,52 +72,36 @@
     if (advanced)
     {
 %>
-		<h1><fmt:message key="jsp.submit.access.plist.heading"/></h1>
+		<h2 class="alert alert-info"><fmt:message key="jsp.submit.access.plist.heading"/></h2>
 
         <dspace:policieslist policies="<%= policies %>" />
 <%
     }
 %>
 
-		<h1><fmt:message key="jsp.submit.access.access_setting.heading"/></h1>
+		<h2 class="alert alert-info"><fmt:message key="jsp.submit.access.access_setting.heading"/></h2>
 
-        <h2 class="access-setting"><fmt:message key="jsp.submit.access.private_setting.heading"/></h2>
+        <h3 class="access-setting"><fmt:message key="jsp.submit.access.private_setting.heading"/></h3>
 
-        <center>
-            <table class="miscTable" width="80%">
-                <tr id="private_setting">
-                    <th class="accessOdd" align="left" style="padding-right: 10px"><fmt:message key="jsp.submit.access.private_setting.label"/></th>
-                    <td class="accessOdd"><input id="private_option" name="private_option" type="checkbox" value="1" <%= discoverableChecked %>/>&nbsp;<fmt:message key="jsp.submit.access.private_setting.help"/></td>
-                </tr>
-            </table>
-        </center>
+		<div class="form-group">
+			<div class="input-group-addon">
+            	<label for="private_option"><fmt:message key="jsp.submit.access.private_setting.label"/></label>
+				<input class="form-control" id="private_option" name="private_option" type="checkbox" value="1" <%= discoverableChecked %>/><span class="help-block"><fmt:message key="jsp.submit.access.private_setting.help"/></span>
+			</div>
+		</div>
 
-        <h2 class="access-setting"><fmt:message key="jsp.submit.access.embargo_setting.heading"/></h2>
+        <h3 class="access-setting"><fmt:message key="jsp.submit.access.embargo_setting.heading"/></h3>
 
         <dspace:access-setting subInfo="<%= subInfo %>" dso="<%= subInfo.getSubmissionItem().getItem() %>" embargo="<%= advanced ? true : false %>" addpolicy="<%= advanced ? true : false %>" />
 
-        <center>
-            <table class="miscTable">
 
 		<%-- Hidden fields needed for SubmissionController servlet to know which step is next--%>
         <%= SubmissionController.getSubmissionParameters(context, request) %>
-        <center>
-            <table border="0" width="80%">
-                <tr>
-					<td width="100%">&nbsp;</td>
-                    <td>
-                        <input type="submit" name="<%=AbstractProcessingStep.PREVIOUS_BUTTON%>" value="<fmt:message key="jsp.submit.general.previous"/>" />
-                    </td>
-                    <td>
-                        <input type="submit" name="<%=AbstractProcessingStep.NEXT_BUTTON%>" value="<fmt:message key="jsp.submit.general.next"/>" />
-                    </td>
-                    <td>&nbsp;&nbsp;&nbsp;</td>
-                    <td align="right">
-                        <input type="submit" name="<%=AbstractProcessingStep.CANCEL_BUTTON%>" value="<fmt:message key="jsp.submit.general.cancel-or-save.button"/>" />
-                    </td>
-                </tr>
-            </table>
-        </center>
+			<div class="btn-group pull-right col-md-offset-5">
+				<input class="btn btn-default" type="submit" name="<%=AbstractProcessingStep.PREVIOUS_BUTTON%>" value="<fmt:message key="jsp.submit.general.previous"/>" />                
+                <input class="btn btn-default" type="submit" name="<%=AbstractProcessingStep.CANCEL_BUTTON%>" value="<fmt:message key="jsp.submit.general.cancel-or-save.button"/>" />
+                <input class="btn btn-success" type="submit" name="<%=AbstractProcessingStep.NEXT_BUTTON%>" value="<fmt:message key="jsp.submit.general.next"/>" />
+			</div>
     </form>
 
     <script type="text/javascript" src="<%= request.getContextPath() %>/submit/access-step.js"></script>

dspace-jspui/src/main/webapp/submit/edit-bitstream-access.jsp

@@ -53,7 +53,7 @@
 
 %>
 
-<dspace:layout locbar="off" navbar="off" titlekey="jsp.submit.edit-bitstream-access.title" nocache="true">
+<dspace:layout style="submission" locbar="off" navbar="off" titlekey="jsp.submit.edit-bitstream-access.title" nocache="true">
 
     <form action="<%= request.getContextPath() %>/submit" method="post" onkeydown="return disableEnterKey(event);">
 
@@ -72,36 +72,24 @@
     if (advanced)
     {
 %>
-		<h1><fmt:message key="jsp.submit.access.plist.heading"/></h1>
+		<h2 class="alert alert-info"><fmt:message key="jsp.submit.access.plist.heading"/></h2>
 
         <dspace:policieslist policies="<%= policies %>" />
 <%
     }
 %>
 
-		<h1><fmt:message key="jsp.submit.edit-bitstream-access.heading"/></h1>
+		<h2 class="alert alert-info"><fmt:message key="jsp.submit.edit-bitstream-access.heading"/></h2>
         
         <dspace:access-setting subInfo="<%= subInfo %>" dso="<%= subInfo.getBitstream() %>" embargo="<%= advanced ? true : false %>" addpolicy="<%= advanced ? true : false %>" />
 
-        <center>
-            <table class="miscTable">
 
 		<%-- Hidden fields needed for SubmissionController servlet to know which step is next--%>
         <%= SubmissionController.getSubmissionParameters(context, request) %>
-        <center>
-            <table border="0" width="80%">
-                <tr>
-					<td width="100%">&nbsp;</td>
-                    <td>
-                        <input type="submit" name="submit_save" value="<fmt:message key="jsp.submit.edit-bitstream-access.save.button"/>" />
-                    </td>
-                    <td>&nbsp;&nbsp;&nbsp;</td>
-                    <td align="right">
-                        <input type="submit" name="submit_edit_cancel" value="<fmt:message key="jsp.submit.general.cancel"/>" />
-                    </td>
-                </tr>
-            </table>
-        </center>
+    		<div class="btn-group pull-right col-md-offset-5">
+    			<input class="btn btn-success" type="submit" name="submit_save" value="<fmt:message key="jsp.submit.edit-bitstream-access.save.button"/>" />
+                <input class="btn btn-default" type="submit" name="submit_edit_cancel" value="<fmt:message key="jsp.submit.general.cancel"/>" />
+			</div>
     </form>
 
     <script type="text/javascript" src="<%= request.getContextPath() %>/submit/access-step.js"></script>

dspace-jspui/src/main/webapp/submit/edit-policy.jsp

@@ -45,7 +45,7 @@
 
 %>
 
-<dspace:layout locbar="off" navbar="off" titlekey="jsp.submit.access.title" nocache="true">
+<dspace:layout style="submission" locbar="off" navbar="off" titlekey="jsp.submit.access.title" nocache="true">
 
     <form action="<%= request.getContextPath() %>/submit" method="post" onkeydown="return disableEnterKey(event);">
 
@@ -55,26 +55,13 @@
 
         <dspace:access-setting subInfo="<%= subInfo %>" rp="<%= rp %>" embargo="true" />
 
-        <center>
-            <table class="miscTable">
-
 		<%-- Hidden fields needed for SubmissionController servlet to know which step is next--%>
         <%= SubmissionController.getSubmissionParameters(context, request) %>
         <input type="hidden" name="policy_id" value="<%= rp.getID() %>" />
-        <center>
-            <table border="0" width="80%">
-                <tr>
-					<td width="100%">&nbsp;</td>
-                    <td>
-                        <input type="submit" name="submit_save" value="<fmt:message key="jsp.submit.general.save"/>" />
-                    </td>
-                    <td>&nbsp;</td>
-                    <td align="right">
-                        <input type="submit" name="submit_edit_cancel" value="<fmt:message key="jsp.submit.general.cancel"/>" />
-                    </td>
-                </tr>
-            </table>
-        </center>
+        <div class="btn-group pull-right col-md-offset-5">
+			<input class="btn btn-success" type="submit" name="submit_save" value="<fmt:message key="jsp.submit.general.save"/>" />
+			<input class="btn btn-default" type="submit" name="submit_edit_cancel" value="<fmt:message key="jsp.submit.general.cancel"/>" />
+		</div>
     </form>
 
     <script type="text/javascript" src="<%= request.getContextPath() %>/submit/access-step.js"></script>