java/buildconf/apidoc/html/handler.txt | 2 - java/buildconf/apidoc/jsp/handler.txt | 6 ---- java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 14 +++++----- java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 6 ++-- java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp | 6 ++-- java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp | 4 +- java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp | 8 ++--- 7 files changed, 22 insertions(+), 24 deletions(-)
New commits: commit d9a57965cb62592c593903c120e0831fa822532e Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 15:10:05 2013 +0100
bootstrap tuning: fixed help icon
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp index ed7597f..a7e639f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp @@ -13,7 +13,7 @@ <h2><bean:message key="system.jsp.customkey.createtitle"/></h2> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_blank" class="help-title"> - <i class="fa fa-question-circle" title="Help Icon"></i> + <span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span> </a> </div> <p> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp index 847cc71..668f9c6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp @@ -17,7 +17,7 @@
<a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_new" class="help-title"> - <i class="fa fa-question-circle" title="Help Icon"></i> + <span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span> </a> </div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp index f7c1885..c509a0c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp @@ -17,7 +17,7 @@ <bean:message key="system.jsp.customkey.updatetitle"/>
<a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_blank" class="help-title"> - <i class="fa fa-question-circle" title="Help icon"></i> + <span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span> </a> </div>
commit 1d0164d33317ff5f62dafdf48a2bb6310d204a9a Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 14:52:30 2013 +0100
bootstrap tuning: format custom key name and edit/delete refs
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp index 80650e3..ed7597f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp @@ -7,8 +7,8 @@ html:html <body> <div> - <div class="toolbar-h1"> - <div class="toolbar"></div> + <div class="spacewalk-toolbar-h1"> + <div class="spacewalk-toolbar"></div> <i class="fa fa-key" title=""></i> <h2><bean:message key="system.jsp.customkey.createtitle"/></h2> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp index 6f67b37..847cc71 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp @@ -10,8 +10,8 @@
<div>
- <div class="toolbar-h1"> - <div class="toolbar"></div> + <div class="spacewalk-toolbar-h1"> + <div class="spacewalk-toolbar"></div> <i class="fa fa-key" title=""></i> <bean:message key="system.jsp.customkey.deletetitle"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp index caf6f58..489a14e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp @@ -14,8 +14,8 @@
<div>
- <div class="toolbar-h1"><div class="toolbar"> - <span class="toolbar"> + <div class="spacewalk-toolbar-h1"><div class="spacewalk-toolbar"> + <span class="spacewalk-toolbar"> <a href="/rhn/systems/customdata/CreateCustomKey.do"> <i class="fa fa-plus-circle text-success" title="create new key"></i> <bean:message key="system.jsp.customkey.createlink"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp index 39ff479..f7c1885 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp @@ -6,9 +6,9 @@
<html:html > <body> - <div class="toolbar-h1"> - <div class="toolbar"> - <span class="toolbar"> + <div class="spacewalk-toolbar-h1"> + <div class="spacewalk-toolbar"> + <span class="spacewalk-toolbar"> <a href="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}"> <i class="fa fa-trash-o" title="delete key"></i>delete key</a> </span>
commit 3a8a7b69e7a9de3667064fd83f920189eb3ffddc Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 14:42:09 2013 +0100
bootstrap tuning: reference spacewalk-toolbar-h1 from standard css
diff --git a/java/buildconf/apidoc/html/handler.txt b/java/buildconf/apidoc/html/handler.txt index 6aade4f..204893f 100644 --- a/java/buildconf/apidoc/html/handler.txt +++ b/java/buildconf/apidoc/html/handler.txt @@ -4,7 +4,7 @@
</head> <body> -<div class="toolbar-h1"> +<div class="spacewalk-toolbar-h1"> <br />
</div> diff --git a/java/buildconf/apidoc/jsp/handler.txt b/java/buildconf/apidoc/jsp/handler.txt index 09f7c47..d86e9d1 100644 --- a/java/buildconf/apidoc/jsp/handler.txt +++ b/java/buildconf/apidoc/jsp/handler.txt @@ -7,17 +7,13 @@ ul.apidoc { list-style-image: url('/img/parent_node.gif'); }
-.toolbar-h1 { - text-transform: capitalize; -} - .deprecated { text-decoration: line-through; } </style> </head> <body> -<div class="toolbar-h1"> +<div class="spacewalk-toolbar-h1"> <img src="/img/rhn-icon-api.gif" alt="application program interface" /> <a href="/rhn/apidoc/index.jsp">API Overview</a>:
$handler.desc
commit 787966b0c1f88241ef07eeaec2196b2814f3efb6 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 14:33:44 2013 +0100
bootstrap tuning: fixed help icon
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index 7ccc9aa..b0530b7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -30,7 +30,7 @@ ${fn:escapeXml(systemgroup.name)} </c:if> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list" target="_blank" class="help-title"> - <i class="fa fa-question-circle" title="<bean:message key='toolbar.jsp.helpicon.alt'/>"></i> + <span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span> </a> </h1> </div>
commit 647c97181fb0796a9d4c39bc700bc818968ace21 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 14:18:48 2013 +0100
bootstrap tuning: proper trash icon
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index 54381ce..7ccc9aa 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -13,7 +13,7 @@ <bean:message key="toolbar.work.with.group"/> </a> <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> - <i class="icon-trash" title="<bean:message key='toolbar.delete.systemgroup'/>" ></i> + <i class="fa fa-trash-o" title="<bean:message key='toolbar.delete.systemgroup'/>" ></i> <bean:message key="toolbar.delete.systemgroup"/> </a>
commit 4ca619a531965fdbf0505dc87b23ff851223c7ed Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 14:17:13 2013 +0100
bootstrap tuning: format system group name and edit/delete refs
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index 197f3c1..54381ce 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -5,9 +5,9 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<div class="toolbar-h1"> - <div class="toolbar"> - <span class="toolbar"> +<div class="spacewalk-toolbar-h1"> + <div class="spacewalk-toolbar"> + <span class="spacewalk-toolbar"> <a href="/network/systems/ssm/work_with_group.pxt?sgid=${systemgroup.id}&pxt_trap=rhn:work_with_group_cb"> <i class="fa spacewalk-icon-system-groups" title="<bean:message key='toolbar.work.with.group'/>"></i> <bean:message key="toolbar.work.with.group"/> @@ -19,7 +19,8 @@ </span> </div> - + <h1> + <i class="fa spacewalk-icon-system-groups" title="system groups"></i>
<c:if test="${empty systemgroup}"> @@ -31,6 +32,7 @@ <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list" target="_blank" class="help-title"> <i class="fa fa-question-circle" title="<bean:message key='toolbar.jsp.helpicon.alt'/>"></i> </a> + </h1> </div>