-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added buton class to a tag, clean up btn css, added unstyled button c…
…lass
- Loading branch information
1 parent
d3e8dcc
commit d696f63
Showing
11 changed files
with
184 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
java/code/src/com/suse/manager/webui/templates/groups/custom.jade
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
java/code/src/com/suse/manager/webui/templates/groups/formula.jade
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
java/code/src/com/suse/manager/webui/templates/groups/formulas.jade
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
java/code/src/com/suse/manager/webui/templates/groups/highstate.jade
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
java/code/src/com/suse/manager/webui/templates/groups/recurring-actions.jade
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 9 additions & 1 deletion
10
java/code/src/com/suse/manager/webui/templates/minion/minion-header.jade
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,127 +1,169 @@ | ||
| <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> | ||
| <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> | ||
| <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> | ||
| <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> | ||
| <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> | ||
| <html> | ||
| <head> | ||
| </head> | ||
| <body> | ||
| <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> | ||
| <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> | ||
| <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> | ||
| <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> | ||
| <html> | ||
|
|
||
| <%@ include file="/WEB-INF/pages/common/fragments/groups/header.jspf" %> | ||
| <head> | ||
| </head> | ||
|
|
||
| <div class="row-0"> | ||
| <div class="col-md-6"> | ||
| <div class="panel panel-default"> | ||
| <body> | ||
|
|
||
| <div class="panel-heading"> | ||
| <h3><bean:message key="systemgroup.details.status"/></h3> | ||
| </div> | ||
| <%@ include file="/WEB-INF/pages/common/fragments/groups/header.jspf" %> | ||
|
|
||
| <div class="panel-body"> | ||
| <table class="table"> | ||
| <tr> | ||
| <th><bean:message key="systemgroup.details.updates"/></th> | ||
| <td> | ||
| <div class="system-status"> | ||
| <c:choose> | ||
| <c:when test="${errata_counts['se'] > 0}"> | ||
| <rhn:icon type="system-crit" /> | ||
| </c:when> | ||
| <c:when test="${(errata_counts['se'] == 0) && (errata_counts['be'] > 0 || errata_counts['ee'] > 0 || errata_counts['op'] > 0)}"> | ||
| <rhn:icon type="system-warn" /> | ||
| </c:when> | ||
| <c:otherwise> | ||
| <rhn:icon type="system-ok" /> | ||
| </c:otherwise> | ||
| </c:choose> | ||
| <c:choose> | ||
| <c:when test="${errata_counts['se'] == 0 && errata_counts['be'] == 0 && errata_counts['ee'] == 0 && errata_counts['op'] == 0}"> | ||
| <bean:message key="systemgroup.details.noupdates"/> | ||
| </c:when> | ||
| <c:otherwise> | ||
| <bean:message key="systemgroup.details.someupdates"/> | ||
| <c:if test="${errata_counts['se'] > 0}"> | ||
| <bean:message key="systemgroup.details.updates.critical" arg0="/rhn/groups/ListErrata.do?sgid=${id}" arg1="${errata_counts['se']}"/> | ||
| </c:if> | ||
| <c:if test="${errata_counts['be'] > 0 || errata_counts['ee'] > 0 || errata_counts['op'] > 0}"> | ||
| <bean:message key="systemgroup.details.updates.noncritical" arg0="/rhn/groups/ListErrata.do?sgid=${id}" arg1="${errata_counts['be'] + errata_counts['ee'] + errata_counts['op']}"/> | ||
| </c:if> | ||
| </c:otherwise> | ||
| </c:choose> | ||
| </div> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <th><bean:message key="systemgroup.details.admins"/></th> | ||
| <td> | ||
| <c:if test="${admin_count > 0}"> | ||
| ${admin_count} <bean:message key="systemgroup.details.admincount"/> | ||
| </c:if> | ||
| <c:if test="${admin_count == 0}"> | ||
| <span class="no-details"><bean:message key="systemgroup.details.none"/></span> | ||
| </c:if> | ||
| <rhn:require acl="user_role(system_group_admin)"> | ||
| <br /> | ||
| <a href="/rhn/groups/AdminList.do?sgid=${id}" class="js-spa"><bean:message key="systemgroup.details.manageadmins"/></a> | ||
| </rhn:require> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <th><bean:message key="systemgroup.details.systems"/></th> | ||
| <td> | ||
| <c:if test="${system_count > 0}"> | ||
| <a href="/rhn/groups/ListRemoveSystems.do?sgid=${id}" class="js-spa"> | ||
| <bean:message key="systemgroup.details.systems.systems" arg0="${system_count}"/> | ||
| </a> | ||
| </c:if> | ||
| <c:if test="${system_count == 0}"> | ||
| <span class="no-details"><bean:message key="systemgroup.details.none"/></span> | ||
| </c:if> | ||
| </td> | ||
| </tr> | ||
| <rhn:require acl="user_role(system_group_admin)"> | ||
| <tr> | ||
| <th><bean:message key="systemgroup.details.states"/></th> | ||
| <td> | ||
| <c:if test="${minion_count > 0}"> | ||
| <bean:message key="systemgroup.details.states.apply" arg0="${minion_count}" arg1="/rhn/manager/groups/details/highstate?sgid=${id}"/> | ||
| </c:if> | ||
| <c:if test="${minion_count == 0}"> | ||
| <bean:message key="systemgroup.details.none"/> | ||
| </c:if> | ||
| </td> | ||
| </tr> | ||
| </rhn:require> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="row-0"> | ||
| <div class="col-md-6"> | ||
| <div class="panel panel-default"> | ||
|
|
||
| <div class="col-md-6"> | ||
| <div class="panel panel-default"> | ||
| <div class="panel-heading"> | ||
| <h3><bean:message key="systemgroup.details.properties"/> | ||
| <rhn:require acl="user_role(system_group_admin)"> | ||
| (<a href="/rhn/groups/EditGroup.do?sgid=${id}" class="js-spa"><bean:message key="systemgroup.details.editproperties"/></a>) | ||
| </rhn:require></h3> | ||
| </div> | ||
| <div class="panel-heading"> | ||
| <h3> | ||
| <bean:message key="systemgroup.details.status" /> | ||
| </h3> | ||
| </div> | ||
|
|
||
| <div class="panel-body"> | ||
| <table class="table"> | ||
| <tr> | ||
| <th><bean:message key="systemgroup.details.name"/></th> | ||
| <td><c:out value="${name}" /></td> | ||
| </tr> | ||
| <tr> | ||
| <th valign="top"><bean:message key="systemgroup.details.description"/></th> | ||
| <td><c:out value="${description}" /></td> | ||
| </tr> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <table class="table"> | ||
| <tr> | ||
| <th> | ||
| <bean:message key="systemgroup.details.updates" /> | ||
| </th> | ||
| <td> | ||
| <div class="system-status"> | ||
| <c:choose> | ||
| <c:when test="${errata_counts['se'] > 0}"> | ||
| <rhn:icon type="system-crit" /> | ||
| </c:when> | ||
| <c:when | ||
| test="${(errata_counts['se'] == 0) && (errata_counts['be'] > 0 || errata_counts['ee'] > 0 || errata_counts['op'] > 0)}"> | ||
| <rhn:icon type="system-warn" /> | ||
| </c:when> | ||
| <c:otherwise> | ||
| <rhn:icon type="system-ok" /> | ||
| </c:otherwise> | ||
| </c:choose> | ||
| <c:choose> | ||
| <c:when | ||
| test="${errata_counts['se'] == 0 && errata_counts['be'] == 0 && errata_counts['ee'] == 0 && errata_counts['op'] == 0}"> | ||
| <bean:message key="systemgroup.details.noupdates" /> | ||
| </c:when> | ||
| <c:otherwise> | ||
| <bean:message key="systemgroup.details.someupdates" /> | ||
| <c:if test="${errata_counts['se'] > 0}"> | ||
| <bean:message key="systemgroup.details.updates.critical" | ||
| arg0="/rhn/groups/ListErrata.do?sgid=${id}" arg1="${errata_counts['se']}" /> | ||
| | ||
| </c:if> | ||
| <c:if | ||
| test="${errata_counts['be'] > 0 || errata_counts['ee'] > 0 || errata_counts['op'] > 0}"> | ||
| <bean:message key="systemgroup.details.updates.noncritical" | ||
| arg0="/rhn/groups/ListErrata.do?sgid=${id}" | ||
| arg1="${errata_counts['be'] + errata_counts['ee'] + errata_counts['op']}" /> | ||
| </c:if> | ||
| </c:otherwise> | ||
| </c:choose> | ||
| </div> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <th> | ||
| <bean:message key="systemgroup.details.admins" /> | ||
| </th> | ||
| <td> | ||
| <c:if test="${admin_count > 0}"> | ||
| ${admin_count} | ||
| <bean:message key="systemgroup.details.admincount" /> | ||
| </c:if> | ||
| <c:if test="${admin_count == 0}"> | ||
| <span class="no-details"> | ||
| <bean:message key="systemgroup.details.none" /> | ||
| </span> | ||
| </c:if> | ||
| <rhn:require acl="user_role(system_group_admin)"> | ||
| <br /> | ||
| <a href="/rhn/groups/AdminList.do?sgid=${id}" class="js-spa"> | ||
| <bean:message key="systemgroup.details.manageadmins" /> | ||
| </a> | ||
| </rhn:require> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <th> | ||
| <bean:message key="systemgroup.details.systems" /> | ||
| </th> | ||
| <td> | ||
| <c:if test="${system_count > 0}"> | ||
| <a href="/rhn/groups/ListRemoveSystems.do?sgid=${id}" class="js-spa"> | ||
| <bean:message key="systemgroup.details.systems.systems" arg0="${system_count}" /> | ||
| </a> | ||
| </c:if> | ||
| <c:if test="${system_count == 0}"> | ||
| <span class="no-details"> | ||
| <bean:message key="systemgroup.details.none" /> | ||
| </span> | ||
| </c:if> | ||
| </td> | ||
| </tr> | ||
| <rhn:require acl="user_role(system_group_admin)"> | ||
| <tr> | ||
| <th> | ||
| <bean:message key="systemgroup.details.states" /> | ||
| </th> | ||
| <td> | ||
| <c:if test="${minion_count > 0}"> | ||
| <bean:message key="systemgroup.details.states.apply" arg0="${minion_count}" | ||
| arg1="/rhn/manager/groups/details/highstate?sgid=${id}" /> | ||
| </c:if> | ||
| <c:if test="${minion_count == 0}"> | ||
| <bean:message key="systemgroup.details.none" /> | ||
| </c:if> | ||
| </td> | ||
| </tr> | ||
| </rhn:require> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </body> | ||
| </html> | ||
| <div class="col-md-6"> | ||
| <div class="panel panel-default"> | ||
| <div class="panel-heading"> | ||
| <h3> | ||
| <bean:message key="systemgroup.details.properties" /> | ||
| <rhn:require acl="user_role(system_group_admin)"> | ||
| <a href="/rhn/groups/EditGroup.do?sgid=${id}" | ||
| title="<bean:message key='systemgroup.details.editproperties' />" role="button" | ||
| class="js-spa btn-unstyled pull-right"> | ||
| <rhn:icon type="item-edit" /> | ||
| </a> | ||
| </rhn:require> | ||
| </h3> | ||
| </div> | ||
|
|
||
| <div class="panel-body"> | ||
| <table class="table"> | ||
| <tr> | ||
| <th> | ||
| <bean:message key="systemgroup.details.name" /> | ||
| </th> | ||
| <td> | ||
| <c:out value="${name}" /> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <th valign="top"> | ||
| <bean:message key="systemgroup.details.description" /> | ||
| </th> | ||
| <td> | ||
| <c:out value="${description}" /> | ||
| </td> | ||
| </tr> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </body> | ||
|
|
||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -221,7 +221,6 @@ | |
|
|
||
| .panel-heading, | ||
| th { | ||
| .btn, | ||
| .btn-link, | ||
| a:not(.btn-unstyled) { | ||
| border: none; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.