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>");
}
