hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-13 13:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved TwoBox layout and fix unbalanced <div>

Browse Source
This commit is contained in:
Andrea Bollini
2013-10-12 06:14:01 +02:00
parent b217397d9e
commit 7fcc4e3f11
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
dspace-jspui/src/main/webapp/submit/edit-metadata.jsp
View File

@@ -321,13 +321,13 @@
.append(' ') .append(' ')
.append(Utils.addEntities(dpn.getFirstNames())); .append(Utils.addEntities(dpn.getFirstNames()));
// put a remove button next to filled in values // put a remove button next to filled in values
sb.append("<button class=\"btn btn-danger\" name=\"submit_") sb.append("<button class=\"btn btn-danger col-md-2\" name=\"submit_")
.append(fieldName) .append(fieldName)
.append("_remove_") .append("_remove_")
.append(i) .append(i)
.append("\" value=\"") .append("\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove"))
.append("\"><span class=\"glyphicon glyphicon-trash\"></span></button>"); .append("\"><span class=\"glyphicon glyphicon-trash\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")+"</button>");
} }
else if (repeatable && !readonly && i == fieldCount - 1) else if (repeatable && !readonly && i == fieldCount - 1)
{ {
@@ -336,7 +336,7 @@
.append(fieldName) .append(fieldName)
.append("_add\" value=\"") .append("_add\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add"))
.append("\"><span class=\"glyphicon glyphicon-plus\"></span>"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>"); .append("\"><span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>");
} }
sb.append("</div>"); sb.append("</div>");
} }
@@ -434,13 +434,13 @@
if (repeatable && !readonly && i < defaults.length) if (repeatable && !readonly && i < defaults.length)
{ {
// put a remove button next to filled in values // put a remove button next to filled in values
sb.append("<button class=\"btn btn-danger\" name=\"submit_") sb.append("<button class=\"btn btn-danger col-md-2\" name=\"submit_")
.append(fieldName) .append(fieldName)
.append("_remove_") .append("_remove_")
.append(i) .append(i)
.append("\" value=\"") .append("\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove"))
.append("\"><span class=\"glyphicon glyphicon-trash\"></span></button>"); .append("\"><span class=\"glyphicon glyphicon-trash\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")+"</button>");
} }
else if (repeatable && !readonly && i == fieldCount - 1) else if (repeatable && !readonly && i == fieldCount - 1)
{ {
@@ -449,7 +449,7 @@
.append(fieldName) .append(fieldName)
.append("_add\" value=\"") .append("_add\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add"))
.append("\"><span class=\"glyphicon glyphicon-plus\"></span>"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>"); .append("\"><span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>");
} }
// put a blank if nothing else // put a blank if nothing else
sb.append("</div>"); sb.append("</div>");
@@ -515,13 +515,13 @@
if (repeatable && !readonly && i < defaults.length) if (repeatable && !readonly && i < defaults.length)
{ {
// put a remove button next to filled in values // put a remove button next to filled in values
sb.append("<button class=\"btn btn-danger\" name=\"submit_") sb.append("<button class=\"btn btn-danger col-md-2\" name=\"submit_")
.append(fieldName) .append(fieldName)
.append("_remove_") .append("_remove_")
.append(i) .append(i)
.append("\" value=\"") .append("\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove"))
.append("\"><span class=\"glyphicon glyphicon-trash\"></span></button>"); .append("\"><span class=\"glyphicon glyphicon-trash\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")+"</button>");
} }
else if (repeatable && !readonly && i == fieldCount - 1) else if (repeatable && !readonly && i == fieldCount - 1)
{ {
@@ -530,7 +530,7 @@
.append(fieldName) .append(fieldName)
.append("_add\" value=\"") .append("_add\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add"))
.append("\"><span class=\"glyphicon glyphicon-plus\"></span>"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>"); .append("\"><span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>");
} }
// put a blank if nothing else // put a blank if nothing else
@@ -590,13 +590,13 @@
if (repeatable && !readonly && i < defaults.length) if (repeatable && !readonly && i < defaults.length)
{ {
// put a remove button next to filled in values // put a remove button next to filled in values
sb.append("<button class=\"btn btn-danger\" name=\"submit_") sb.append("<button class=\"btn btn-danger col-md-2\" name=\"submit_")
.append(fieldName) .append(fieldName)
.append("_remove_") .append("_remove_")
.append(i) .append(i)
.append("\" value=\"") .append("\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove"))
.append("\"><span class=\"glyphicon glyphicon-trash\"></span></button>"); .append("\"><span class=\"glyphicon glyphicon-trash\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")+"</button>");
} }
else if (repeatable && !readonly && i == fieldCount - 1) else if (repeatable && !readonly && i == fieldCount - 1)
{ {
@@ -605,7 +605,7 @@
.append(fieldName) .append(fieldName)
.append("_add\" value=\"") .append("_add\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add"))
.append("\"><span class=\"glyphicon glyphicon-plus\"></span>"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>"); .append("\"><span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>");
} }
// put a blank if nothing else // put a blank if nothing else
@@ -670,13 +670,13 @@
if (repeatable && !readonly && i < defaults.length) if (repeatable && !readonly && i < defaults.length)
{ {
// put a remove button next to filled in values // put a remove button next to filled in values
sb.append("<button class=\"btn btn-danger\" name=\"submit_") sb.append("<button class=\"btn btn-danger col-md-2\" name=\"submit_")
.append(fieldName) .append(fieldName)
.append("_remove_") .append("_remove_")
.append(i) .append(i)
.append("\" value=\"") .append("\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove"))
.append("\"><span class=\"glyphicon glyphicon-trash\"></span></button>"); .append("\"><span class=\"glyphicon glyphicon-trash\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")+"</button>");
} }
else if (repeatable && !readonly && i == fieldCount - 1) else if (repeatable && !readonly && i == fieldCount - 1)
{ {
@@ -685,7 +685,7 @@
.append(fieldName) .append(fieldName)
.append("_add\" value=\"") .append("_add\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add"))
.append("\"><span class=\"glyphicon glyphicon-plus\"></span>"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>"); .append("\"><span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>");
} }
sb.append("</div>"); sb.append("</div>");
@@ -716,11 +716,8 @@
.append("</label>"); .append("</label>");
sb.append("<div class=\"col-md-10\">"); sb.append("<div class=\"col-md-10\">");
for (int i = 0; i < fieldCount; i++) for (int i = 0; i < fieldCount; i++)
{
if (i % 2 == 0)
{ {
sb.append("<div class=\"row col-md-12\">"); sb.append("<div class=\"row col-md-12\">");
}
if(i != fieldCount) if(i != fieldCount)
{ {
@@ -744,13 +741,16 @@
.append("\" /></span>"); .append("\" /></span>");
if (!readonly) if (!readonly)
{ {
sb.append("<button class=\"btn btn-danger\" name=\"submit_") sb.append("<button class=\"btn btn-danger col-md-2\" name=\"submit_")
.append(fieldName) .append(fieldName)
.append("_remove_") .append("_remove_")
.append(i) .append(i)
.append("\" value=\"") .append("\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove2")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove2"))
.append("\"><span class=\"glyphicon glyphicon-trash\"></span></button>"); .append("\"><span class=\"glyphicon glyphicon-trash\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")+"</button>");
}
else {
sb.append("<span class=\"col-md-2\">&nbsp;</span>");
} }
sb.append(doControlledVocabulary(fieldParam, pageContext, vocabulary, readonly)); sb.append(doControlledVocabulary(fieldParam, pageContext, vocabulary, readonly));
} }
@@ -762,6 +762,7 @@
.append((hasVocabulary(vocabulary)&&closedVocabulary) || readonly?" disabled=\"disabled\" ":"") .append((hasVocabulary(vocabulary)&&closedVocabulary) || readonly?" disabled=\"disabled\" ":"")
.append("/>") .append("/>")
.append("</span>\n") .append("</span>\n")
.append("<span class=\"col-md-2\">&nbsp;</span>")
.append(doControlledVocabulary(fieldParam, pageContext, vocabulary, readonly)); .append(doControlledVocabulary(fieldParam, pageContext, vocabulary, readonly));
} }
@@ -789,17 +790,18 @@
.append("/></span>"); .append("/></span>");
if (!readonly) if (!readonly)
{ {
sb.append(" <button class=\"btn btn-danger\" name=\"submit_") sb.append(" <button class=\"btn btn-danger col-md-2\" name=\"submit_")
.append(fieldName) .append(fieldName)
.append("_remove_") .append("_remove_")
.append(i) .append(i)
.append("\" value=\"") .append("\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove2")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove2"))
.append("\"><span class=\"glyphicon glyphicon-trash\"></span></button>"); .append("\"><span class=\"glyphicon glyphicon-trash\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")+"</button>");
} }
else {
sb.append(doControlledVocabulary(fieldParam, pageContext, vocabulary, readonly)) sb.append("<span class=\"col-md-2\">&nbsp;</span>");
.append("</div>\n"); }
sb.append(doControlledVocabulary(fieldParam, pageContext, vocabulary, readonly));
} }
else else
{ {
@@ -816,16 +818,12 @@
.append(fieldName) .append(fieldName)
.append("_add\" value=\"") .append("_add\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add"))
.append("\"><span class=\"glyphicon glyphicon-plus\"></span></button>\n"); .append("\"><span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>\n");
}
} }
if (i % 2 == 0)
{
sb.append("</div>"); sb.append("</div>");
} }
} sb.append("</div></div><br/>");
}
sb.append("</div></div></div><br/>");
out.write(sb.toString()); out.write(sb.toString());
} }
@@ -919,13 +917,13 @@
if (repeatable && !readonly && j < defaults.length) if (repeatable && !readonly && j < defaults.length)
{ {
// put a remove button next to filled in values // put a remove button next to filled in values
sb.append("<button class=\"btn btn-danger\" name=\"submit_") sb.append("<button class=\"btn btn-danger col-md-2\" name=\"submit_")
.append(fieldName) .append(fieldName)
.append("_remove_") .append("_remove_")
.append(j) .append(j)
.append("\" value=\"") .append("\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove"))
.append("\"><span class=\"glyphicon glyphicon-trash\"></span></button>"); .append("\"><span class=\"glyphicon glyphicon-trash\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove")+"</button>");
} }
else if (repeatable && !readonly && j == fieldCount - 1) else if (repeatable && !readonly && j == fieldCount - 1)
{ {
@@ -935,7 +933,7 @@
// .append("_add\" value=\"Add More\"/> </td></tr>"); // .append("_add\" value=\"Add More\"/> </td></tr>");
.append("_add\" value=\"") .append("_add\" value=\"")
.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")) .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add"))
.append("\"><span class=\"glyphicon glyphicon-plus\"></span>"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>"); .append("\"><span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;"+LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.add")+"</button>");
} }
// put a blank if nothing else // put a blank if nothing else
@@ -1355,6 +1353,7 @@
<input class="btn btn-primary col-md-6" type="submit" name="<%=AbstractProcessingStep.NEXT_BUTTON%>" value="<fmt:message key="jsp.submit.edit-metadata.next"/>"/> <input class="btn btn-primary col-md-6" type="submit" name="<%=AbstractProcessingStep.NEXT_BUTTON%>" value="<fmt:message key="jsp.submit.edit-metadata.next"/>"/>
<% } %> <% } %>
</div><br/> </div><br/>
</div>
</form> </form>
</dspace:layout> </dspace:layout>