Branch 'master-bootstrap-css-fixes' - 7 commits - branding/css java/code web/html
by Silvio Moioli
branding/css/spacewalk-mixins.less | 2 -
branding/css/spacewalk-theme.less | 16 ++++++--
branding/css/spacewalk-variables.less | 20 +++++++++-
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 14 +++----
java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java | 2 -
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 18 ++++-----
web/html/javascript/spacewalk-essentials.js | 11 +++++
web/html/javascript/spacewalk-login.js | 8 ----
8 files changed, 57 insertions(+), 34 deletions(-)
New commits:
commit 77305f8f0f77151cb270308836a8979bc13f1578
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Dec 3 11:09:18 2013 +0100
ssmindex.jsp: fa-fw added for better vertical alignment
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
index 3e20ca6..38bb42e 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
@@ -17,7 +17,7 @@
<div class="panel panel-default">
<div class="panel-heading">
- <i class="fa fa-desktop" title="<bean:message key="ssm.overview.systems" />"></i>
+ <i class="fa fa-desktop fa-fw" title="<bean:message key="ssm.overview.systems" />"></i>
<bean:message key="ssm.overview.systems"/>
</div>
<div class="panel-body">
@@ -25,14 +25,14 @@
</div>
<rhn:require acl="no_bootstrap_systems_in_set()">
<div class="panel-heading">
- <i class="fa spacewalk-icon-patches" title="Errata"></i>
+ <i class="fa spacewalk-icon-patches fa-fw" title="Errata"></i>
<bean:message key="ssm.overview.errata"/>
</div>
<div class="panel-body">
<bean:message key="ssm.overview.errata.schedule"/>
</div>
<div class="panel-heading">
- <i class="fa spacewalk-icon-packages" title="<bean:message key='ssm.overview.packages'/>"></i>
+ <i class="fa spacewalk-icon-packages fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i>
<bean:message key="ssm.overview.packages"/>
</div>
<div class="panel-body">
@@ -40,7 +40,7 @@
</div>
<rhn:require acl="is(enable_solaris_support)">
<div class="panel-heading">
- <i class="fa spacewalk-icon-patches" title="<bean:message key='ssm.overview.patches'/>"></i>
+ <i class="fa spacewalk-icon-patches fa-fw" title="<bean:message key='ssm.overview.patches'/>"></i>
<bean:message key="ssm.overview.patches"/>
</div>
<div class="panel-body">
@@ -48,7 +48,7 @@
<bean:message key="ssm.overview.patches.patches"/>
</div>
<div class="panel-heading">
- <i class="fa spacewalk-icon-patch-set" title="<bean:message key='ssm.overview.patch.clusters'/>"></i>
+ <i class="fa spacewalk-icon-patch-set fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i>
<bean:message key="ssm.overview.patch.clusters"/>
</div>
<div class="panel-body">
@@ -57,7 +57,7 @@
</rhn:require>
<rhn:require acl="user_role(org_admin)">
<div class="panel-heading">
- <i class="fa spacewalk-icon-system-groups" title="<bean:message key='ssm.overview.groups'/>"></i>
+ <i class="fa spacewalk-icon-system-groups fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i>
<bean:message key="ssm.overview.groups"/>
</div>
<div class="panel-body">
@@ -65,7 +65,7 @@
</div>
</rhn:require>
<div class="panel-heading">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key='ssm.overview.channels'/>"></i>
+ <i class="fa spacewalk-icon-software-channels fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i>
<bean:message key="ssm.overview.channels"/>
</div>
<div class="panel-body">
@@ -80,7 +80,7 @@
</rhn:require>
<rhn:require acl="org_entitlement(rhn_provisioning);">
<div class="panel-heading">
- <i class="fa fa-rocket" title="<bean:message key='ssm.overview.provisioning'/>"></i>
+ <i class="fa fa-rocket fa-fw" title="<bean:message key='ssm.overview.provisioning'/>"></i>
<bean:message key="ssm.overview.provisioning"/>
</div>
<div class="panel-body">
@@ -92,7 +92,7 @@
</div>
</rhn:require>
<div class="panel-heading">
- <i class="fa fa-suitcase" title="<bean:message key='ssm.overview.misc'/>"></i>
+ <i class="fa fa-suitcase fa-fw" title="<bean:message key='ssm.overview.misc'/>"></i>
<bean:message key="ssm.overview.misc"/>
</div>
<div class="panel-body">
commit 421303a79916e618eca5299c50733fbce7f0c7a9
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 2 11:44:51 2013 +0100
fixed the class .glow-text-deleted
diff --git a/branding/css/spacewalk-mixins.less b/branding/css/spacewalk-mixins.less
index 4815b19..8524dc2 100644
--- a/branding/css/spacewalk-mixins.less
+++ b/branding/css/spacewalk-mixins.less
@@ -34,7 +34,7 @@
text-shadow: 1px 1px 1px #fff;
}
.glow-text-deleted {
- text-shadow: 0 transparent;
+ text-shadow: 0 0 0 transparent;
}
.shadow-text {
text-shadow: 1px 1px 1px #333;
commit 4fa93aff3e5edf2947c1813f887cf172ec79f514
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Nov 11 18:22:15 2013 +0100
less: More colours defined as variables
Conflicts:
branding/css/spacewalk-variables.less
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less
index fef059d..ae79257 100644
--- a/branding/css/spacewalk-theme.less
+++ b/branding/css/spacewalk-theme.less
@@ -346,7 +346,11 @@ aside .nav > li > a {
}
#sidenav {
a {
- color: #666;
+ color: @spacewalk-aside-menu-hyperlink;
+ .glow-text;
+ }
+ a:hover {
+ color: @spacewalk-aside-menu-hyperlink-hover;
.glow-text;
}
a:before {
@@ -370,6 +374,9 @@ aside .nav > li > a {
-webkit-box-shadow: 0px 1px 1px #fefefe;
box-shadow: 0px 1px 1px #fefefe;
}
+ ul li:hover, ul li a:hover {
+ background: @spacewalk-list-menu-hover;
+ }
/* ul-submenues */
/* first submenu */
@@ -390,7 +397,7 @@ aside .nav > li > a {
background: @spacewalk-list-first-submenu-hover;
}
ul>ul li:last-child {
- border-bottom: 1px solid #c6c6c6;
+ border-bottom: 1px solid @spacewalk-list-first-submenu-last-line;
}
/* second submenu */
ul>ul>ul li {
diff --git a/branding/css/spacewalk-variables.less b/branding/css/spacewalk-variables.less
index 7dddc50..c2ad458 100644
--- a/branding/css/spacewalk-variables.less
+++ b/branding/css/spacewalk-variables.less
@@ -8,7 +8,17 @@
@gray-light: lighten(#000, 80%); // #999
@gray-lighter: lighten(#000, 95%); // #eee
-@spacewalk-blue: #00aad4;
+
+/* Colours (or img backgrounds) for Spacewalk */
+@spacewalk-blue: #00aad4;
+@spacewalk-header: url('../../img/spacewalk-header-background.png') repeat-x @gray;
+@spacewalk-footer: @gray-dark;
+@spacewalk-aside: #eeeeee;
+
+// Colours for the menu in the first column on the left:
+@spacewalk-aside-border: darken(@spacewalk-aside, 10%);
+@spacewalk-aside-menu-hyperlink: #666;
+@spacewalk-aside-menu-hyperlink-hover: #555;
@state-success-text: #7ac142;
@state-info-text: #4ea1ee;
@@ -21,7 +31,8 @@
@spacewalk-list-menu-hover: lighten(@spacewalk-list-menu, 2%);
@spacewalk-list-first-submenu: darken(@spacewalk-list-menu, 8%);
@spacewalk-list-first-submenu-active: lighten(@spacewalk-list-first-submenu, 6%);
-@spacewalk-list-first-submenu-hover: lighten(@spacewalk-list-first-submenu, 2%);//#f3f3f3
+@spacewalk-list-first-submenu-hover: lighten(@spacewalk-list-first-submenu, 2%);
+@spacewalk-list-first-submenu-last-line: darken(@spacewalk-list-first-submenu, 8%);
@spacewalk-list-second-submenu: darken(@spacewalk-list-first-submenu, 5%);
@spacewalk-list-second-submenu-active: lighten(@spacewalk-list-second-submenu, 6%);
@spacewalk-list-second-submenu-hover: lighten(@spacewalk-list-second-submenu, 2%);
commit 19dafaa4def81fc28dbe9a4db82b74c1554645c9
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Tue Nov 12 13:56:13 2013 +0100
changes for Icon legend in the theme
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less
index 72ec7f7..fef059d 100644
--- a/branding/css/spacewalk-theme.less
+++ b/branding/css/spacewalk-theme.less
@@ -303,8 +303,9 @@ header {
/* Icons Legend */
aside .sideleg {
- background: lighten(@gray-lighter, 10%);
+ background: @spacewalk-icon-legend;
width: 90%;
+ color: @spacewalk-icon-legend-text;
padding: .5em 1em;
border-radius: 4px;
margin: 2em auto;
@@ -409,7 +410,7 @@ aside .nav > li > a {
background: @spacewalk-list-second-submenu-hover;
}
ul>ul>ul li:last-child {
- border-bottom: 1px solid #c4c4c4;
+ border-bottom: 1px solid @spacewalk-list-second-submenu-last-line;
}
}
diff --git a/branding/css/spacewalk-variables.less b/branding/css/spacewalk-variables.less
index 6445b31..7dddc50 100644
--- a/branding/css/spacewalk-variables.less
+++ b/branding/css/spacewalk-variables.less
@@ -25,6 +25,11 @@
@spacewalk-list-second-submenu: darken(@spacewalk-list-first-submenu, 5%);
@spacewalk-list-second-submenu-active: lighten(@spacewalk-list-second-submenu, 6%);
@spacewalk-list-second-submenu-hover: lighten(@spacewalk-list-second-submenu, 2%);
+@spacewalk-list-second-submenu-last-line: darken(@spacewalk-list-second-submenu, 8%);
+
+//Icons legend:
+@spacewalk-icon-legend: lighten(@spacewalk-aside, 10%);
+@spacewalk-icon-legend-text: @text-color;
/* Roboto variable: font variable to be applied in different text elements*/
@roboto-light: 'Roboto Light', sans-serif;
commit 89c1c22bf529262098a2ba2035c5dfd6c91a246a
Author: Johannes Renner <jrenner(a)suse.de>
Date: Fri Nov 29 15:34:37 2013 +0100
Move the formFocus() function into spacewalk-essentials.js
This makes that function available everywhere instead of on the login
screen only.
diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js
index 88f7209..220e7b4 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -105,4 +105,13 @@ $(document).on("ready", function() {
}
});
});
-});
\ No newline at end of file
+});
+
+// Put the focus on a given form element
+function formFocus(form, name) {
+ var focusControl = document.forms[form].elements[name];
+ if (focusControl.type != "hidden" && !focusControl.disabled) {
+ focusControl.focus();
+ }
+}
+
diff --git a/web/html/javascript/spacewalk-login.js b/web/html/javascript/spacewalk-login.js
index 9593d63..b4b9545 100644
--- a/web/html/javascript/spacewalk-login.js
+++ b/web/html/javascript/spacewalk-login.js
@@ -7,11 +7,3 @@ $(document).on("ready", function() {
formFocus('loginForm', 'username');
});
-// Put focus on a form element
-function formFocus(form, name) {
- var focusControl = document.forms[form].elements[name];
- if (focusControl.type != "hidden" && !focusControl.disabled) {
- focusControl.focus();
- }
-}
-
commit 1e5e03a6138dbbcf376d79b4a818384172ff035c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 28 13:08:46 2013 +0100
ListDisplayTag: delete image-related POST parameters
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index e8802d6..a2960c3 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -814,12 +814,6 @@ public class ListDisplayTag extends ListDisplayTagBase {
Set result = new HashSet();
for (int i = 0; i < keys.length; i++) {
result.add(keys[i]);
- //add the .x & .y's becasue these are image files
- //so certain browsers may add the .x & .y's
- result.add(keys[i] + ".x");
- result.add(keys[i] + ".X");
- result.add(keys[i] + ".y");
- result.add(keys[i] + ".Y");
}
return Collections.unmodifiableSet(result);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
index a90dc26..fb005ff 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
@@ -279,7 +279,7 @@ public class DataSetManipulator {
for (int x = 0; x < LINK_PREFIXES.length; x++) {
String imgLink = "list_" + uniqueName + "_page" +
- LINK_PREFIXES[x] + ".x";
+ LINK_PREFIXES[x];
if (request.getParameter(imgLink) != null) {
return "list_" + uniqueName + "_page" + LINK_PREFIXES[x];
commit 7b0251b9f8de134fcff4b53d4a4b7f80681356df
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 28 11:58:07 2013 +0100
ListDisplayTag: add missing value attribute in submit buttons
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index 2a6a416..e8802d6 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -628,7 +628,9 @@ public class ListDisplayTag extends ListDisplayTagBase {
(HttpServletRequest) pageContext.getRequest(), getMixins())) {
out.println("<button class=\"btn btn-default\"" +
- " type=\"submit\" name=\"dispatch\">" +
+ " type=\"submit\" name=\"dispatch\" value=\"" +
+ LocalizationService.getInstance().getMessage(getButton()) +
+ "\">" +
LocalizationService.getInstance().getMessage(getButton()) +
"</button>");
}
@@ -636,7 +638,9 @@ public class ListDisplayTag extends ListDisplayTagBase {
(HttpServletRequest) pageContext.getRequest(), getMixins())) {
out.println("<button class=\"btn btn-default\"" +
- " type=\"submit\" name=\"dispatch\">" +
+ " type=\"submit\" name=\"dispatch\" value=\"" +
+ LocalizationService.getInstance().getMessage(getButton2()) +
+ "\">" +
LocalizationService.getInstance().getMessage(getButton2()) +
"</button>");
}
10 years, 5 months
branding/spacewalk-branding.spec
by Tomáš Kašpárek
branding/spacewalk-branding.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b034f0adb42794504645edc73a43dfe2d98a77a8
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Dec 3 10:42:52 2013 +0100
bootstrap tuning: don't use old css stylesheets
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 1b9ad30..bf0b257 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -50,7 +50,7 @@ install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/
install -d -m 755 %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/
install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn
install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
-cp -p css/*.css %{buildroot}/%{_var}/www/html/css
+cp -p css/spacewalk.css %{buildroot}/%{_var}/www/html/css
cp -pR fonts %{buildroot}/%{_var}/www/html/
cp -pR img %{buildroot}/%{_var}/www/html/
# Appplication expects two favicon's for some reason, copy it so there's just
10 years, 5 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 38 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 26 ++++++
2 files changed, 64 insertions(+)
New commits:
commit c68a1c68ed10bf34844e83659f7acff9c05970d3
Author: Michele Baldessari <michele(a)acksyn.org>
Date: Mon Dec 2 17:02:38 2013 +0100
enable setting nobase and ignoremissing for kickstart.profile.setAdvancedOptions API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
index 7e41321..7b1b9c8 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
@@ -102,6 +102,44 @@ public class SoftwareHandler extends BaseHandler {
}
/**
+ * Set the list of software packages for a kickstart profile.
+ * @param sessionKey An active session key
+ * @param ksLabel A kickstart profile label
+ * @param packageList A list of package names.
+ * @param ignoremissing The boolean value setting --ignoremissing in %packages line
+ * when true
+ * @param nobase The boolean value setting --nobase in the %packages line when true
+ * @return 1 on success.
+ * @throws FaultException
+ * @xmlrpc.doc Set the list of software packages for a kickstart profile.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("string", "ksLabel", "The label of a kickstart
+ * profile.")
+ * @xmlrpc.param #param_desc("string[]", "packageList", "A list of package
+ * names to be set on the profile.")
+ * @xmlrpc.param #param_desc("boolean", "ignoremissing", "Ignore missing packages
+ * if true")
+ * @xmlrpc.param #param_desc("boolean", "nobase", "Don't install @Base package group
+ * if true")
+ * @xmlrpc.returntype #return_int_success()
+ */
+ public int setSoftwareList(
+ String sessionKey,
+ String ksLabel,
+ List<String> packageList,
+ Boolean ignoremissing,
+ Boolean nobase) {
+
+ User user = getLoggedInUser(sessionKey);
+ checkKickstartPerms(user);
+ KickstartData ksdata = lookupKsData(ksLabel, user.getOrg());
+ ksdata.setNoBase(nobase);
+ ksdata.setIgnoreMissing(ignoremissing);
+ KickstartFactory.saveKickstartData(ksdata);
+ return setSoftwareList(sessionKey, ksLabel, packageList);
+ }
+
+ /**
* Append the list of software packages to a kickstart profile.
* @param sessionKey An active session key
* @param ksLabel A kickstart profile label
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
index 1efd4f8..f97a1b7 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
@@ -66,6 +66,32 @@ public class SoftwareHandlerTest extends BaseHandlerTestCase {
assertEquals(pkgFound, true);
}
+ // Test API with nobase and ignoremissing
+ public void testSetSoftwareListWithParams() throws Exception {
+
+ KickstartData ksProfile = KickstartDataTest.createKickstartWithProfile(admin);
+
+ List<String> packages = new ArrayList<String>();
+ packages.add("gcc");
+
+ int result = handler.setSoftwareList(adminKey, ksProfile.getLabel(), packages,
+ true, true);
+
+ boolean pkgFound = false;
+ for (Iterator<KickstartPackage> itr = ksProfile.getKsPackages().iterator();
+ itr.hasNext();) {
+ KickstartPackage pkg = itr.next();
+ if (pkg.getPackageName().getName().equals("gcc")) {
+ pkgFound = true;
+ }
+ }
+ assertEquals(1, result);
+ assertEquals(ksProfile.getKsPackages().size(), 1);
+ assertEquals(pkgFound, true);
+ assertEquals(ksProfile.getNoBase(), true);
+ assertEquals(ksProfile.getIgnoreMissing(), true);
+ }
+
public void testAppendToSoftwareList() throws Exception {
KickstartData ksProfile = KickstartDataTest.createKickstartWithProfile(admin);
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.86-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.86-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-03 08:38 +0000
Tagging package [spacewalk-java] version [2.1.86-1] in directory [java/].
Changes since spacewalk-web-2.1.35-1:
Matej Kollar (1):
bootstrap tuning - ssm: old icon + all icons same size
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [2.1.86-1].
---
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 26 ++++++++++++------------
java/spacewalk-java.spec | 6 ++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 19 insertions(+), 15 deletions(-)
---
10 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 16b08bb20b06e6e3edd4282d14b891194448a954
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 3 09:38:16 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.86-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5a9166b..8fc8e29 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.85
+Version: 2.1.86
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.86-1
+- bootstrap tuning
+- Add a missing translation string: system.entitle.guestcantvirt
+
* Fri Nov 29 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.85-1
- 1034851 - fix SSM child channel membership changes
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7180261..bee0b75 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.85-1 java/
+2.1.86-1 java/
10 years, 5 months
java/code
by mkollar
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 26 ++++++++++++------------
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 3d535ac4e9292f9cffc15068cd4a122c29273c61
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Dec 2 17:29:03 2013 +0100
bootstrap tuning - ssm: old icon + all icons same size
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
index 7e6fd25..1204f28 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
@@ -18,20 +18,20 @@
<p><bean:message key="ssm.overview.summary2"/></p>
</div>
<tr>
- <td><img src="/img/rhn-icon-system.gif" alt=<bean:message key="ssm.overview.systems" /></td>
+ <td><i class="fa fa-desktop fa-2x fa-fw" title="<bean:message key='ssm.overview.systems' />"></i></td>
<th><b><bean:message key="ssm.overview.systems"/>:</b></th>
<td><bean:message key="ssm.overview.systems.list"/></td>
</tr>
<tr>
- <td><i class="fa spacewalk-icon-patches" title="Errata"></i></td>
- <th><b><bean:message key="ssm.overview.errata"/></b></th>
+ <td><i class="fa spacewalk-icon-patches fa-2x fa-fw" title="Errata"></i></td>
+ <th><b><bean:message key="ssm.overview.errata"/>:</b></th>
<td><bean:message key="ssm.overview.errata.schedule"/></td>
</tr>
<tr>
- <td><i class="fa spacewalk-icon-packages" title="<bean:message key='ssm.overview.packages'/>"></i></td>
- <th><b><bean:message key="ssm.overview.packages"/></b></th>
+ <td><i class="fa spacewalk-icon-packages fa-2x fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i></td>
+ <th><b><bean:message key="ssm.overview.packages"/>:</b></th>
<td><bean:message key="ssm.overview.packages.upgrade"/></td>
</tr>
@@ -46,7 +46,7 @@
</tr>
<tr>
- <td><i class="fa spacewalk-icon-patch-set" title="<bean:message key='ssm.overview.patch.clusters'/>"></i></td>
+ <td><i class="fa spacewalk-icon-patch-set fa-2x fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i></td>
<th><bean:message key="ssm.overview.patch.clusters"/>:</th>
<td> <bean:message key="ssm.overview.patch.clusters.install"/><br />
</td>
@@ -55,15 +55,15 @@
<rhn:require acl="user_role(org_admin)">
<tr>
- <td><i class="fa spacewalk-icon-system-groups" title="<bean:message key='ssm.overview.groups'/>"></i></td>
- <th><b><bean:message key="ssm.overview.groups"/></b></th>
+ <td><i class="fa spacewalk-icon-system-groups fa-2x fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i></td>
+ <th><b><bean:message key="ssm.overview.groups"/>:</b></th>
<td><bean:message key="ssm.overview.groups.create"/></td>
</tr>
</rhn:require>
<tr>
- <td><i class="fa spacewalk-icon-software-channels" title="<bean:message key='ssm.overview.channels'/>"></i></td>
- <th><b><bean:message key="ssm.overview.channels"/></b></th>
+ <td><i class="fa spacewalk-icon-software-channels fa-2x fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i></td>
+ <th><b><bean:message key="ssm.overview.channels"/>:</b></th>
<td>
<p>
<bean:message key="ssm.overview.channels.memberships"/>
@@ -78,8 +78,8 @@
<rhn:require acl="org_entitlement(rhn_provisioning)">
<tr>
- <td><i class="fa fa-rocket" title="<bean:message key='ssm.overview.provisioning'/>"></i></td>
- <th><b><bean:message key="ssm.overview.provisioning"/></b></th>
+ <td><i class="fa fa-rocket fa-2x fa-fw" title="<bean:message key='ssm.overview.provisioning'/>"></i></td>
+ <th><b><bean:message key="ssm.overview.provisioning"/>:</b></th>
<td>
<p>
<bean:message key="ssm.overview.provisioning.kickstart"/><br />
@@ -91,7 +91,7 @@
</rhn:require>
<tr>
- <td><i class="fa fa-suitcase" title="<bean:message key='ssm.overview.misc'/>"></i></td>
+ <td><i class="fa fa-suitcase fa-2x fa-fw" title="<bean:message key='ssm.overview.misc'/>"></i></td>
<th><b><bean:message key="ssm.overview.misc"/>:</b></th>
<td>
<p>
10 years, 5 months
Changes to 'refs/tags/spacewalk-web-2.1.35-1'
by Michael Mraka
Tag 'spacewalk-web-2.1.35-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-02 15:55 +0000
Tagging package [spacewalk-web] version [2.1.35-1] in directory [web/].
Changes since spacewalk-schema-2.1.30-1:
Michael Mraka (14):
bootstrap tuning: match legend icon with displayed one
bootstrap tuning: format system group name and edit/delete refs
bootstrap tuning: proper trash icon
bootstrap tuning: fixed help icon
bootstrap tuning: reference spacewalk-toolbar-h1 from standard css
bootstrap tuning: format custom key name and edit/delete refs
bootstrap tuning: fixed help icon
bootstrap tuning: proper add/delete icons in pxt pages
bootstrap tuning: by icon we really mean icon not image
bootstrap tuning: set header size according to $base
bootstrap tuning: replace old image with icons in system group pxt pages
bootstrap tuning: replace old help img with new icon in pxt pages
bootstrap tuning: reuse OK icon
Automatic commit of package [spacewalk-web] release [2.1.35-1].
---
java/buildconf/apidoc/html/handler.txt | 2 -
java/buildconf/apidoc/jsp/handler.txt | 6 ----
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 2 -
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 ++---
rel-eng/packages/spacewalk-web | 2 -
web/include/network/components/system_groups/sgdc_header.pxi | 4 +-
web/modules/sniglets/Sniglets/HTML.pm | 10 +++----
web/modules/sniglets/Sniglets/ServerGroup.pm | 2 -
web/spacewalk-web.spec | 5 ++-
13 files changed, 36 insertions(+), 35 deletions(-)
---
10 years, 5 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f65a9e95eed4564bf13706af2090a4ba566c5ee8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 2 16:55:47 2013 +0100
Automatic commit of package [spacewalk-web] release [2.1.35-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index edf8d0b..781a0b4 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.34-1 web/
+2.1.35-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 1d5af7a..b8ad33e 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.34
+Version: 2.1.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Mon Dec 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.35-1
+- bootstrap tuning
+
* Fri Nov 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.34-1
- HTML 5 does allow "_new" as a valid target
- remove old debug message
10 years, 5 months
6 commits - web/include web/modules
by Michael Mraka
web/include/network/components/system_groups/sgdc_header.pxi | 4 ++--
web/modules/sniglets/Sniglets/HTML.pm | 10 +++++-----
web/modules/sniglets/Sniglets/ServerGroup.pm | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 5b399de3a90df546cb60bca75992f6ed6edb9a95
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 2 16:39:30 2013 +0100
bootstrap tuning: reuse OK icon
diff --git a/web/modules/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm
index 243b7c4..54f318f 100644
--- a/web/modules/sniglets/Sniglets/ServerGroup.pm
+++ b/web/modules/sniglets/Sniglets/ServerGroup.pm
@@ -64,7 +64,7 @@ sub system_group_status_interface {
if (not ($counts->{SECURITY_ERRATA} or $counts->{BUG_ERRATA} or $counts->{ENHANCEMENT_ERRATA})) {
- $subst->{icon} = '<img src="/img/icon_up2date.gif" alt="up to date" />';
+ $subst->{icon} = '<i class="fa fa-check-circle fa-1-5x text-success"></i>';
$subst->{status_str} = 'No applicable errata';
$subst->{status_class} = 'system-status-up-to-date';
}
commit 6df0b0629e43404a591036659ef204c693847a24
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 2 16:17:49 2013 +0100
bootstrap tuning: replace old help img with new icon in pxt pages
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index dfc8299..7d662a0 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -166,7 +166,7 @@ sub rhn_help {
return render_help_link(-user => $pxt->user,
-guide => $guide,
-href => $href,
- -block => qq(<img src="/img/rhn-icon-help.gif" alt="Help Icon" />),
+ -block => qq(<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>),
-satellite => $params{satellite});
}
commit b2fa9fa5aef7c3054cfacaa0539edbca46a2199c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 2 16:07:10 2013 +0100
bootstrap tuning: replace old image with icons in system group pxt pages
diff --git a/web/include/network/components/system_groups/sgdc_header.pxi b/web/include/network/components/system_groups/sgdc_header.pxi
index 0eb103c..3265f40 100644
--- a/web/include/network/components/system_groups/sgdc_header.pxi
+++ b/web/include/network/components/system_groups/sgdc_header.pxi
@@ -7,12 +7,12 @@
<pxt-formvar>
<rhn-toolbar base="h1"
- img="/img/rhn-icon-system_group.gif"
+ icon="fa spacewalk-icon-system-groups"
alt="system group"
help-url="s1-sm-systems.jsp#s2-sm-system-group-list"
misc-url="/network/systems/ssm/work_with_group.pxt?sgid={formvar:sgid}&pxt_trap=rhn:work_with_group_cb"
misc-alt="work with group"
- misc-img="/img/work_with_group.gif"
+ misc-icon="fa spacewalk-icon-system-groups"
misc-text="work with group"
deletion-type="group"
deletion-url="delete_confirm.pxt?sgid={formvar:sgid}"
commit 670edab2a3c7ae7138b4d40f876848b0ccdb1b55
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 2 16:04:11 2013 +0100
bootstrap tuning: set header size according to $base
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index 72a543d..dfc8299 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -127,7 +127,7 @@ sub toolbar {
my $toolbar = join(" | ", @toolbar);
- return qq{<div class="spacewalk-toolbar-$base"><div class="spacewalk-toolbar">$toolbar</div>$img $icon $params{__block__}$help</div>};
+ return qq{<div class="spacewalk-toolbar-$base"><div class="spacewalk-toolbar">$toolbar</div><$base>$img $icon $params{__block__}$help</$base></div>};
}
sub creation_link {
commit 279f75f57cdd9d6a44c03eae2183fdc5d50e2eaa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 2 16:00:30 2013 +0100
bootstrap tuning: by icon we really mean icon not image
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index b8f96b6..72a543d 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -112,7 +112,7 @@ sub toolbar {
text => $params{'misc-text'}));
} elsif (defined $params{'misc-icon'} and $acl->eval_acl($pxt, $params{'misc-acl'} || '')) {
push @toolbar, misc_link($pxt, (url => $params{'misc-url'},
- img => $params{'misc-icon'},
+ icon => $params{'misc-icon'},
text => $params{'misc-text'}));
}
commit 4a0093a3b8c7ee7e3844c06b030e4c49e80adbd1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 2 15:39:29 2013 +0100
bootstrap tuning: proper add/delete icons in pxt pages
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index 331338d..b8f96b6 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -134,14 +134,14 @@ sub creation_link {
my $pxt = shift;
my %params = @_;
- return qq{<a href="$params{url}"><i class="icon-plus"></i>create new $params{type}</a>};
+ return qq{<a href="$params{url}"><i class="fa fa-plus"></i>create new $params{type}</a>};
}
sub deletion_link {
my $pxt = shift;
my %params = @_;
- return qq{<a href="$params{url}"><i class="icon-trash"></i>delete $params{type}</a>};
+ return qq{<a href="$params{url}"><i class="fa fa-trash-o"></i>delete $params{type}</a>};
}
sub misc_link {
10 years, 5 months
6 commits - java/buildconf java/code
by Michael Mraka
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(a)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(a)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(a)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(a)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(a)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(a)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>
10 years, 5 months