Skip to content

CRUD buttons changed to be more compact and use glyphicons instead of vanilla famfamfam icons #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EugeneLoy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CRUD buttons changed to be more compact and use glyphicons instead of vanilla famfamfam icons #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fab150
CRUD buttons changed to be more compact and use glyphicons instead of…
EugeneLoy Feb 5, 2014
daddf54
Merge remote-tracking branch 'upstream/master' into glyphicons
EugeneLoy Sep 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/webapp/WEB-INF/tags/form/fields/reference.tagx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<spring:param name="form" />
</spring:url>

<dd><a href="${create_url}">
<spring:url value="/resources/images/add.png" var="create_img_url" />
<spring:message arguments="${field}" code="global_menu_new" var="add_message" htmlEscape="false" />
<img alt="${fn:escapeXml(add_message)}" src="${create_img_url}" title="${fn:escapeXml(add_message)}" />
<dd>
<spring:message arguments="${field}" code="global_menu_new" var="add_message" htmlEscape="false" />
<a href="${create_url}" alt="${fn:escapeXml(add_message)}" title="${fn:escapeXml(add_message)}" class="btn btn-xs btn-success">
<span class="glyphicon glyphicon-plus"></span>
</a>
<c:out value=" " />
<spring:message arguments="${label}" code="entity_not_found" />
Expand Down
22 changes: 10 additions & 12 deletions src/main/webapp/WEB-INF/tags/form/fields/table.tagx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,36 +94,35 @@
<c:set var="itemId"><spring:eval expression="item[typeIdFieldName]"/></c:set>
<td class="utilbox">
<spring:url value="${path}/${itemId}" var="show_form_url" />
<spring:url value="/resources/images/show.png" var="show_image_url" />
<spring:message arguments="${typeName}" code="entity_show" var="show_label" htmlEscape="false" />
<a href="${show_form_url}" alt="${fn:escapeXml(show_label)}" title="${fn:escapeXml(show_label)}">
<img alt="${fn:escapeXml(show_label)}" class="btn btn-info" src="${show_image_url}" title="${fn:escapeXml(show_label)}" />
<a href="${show_form_url}" alt="${fn:escapeXml(show_label)}" title="${fn:escapeXml(show_label)}" class="btn btn-xs btn-info">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
</td>
<c:if test="${update}">
<td class="utilbox">
<spring:url value="${path}/${itemId}" var="update_form_url">
<spring:param name="form" />
</spring:url>
<spring:url value="/resources/images/update.png" var="update_image_url" />
<spring:message arguments="${typeName}" code="entity_update" var="update_label" htmlEscape="false" />
<a href="${update_form_url}" alt="${fn:escapeXml(update_label)}" title="${fn:escapeXml(update_label)}">
<img alt="${fn:escapeXml(update_label)}" class="image btn btn-warning" src="${update_image_url}" title="${fn:escapeXml(update_label)}" />
<a href="${update_form_url}" alt="${fn:escapeXml(update_label)}" title="${fn:escapeXml(update_label)}" class="btn btn-xs btn-warning">
<span class="glyphicon glyphicon-edit"></span>
</a>
</td>
</c:if>
<c:if test="${delete}">
<td class="utilbox">
<spring:url value="${path}/${itemId}" var="delete_form_url" />
<spring:url value="/resources/images/delete.png" var="delete_image_url" />
<form:form action="${delete_form_url}" method="DELETE">
<spring:message arguments="${typeName}" code="entity_delete" var="delete_label" htmlEscape="false" />
<c:set var="delete_confirm_msg">
<spring:escapeBody javaScriptEscape="true">
<spring:message code="entity_delete_confirm" />
</spring:escapeBody>
</c:set>
<input alt="${fn:escapeXml(delete_label)}" class="btn btn-danger" src="${delete_image_url}" title="${fn:escapeXml(delete_label)}" type="image" value="${fn:escapeXml(delete_label)}" onclick="return confirm('${delete_confirm_msg}');" />
<button type="submit" title="${fn:escapeXml(delete_label)}" class="btn btn-xs btn-danger" onclick="return confirm('${fn:escapeXml(delete_confirm_msg)}');">
<span class="glyphicon glyphicon-trash"></span>
</button>
<c:if test="${not empty param.page}">
<input name="page" type="hidden" value="1" />
</c:if>
Expand All @@ -142,10 +141,9 @@
<spring:url value="${path}" var="create_url">
<spring:param name="form" />
</spring:url>
<a href="${create_url}">
<spring:url value="/resources/images/add.png" var="create_img_url" />
<spring:message arguments="${typeName}" code="global_menu_new" var="add_message" htmlEscape="false" />
<img alt="${fn:escapeXml(add_message)}" class="btn btn-success" src="${create_img_url}" title="${fn:escapeXml(add_message)}" />
<spring:message arguments="${typeName}" code="global_menu_new" var="add_message" htmlEscape="false" />
<a href="${create_url}" alt="${fn:escapeXml(add_message)}" title="${fn:escapeXml(add_message)}" class="btn btn-xs btn-success">
<span class="glyphicon glyphicon-plus-sign"></span>
</a>
</span>
<c:out value=" " />
Expand Down
20 changes: 9 additions & 11 deletions src/main/webapp/WEB-INF/tags/form/show.tagx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@
<span>
<c:if test="${delete}">
<spring:url value="${path}/${itemId}" var="delete_form_url" />
<spring:url value="/resources/images/delete.png" var="delete_image_url" />
<form:form action="${delete_form_url}" method="DELETE">
<spring:message arguments="${typeName}" code="entity_delete" var="delete_label" htmlEscape="false" />
<c:set var="delete_confirm_msg">
<spring:escapeBody javaScriptEscape="true">
<spring:message code="entity_delete_confirm" />
</spring:escapeBody>
</c:set>
<input alt="${fn:escapeXml(delete_label)}" class="image btn btn-danger" src="${delete_image_url}" title="${fn:escapeXml(delete_label)}" type="image" value="${fn:escapeXml(delete_label)}" onclick="return confirm('${fn:escapeXml(delete_confirm_msg)}');" />
<button type="submit" title="${fn:escapeXml(delete_label)}" class="btn btn-xs btn-danger" onclick="return confirm('${fn:escapeXml(delete_confirm_msg)}');">
<span class="glyphicon glyphicon-trash"></span>
</button>
</form:form>
</c:if>
</span>
Expand All @@ -63,10 +64,9 @@
<spring:url value="${path}/${itemId}" var="update_form_url">
<spring:param name="form" />
</spring:url>
<spring:url value="/resources/images/update.png" var="update_image_url" />
<spring:message arguments="${typeName}" code="entity_update" var="update_label" htmlEscape="false" />
<a href="${update_form_url}" alt="${fn:escapeXml(update_label)}" title="${fn:escapeXml(update_label)}">
<img alt="${fn:escapeXml(update_label)}" class="image btn btn-warning" src="${update_image_url}" title="${fn:escapeXml(update_label)}" />
<a href="${update_form_url}" alt="${fn:escapeXml(update_label)}" title="${fn:escapeXml(update_label)}" class="btn btn-xs btn-warning">
<span class="glyphicon glyphicon-edit"></span>
</a>
</c:if>
</span>
Expand All @@ -75,20 +75,18 @@
<spring:url value="${path}" var="create_form_url">
<spring:param name="form" />
</spring:url>
<spring:url value="/resources/images/create.png" var="create_image_url" />
<spring:message arguments="${typeName}" code="entity_create" var="create_label" htmlEscape="false" />
<a href="${create_form_url}" alt="${fn:escapeXml(create_label)}" title="${fn:escapeXml(create_label)}">
<img alt="${fn:escapeXml(create_label)}" class="image btn btn-success" src="${create_image_url}" title="${fn:escapeXml(create_label)}" />
<a href="${create_form_url}" alt="${fn:escapeXml(create_label)}" title="${fn:escapeXml(create_label)}" class="btn btn-xs btn-success">
<span class="glyphicon glyphicon-plus-sign"></span>
</a>
</c:if>
</span>
<span>
<c:if test="${list}">
<spring:url value="${path}" var="list_form_url" />
<spring:url value="/resources/images/list.png" var="list_image_url" />
<spring:message arguments="${typeNamePlural}" code="entity_list_all" var="list_label" htmlEscape="false" />
<a href="${list_form_url}" alt="${fn:escapeXml(list_label)}" title="${fn:escapeXml(list_label)}">
<img alt="${fn:escapeXml(list_label)}" class="image btn btn-info" src="${list_image_url}" title="${fn:escapeXml(list_label)}" />
<a href="${list_form_url}" alt="${fn:escapeXml(list_label)}" title="${fn:escapeXml(list_label)}" class="btn btn-xs btn-info">
<span class="glyphicon glyphicon-list"></span>
</a>
</c:if>
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/styles/roostrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.utilbox {width: 48px;}
.utilbox {width: 32px;}

body{ padding-top: 62px;}

Expand Down