3 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/spacewalk-remove-channel | 23 ++++++++++++++++-------
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 22 insertions(+), 9 deletions(-)
New commits:
commit c55bc93f02dd4f001821d91f29e01b0d79b72712
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 31 14:58:20 2014 +0100
Automatic commit of package [spacewalk-backend] release [2.1.47-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3ada77f..5eb9f0a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.46
+Version: 2.1.47
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,10 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Fri Jan 31 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.47-1
+- 1058431 - don't remove files referenced from other distributions/trees
+- 1058431 - propagate --skip-kickstart-trees to delete_channels()
+
* Wed Jan 29 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.46-1
- fixed man page for spacewalk-remove-channel
- added option to skip kickstart trees removal
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2c4c8c1..8b88e28 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.46-1 backend/
+2.1.47-1 backend/
commit 8eedd31b92166c53b622a76f252cf307c757d451
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 31 14:53:43 2014 +0100
1058431 - don't remove files referenced from other distributions/trees
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index f36a71d..3ca931d 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -551,16 +551,23 @@ def _get_package_paths(package_ids, sources=0):
def _delete_ks_files(channel_labels):
sql = """
select kt.base_path
- from rhnChannel c
- left join rhnKickstartableTree kt on c.id = kt.channel_id
- where c.label in (%s);
+ from rhnChannel c
+ join rhnKickstartableTree kt on c.id = kt.channel_id
+ where c.label in (%s) and not exists (
+ select 1
+ from rhnKickstartableTree ktx
+ join rhnChannel cx on cx.id = ktx.channel_id
+ where replace(ktx.base_path, :mnt_point, '') =
+ replace(kt.base_path, :mnt_point, '')
+ and cx.label not in (%s));
"""
params, bind_params = _bind_many(channel_labels)
+ params['mnt_point'] = CFG.MOUNT_POINT + '/'
bind_params = string.join(bind_params, ', ')
- h = rhnSQL.prepare(sql % (bind_params))
+ h = rhnSQL.prepare(sql % (bind_params, bind_params))
h.execute(**params)
- list = h.fetchall_dict()
+ list = h.fetchall_dict() or []
for map in list:
path = os.path.join(CFG.MOUNT_POINT, str(map['base_path']))
commit 2938b15e4612600dd25424839402e6d69f9d278f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 31 14:52:28 2014 +0100
1058431 - propagate --skip-kickstart-trees to delete_channels()
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 5e0a1c8..f36a71d 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -148,7 +148,8 @@ def main():
try:
delete_channels(channels.keys(), force=options.force,
justdb=options.justdb, skip_packages=options.skip_packages,
- skip_channels=options.skip_channels)
+ skip_channels=options.skip_channels,
+ skip_kickstart_trees=options.skip_kickstart_trees)
except:
rhnSQL.rollback()
raise
@@ -285,7 +286,8 @@ def __listChannels():
return labels, parents
-def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0, skip_channels=0):
+def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0, skip_channels=0,
+ skip_kickstart_trees=0):
# Get the package ids
if not channelLabels:
return
10 years, 2 months
Changes to 'refs/tags/spacewalk-java-2.1.138-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.138-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-31 09:42 +0000
Tagging package [spacewalk-java] version [2.1.138-1] in directory [java/].
Changes since spacewalk-java-2.1.137-1:
Michael Mraka (6):
reuse IconTag to render icons
reuse IconTag for pagination icons
reuse IconTag for item search
reuse IconTag for help links
no need to set parent and context for icons
Automatic commit of package [spacewalk-java] release [2.1.138-1].
Tomas Kasparek (3):
fix checkstyle
re-style kickstart creation wizard, 1st form
re-style kickstart creation wizard, 1st form
---
java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 57 +--
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 2
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java | 2
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 38 ++
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 22 -
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java | 6
java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 23 -
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp | 145 +++++-----
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp | 50 ++-
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
13 files changed, 186 insertions(+), 177 deletions(-)
---
10 years, 2 months
6 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 57 +++-------
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 2
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java | 2
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 38 ++++++
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 22 +--
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java | 6 -
java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 23 +---
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 8 -
java/spacewalk-java.spec | 6 -
rel-eng/packages/spacewalk-java | 2
10 files changed, 81 insertions(+), 85 deletions(-)
New commits:
commit 7dfe4825d362f3ce0123274ad031abb49c22f57a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 31 10:42:20 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.138-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fc43375..a2f9e79 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.137
+Version: 2.1.138
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 31 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.138-1
+- reuse IconTag for help links, item search and pagination icons
+- re-style kickstart creation wizard, 1st form
+
* Thu Jan 30 2014 Stephen Herr <sherr(a)redhat.com> 2.1.137-1
- 1059910 - create api for channel errata syncing, have clone-by-date call it
- fix style on kickstart profile creation wizard + use rhn:toolbar
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bf1e5c2..f87e58b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.137-1 java/
+2.1.138-1 java/
commit 6f9b196626cc91ed455ee02c905d8c9f3e272551
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 13:59:27 2014 +0100
no need to set parent and context for icons
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
index 09729a3..ea9cf61 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
@@ -116,8 +116,6 @@ public class ConfigChannelTag extends TagSupport {
private String writeIcon() throws JspException {
IconTag i = new IconTag();
- i.setParent(getParent());
- i.setPageContext(pageContext);
if (type.equals("central") || type.equals("global")) {
i.setType("header-channel-configuration");
}
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
index 2207c16..7cc95dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
@@ -134,8 +134,6 @@ public class ConfigFileTag extends TagSupport {
private String writeIcon() throws JspException {
IconTag i = new IconTag();
- i.setParent(getParent());
- i.setPageContext(pageContext);
if ("dir".equalsIgnoreCase(type) || "directory".equalsIgnoreCase(type) ||
"folder".equalsIgnoreCase(type)) {
i.setType("file-directory");
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 927e472..c4dfb25 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -458,15 +458,11 @@ public class ListDisplayTag extends ListDisplayTagBase {
if (request.getQueryString() != null) {
page.append("&" + request.getQueryString());
}
- IconTag i = new IconTag();
- i.setParent(getParent());
- i.setPageContext(pageContext);
- i.setType("item-download-csv");
+ IconTag i = new IconTag("item-download-csv");
out.println("<div class=\"spacewalk-csv-download\"><a href=\"" + page +
- "\">" + i.renderStartTag() +
+ "\">" + i.render() +
LocalizationService.getInstance().getMessage("listdisplay.csv") +
"</a></div>");
- i.release();
}
private void renderBoundsVariables(Writer out) throws IOException {
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
index c73d7a4..b8afaee 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -575,12 +575,8 @@ public class ToolbarTag extends TagSupport {
private String renderIcon() {
if (assertNotEmpty(getIcon())) {
- IconTag i = new IconTag();
- i.setPageContext(pageContext);
- i.setParent(getParent());
- i.setType(getIcon());
- String result = i.renderStartTag();
- i.release();
+ IconTag i = new IconTag(getIcon());
+ String result = i.render();
return result;
}
return "";
@@ -664,13 +660,8 @@ public class ToolbarTag extends TagSupport {
}
if (assertNotEmpty(iconName)) {
- IconTag i = new IconTag();
- i.setPageContext(pageContext);
- i.setParent(getParent());
- i.setType(iconName);
- i.setTitle(alt);
- a.addBody(i.renderStartTag());
- i.release();
+ IconTag i = new IconTag(iconName, alt);
+ a.addBody(i.render());
}
a.addBody(text);
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
index 6d7ef13..ccc04a8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
@@ -197,15 +197,11 @@ public class CSVTag extends BodyTagSupport {
private void renderExport() throws JspException {
StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI);
page.append("?" + makeCSVRequestParams());
- IconTag i = new IconTag();
- i.setParent(getParent());
- i.setPageContext(pageContext);
- i.setType("item-download-csv");
+ IconTag i = new IconTag("item-download-csv");
String exportLink = new String("<div class=\"spacewalk-csv-download\"><a href=\"" +
- page + "\">" + i.renderStartTag() +
+ page + "\">" + i.render() +
LocalizationService.getInstance().getMessage(
"listdisplay.csv") + "</a></div>");
- i.release();
ListTagUtil.write(pageContext, exportLink);
}
commit ab6f0342eca1dfd00f6c8a5a0f8f83fd6e45728b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 15:54:09 2014 +0100
reuse IconTag for help links
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
index 3eb21ec..c73d7a4 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -551,11 +551,9 @@ public class ToolbarTag extends TagSupport {
tag.setAttribute("href", getHelpUrl());
tag.setAttribute("target", "_blank");
- HtmlTag help = new HtmlTag("i");
- help.setAttribute("class", "fa fa-question-circle");
+ IconTag help = new IconTag("header-help");
- tag.addBody(help.renderOpenTag());
- tag.addBody(help.renderCloseTag());
+ tag.addBody(help.render());
return tag.render();
}
return "";
commit 10c6e8385704a17dc64b34dd473aa438dc2899f9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 15:52:21 2014 +0100
reuse IconTag for item search
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index 712aca8..c73b4d8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -116,6 +116,7 @@ public class IconTag extends TagSupport {
icons.put("item-download", "fa fa-download");
icons.put("item-download-csv", "fa spacewalk-icon-download-csv");
icons.put("item-enabled", "fa fa-check text-success");
+ icons.put("item-search", "fa fa-eye");
icons.put("item-ssm-add", "fa fa-plus-circle");
icons.put("item-ssm-del", "fa fa-minus-circle");
icons.put("item-upload", "fa fa-upload");
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
index d164204..b1bd702 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
@@ -331,10 +331,8 @@ public class ListDisplayTagBase extends BodyTagSupport {
btn.setAttribute("name", FILTER_DISPATCH);
btn.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY));
- HtmlTag icon = new HtmlTag("i");
- icon.setAttribute("class", "fa fa-eye");
- icon.addBody(" ");
- btn.addBody(icon);
+ IconTag icon = new IconTag("item-search");
+ btn.addBody(icon.render());
btnSpan.addBody(btn);
commit 4210f72a0673bb3648439a80ad8735e9bfcb305e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 15:44:28 2014 +0100
reuse IconTag for pagination icons
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index 06a113b..712aca8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -128,6 +128,10 @@ public class IconTag extends TagSupport {
icons.put("monitoring-warn",
"fa fa-1-5x spacewalk-icon-monitoring-warning text-warning");
icons.put("nav-bullet", "fa fa-caret-right");
+ icons.put("nav-page-first", "fa fa-angle-double-left");
+ icons.put("nav-page-last", "fa fa-angle-double-right");
+ icons.put("nav-page-next", "fa fa-angle-right");
+ icons.put("nav-page-prev", "fa fa-angle-left");
icons.put("nav-right", "fa fa-arrow-right");
icons.put("nav-up", "fa fa-caret-up");
icons.put("sort-down", "fa fa-arrow-circle-down");
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 c7998a2..927e472 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -590,13 +590,13 @@ public class ListDisplayTag extends ListDisplayTagBase {
if (canGoForward || canGoBack) {
out.append(renderPaginationButton(FIRST,
- "fa-angle-double-left", " |< ", canGoBack));
- out.append(renderPaginationButton(PREV, "fa-angle-left",
+ "nav-page-first", " |< ", canGoBack));
+ out.append(renderPaginationButton(PREV, "nav-page-prev",
" < ", canGoBack));
- out.append(renderPaginationButton(NEXT, "fa-angle-right",
+ out.append(renderPaginationButton(NEXT, "nav-page-next",
" > ", canGoForward));
out.append(renderPaginationButton(LAST,
- "fa-angle-double-right", " >| ", canGoForward));
+ "nav-page-last", " >| ", canGoForward));
}
out.append("</div>\n");
}
@@ -606,10 +606,8 @@ public class ListDisplayTag extends ListDisplayTagBase {
HtmlTag ret = new HtmlTag("button");
ret.setAttribute("name", name);
String styleClass = "btn btn-default btn-xs";
- HtmlTag iconTag = new HtmlTag("i");
- iconTag.setAttribute("class", "fa " + icon);
- iconTag.addBody("");
- ret.addBody(iconTag);
+ IconTag iconTag = new IconTag(icon);
+ ret.addBody(iconTag.render());
if (!active) {
styleClass += " disabled";
commit 118d0217d84cd41523ea271f7c0c0b5eceedd428
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 15:36:27 2014 +0100
reuse IconTag to render icons
fixing
self-closing i-tags are not allowed
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
index c26a84a..17262bb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.SystemCurrency;
import com.redhat.rhn.frontend.dto.SystemOverview;
import com.redhat.rhn.frontend.html.HtmlTag;
+import com.redhat.rhn.frontend.taglibs.IconTag;
import com.redhat.rhn.manager.system.SystemManager;
/**
@@ -55,16 +56,14 @@ public class SystemListHelper {
*/
public static void setSystemStatusDisplay(User user, SystemOverview next,
boolean makeLinks) {
-
- String message;
HtmlTag url = new HtmlTag("a");
- HtmlTag i = new HtmlTag("i");
+ IconTag i = new IconTag();
+
LocalizationService ls = LocalizationService.getInstance();
if (next.getEntitlement() == null ||
next.getEntitlement().isEmpty()) {
- message = ls.getMessage("systemlist.jsp.unentitled");
- i.setAttribute("class", "spacewalk-icon-unknown-system");
- i.setAttribute("title", message);
+ i.setType("system-unknown");
+ i.setTitle("systemlist.jsp.unentitled");
if (user.hasRole(RoleFactory.ORG_ADMIN)) {
url.setAttribute("href", "/rhn/systems/details/Edit.do?sid=" +
next.getId());
@@ -74,9 +73,8 @@ public class SystemListHelper {
//status = "awol";
url.setAttribute("href",
"/rhn/help/reference/en-US/s1-sm-systems.jsp");
- message = ls.getMessage("systemlist.jsp.notcheckingin");
- i.setAttribute("class", "spacewalk-icon-unknown-system");
- i.setAttribute("title", message);
+ i.setType("system-unknown");
+ i.setTitle("systemlist.jsp.notcheckingin");
if (makeLinks) {
makeLinks = ConfigDefaults.get().isDocAvailable();
}
@@ -87,9 +85,8 @@ public class SystemListHelper {
url.setAttribute("href",
"/rhn/systems/details/kickstart/SessionStatus.do?sid=" +
next.getId());
- message = ls.getMessage("systemlist.jsp.kickstart");
- i.setAttribute("class", "fa fa-rocket");
- i.setAttribute("title", message);
+ i.setType("system-kickstarting");
+ i.setTitle("systemlist.jsp.kickstart");
}
else if (next.getEnhancementErrata() + next.getBugErrata() +
next.getSecurityErrata() > 0 &&
@@ -99,18 +96,16 @@ public class SystemListHelper {
url.setAttribute("href",
"/network/systems/details/history/pending.pxt?sid=" +
next.getId());
- message = ls.getMessage("systemlist.jsp.updatesscheduled");
- i.setAttribute("class", "fa fa-clock-o");
- i.setAttribute("title", message);
+ i.setType("action-pending");
+ i.setTitle("systemlist.jsp.updatesscheduled");
}
else if (SystemManager.countActions(new Long(next.getId().longValue())) > 0) {
//status = "actions scheduled";
url.setAttribute("href",
"/network/systems/details/history/pending.pxt?sid=" +
next.getId());
- message = ls.getMessage("systemlist.jsp.actionsscheduled");
- i.setAttribute("class", "fa fa-clock-o");
- i.setAttribute("title", message);
+ i.setType("action-pending");
+ i.setTitle("systemlist.jsp.actionsscheduled");
}
else if ((next.getEnhancementErrata() + next.getBugErrata() +
next.getSecurityErrata()) == 0 &&
@@ -119,10 +114,8 @@ public class SystemListHelper {
new Long(next.getId().longValue())) == 0) {
//status = "up2date";
- message = ls.getMessage("systemlist.jsp.up2date");
- i.setAttribute("class", "fa fa-check-circle fa-1-5x text-success");
- i.setAttribute("title", message);
- //i.setAttribute("alt", message);
+ i.setType("system-ok");
+ i.setTitle("systemlist.jsp.up2date");
}
else if (next.getSecurityErrata().intValue() > 0) {
//status = "critical";
@@ -130,25 +123,22 @@ public class SystemListHelper {
"/rhn/systems/details/ErrataList.do?sid=" +
next.getId() + "&type=" +
LocalizationService.getInstance().getMessage(ErrataSetupAction.SECUR));
- message = ls.getMessage("systemlist.jsp.critical");
- i.setAttribute("class", "fa fa-exclamation-circle fa-1-5x text-danger");
- i.setAttribute("title", message);
+ i.setType("system-crit");
+ i.setTitle("systemlist.jsp.critical");
}
else if (next.getOutdatedPackages().intValue() > 0) {
//status = "updates";
url.setAttribute("href",
"/rhn/systems/details/packages/UpgradableList.do?sid=" +
next.getId());
- message = ls.getMessage("systemlist.jsp.updates");
- i.setAttribute("class", "fa fa-exclamation-triangle fa-1-5x text-warning");
- i.setAttribute("title", message);
+ i.setType("system-warn");
+ i.setTitle("systemlist.jsp.updates");
}
- url.addBody(i.renderOpenTag());
- url.addBody(i.renderCloseTag());
String statusDisplay;
if (makeLinks) {
+ url.addBody(i.render());
statusDisplay = url.render();
}
else {
@@ -157,19 +147,16 @@ public class SystemListHelper {
if (next.getLocked().intValue() == 1) {
HtmlTag lockedUrl = new HtmlTag("a");
- HtmlTag lockedIcon = new HtmlTag("i");
//status = "locked";
lockedUrl.setAttribute("href",
"/rhn/help/reference/en-US/s1-sm-systems.jsp");
- message = ls.getMessage("systemlist.jsp.locked");
- lockedIcon.setAttribute("class", "fa spacewalk-icon-locked-system");
- lockedIcon.setAttribute("title", message);
+ IconTag lockedIcon = new IconTag("system-locked", "systemlist.jsp.locked");
if (makeLinks) {
makeLinks = ConfigDefaults.get().isDocAvailable();
}
if (makeLinks) {
- lockedUrl.addBody(lockedIcon);
+ lockedUrl.addBody(lockedIcon.render());
statusDisplay = statusDisplay + lockedUrl.render();
}
else {
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index f3a8c69..06a113b 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -147,11 +147,28 @@ public class IconTag extends TagSupport {
/**
* Constructor for Icon tag.
+ * @param typeIn the type of the icon
+ * @param titleIn the title of the icon
*/
- public IconTag() {
+ public IconTag(String typeIn, String titleIn) {
super();
- type = null;
- title = null;
+ type = typeIn;
+ title = titleIn;
+ }
+
+ /**
+ * Constructor for Icon tag.
+ * @param typeIn the type of the icon
+ */
+ public IconTag(String typeIn) {
+ this(typeIn, (String) null);
+ }
+
+ /**
+ * Constructor for Icon tag.
+ */
+ public IconTag() {
+ this((String) null, (String) null);
}
/**
@@ -190,6 +207,16 @@ public class IconTag extends TagSupport {
* Return just the HTML
* @return String that contains generated HTML
*/
+ public String render() {
+ String result = renderStartTag();
+ release();
+ return result;
+ }
+
+ /**
+ * Return just the HTML
+ * @return String that contains generated HTML
+ */
public String renderStartTag() {
if (!icons.containsKey(type)) {
throw new IllegalArgumentException("Unknown icon type: \"" + type + "\".");
10 years, 2 months
java/code
by Tomáš Kašpárek
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp | 50 +++++-----
1 file changed, 29 insertions(+), 21 deletions(-)
New commits:
commit 65f9943e56c5d614476cdab07133c0a0f10d8f18
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jan 31 09:27:31 2014 +0100
re-style kickstart creation wizard, 1st form
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp
index bfa2b87..eb86648 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp
@@ -46,27 +46,35 @@ function movePrevious() {
<html:hidden property="defaultDownload" />
<html:hidden property="userDefinedDownload" />
<html:hidden property="kstreeUpdateType" />
- <h1><bean:message key="kickstart.jsp.create.wizard.step.three"/></h1>
- <table class="details" width="80%">
- <tr>
- <td colspan="2"><bean:message key="kickstart.jsp.create.wizard.third.heading1" /></td>
- </tr>
- <tr>
- <th width="14%"><rhn:required-field key="kickstart.root.password.jsp.label"/>:</th>
- <td><html:password property="rootPassword" /></td>
- </tr>
- <tr>
- <th width="14%"><rhn:required-field key="kickstart.root.password.verify.jsp.label"/>:</th>
- <td valign="bottom"><html:password property="rootPasswordConfirm" /></td>
- </tr>
- <tr>
- <td colspan="2" align="right">
- <input type="button" value="<bean:message key='wizard.jsp.previous.step'/>" onclick="movePrevious();" />
-
- <input type="submit" value="<bean:message key='wizard.jsp.finish.step'/>" onclick="moveNext();" />
- </td>
- </tr>
- </table>
+ <rhn:toolbar base="h1" icon="header-kickstart"><bean:message key="kickstart.jsp.create.wizard.step.three"/></rhn:toolbar>
+ <p><bean:message key="kickstart.jsp.create.wizard.third.heading1" /></p>
+ <div class="panel panel-default">
+ <ul class="list-group">
+ <div class="row">
+ <div class="col-sm-2">
+ <rhn:required-field key="kickstart.root.password.jsp.label"/>:
+ </div>
+ <div class="col-sm-10">
+ <html:password property="rootPassword" />
+ </div>
+ </div>
+ </ul>
+ <ul class="list-group">
+ <div class="row">
+ <div class="col-sm-2">
+ <rhn:required-field key="kickstart.root.password.verify.jsp.label"/>:
+ </div>
+ <div class="col-sm-10">
+ <html:password property="rootPasswordConfirm" />
+ </div>
+ </div>
+ </ul>
+ </div>
+ <div align="right">
+ <input type="button" value="<bean:message key='wizard.jsp.previous.step'/>" onclick="movePrevious();" class="btn btn-default" />
+
+ <input type="submit" value="<bean:message key='wizard.jsp.finish.step'/>" onclick="moveNext();" class="btn btn-default" />
+ </div>
</html:form>
</html>
</div>
10 years, 2 months
2 commits - java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp | 145 +++++-----
2 files changed, 76 insertions(+), 71 deletions(-)
New commits:
commit 04d9dccaedf8aa2998125e93969262ab73e58126
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jan 31 09:06:18 2014 +0100
re-style kickstart creation wizard, 1st form
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
index 2cf0c32..6d484eb 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
@@ -65,81 +65,86 @@ function clickNewestTree() {
<rhn:toolbar base="h1" icon="header-kickstart"><bean:message key="kickstart.jsp.create.wizard.step.one"/></rhn:toolbar>
<p><bean:message key="kickstart.jsp.create.wizard.first.heading1" /></p>
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <rhn:required-field key="kickstart.jsp.create.wizard.kickstart.profile.label"/>:
- </label>
- <div class="col-lg-6">
- <html:text property="kickstartLabel" size="40" maxlength="80" styleClass="form-control"/>
- </div>
+ <div class="panel panel-default">
+ <ul class="list-group">
+ <div class="row">
+ <div class="col-sm-2">
+ <rhn:required-field key="kickstart.jsp.create.wizard.kickstart.profile.label"/>:
+ </div>
+ <div class="col-sm-10">
+ <html:text property="kickstartLabel" size="40" maxlength="80" styleClass="form-control"/>
+ </div>
</div>
-
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <rhn:required-field key="softwareedit.jsp.basechannel"/>:
- </label>
- <div class="col-lg-6">
- <c:choose>
- <c:when test="${nochannels == null}">
- <html:select property="currentChannelId" onchange="refresh();" styleClass="form-control">
- <html:optionsCollection property="channels" label="name" value="id" />
- </html:select>
- </c:when>
- <c:otherwise>
- <b><bean:message key="tree-form.jspf.nochannels" /></b>
- </c:otherwise>
- </c:choose>
- </div>
- </div>
-
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <rhn:required-field key="kickstart.jsp.create.wizard.kstree.label"/>:
- </label>
- <div class="col-lg-6">
- <c:choose>
- <c:when test="${notrees == null}">
- <html:select property="kstreeId">
- <html:optionsCollection property="kstrees" label="label" value="id" />
- </html:select>
- <c:if test="${redHatTreesAvailable != null}">
- <br />
- <label>
- <input type="checkbox" name="useNewestRHTree" value="0"
- onclick="toggleKSTree(this); clickNewestRHTree()" />
- <bean:message key="kickstart.jsp.create.wizard.kstree.always_new_RH"/>
- </label>
- </c:if>
- <br />
- <label>
- <input type="checkbox" name="useNewestTree" value="0"
- onclick="toggleKSTree(this); clickNewestTree()" />
- <bean:message key="kickstart.jsp.create.wizard.kstree.always_new"/>
- </label>
- </c:when>
- <c:otherwise>
- <b><bean:message key="kickstart.edit.software.notrees.jsp" /></b>
- </c:otherwise>
- </c:choose>
- </div>
+ </ul>
+ <ul class="list-group">
+ <div class="row">
+ <div class="col-sm-2">
+ <rhn:required-field key="softwareedit.jsp.basechannel"/>:
+ </div>
+ <div class="col-sm-10">
+ <c:choose>
+ <c:when test="${nochannels == null}">
+ <html:select property="currentChannelId" onchange="refresh();" styleClass="form-control">
+ <html:optionsCollection property="channels" label="name" value="id" />
+ </html:select>
+ </c:when>
+ <c:otherwise>
+ <b><bean:message key="tree-form.jspf.nochannels" /></b>
+ </c:otherwise>
+ </c:choose>
+ </div>
</div>
-
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <bean:message key="kickstart.jsp.create.wizard.virtualization.label" />
- </label>
- <div class="col-lg-6">
- <html:select property="virtualizationTypeLabel" styleClass="form-control">
- <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label" />
+ </ul>
+ <ul class="list-group">
+ <div class="row">
+ <div class="col-sm-2">
+ <rhn:required-field key="kickstart.jsp.create.wizard.kstree.label"/>:
+ </div>
+ <div class="col-sm-10">
+ <c:choose>
+ <c:when test="${notrees == null}">
+ <html:select property="kstreeId" styleClass="form-control">
+ <html:optionsCollection property="kstrees" label="label" value="id" />
</html:select>
- </div>
+ <c:if test="${redHatTreesAvailable != null}">
+ <br />
+ <label>
+ <input type="checkbox" name="useNewestRHTree" value="0"
+ onclick="toggleKSTree(this); clickNewestRHTree()" />
+ <bean:message key="kickstart.jsp.create.wizard.kstree.always_new_RH"/>
+ </label>
+ </c:if>
+ <br />
+ <label>
+ <input type="checkbox" name="useNewestTree" value="0"
+ onclick="toggleKSTree(this); clickNewestTree()" />
+ <bean:message key="kickstart.jsp.create.wizard.kstree.always_new"/>
+ </label>
+ </c:when>
+ <c:otherwise>
+ <b><bean:message key="kickstart.edit.software.notrees.jsp" /></b>
+ </c:otherwise>
+ </c:choose>
+ </div>
</div>
-
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <input type="button" value="<bean:message key='wizard.jsp.next.step'/>" onclick="moveNext();" class="btn btn-default"/>
- </div>
+ </ul>
+ <ul class="list-group">
+ <div class="row">
+ <div class="col-sm-2">
+ <bean:message key="kickstart.jsp.create.wizard.virtualization.label" />
+ </div>
+ <div class="col-sm-10">
+ <html:select property="virtualizationTypeLabel" styleClass="form-control">
+ <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label" />
+ </html:select>
+ </div>
</div>
+ </ul>
+ </div>
+
+ <div align="right">
+ <input type="button" value="<bean:message key='wizard.jsp.next.step'/>" onclick="moveNext();" class="btn btn-default"/>
+ </div>
</html:form>
</body>
</html:html>
commit 79f1fa5c6a8ea3090b39562dbf43392227d983f1
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jan 31 09:06:04 2014 +0100
fix checkstyle
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index b2d5de7..953a10f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -131,7 +131,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
User user = getLoggedInUser(sessionKey);
Channel channel = lookupChannelByLabel(user, channelLabel);
- return ChannelManager.listErrataNeedingResync(channel, user);
+ return ChannelManager.listErrataNeedingResync(channel, user);
}
/**
10 years, 2 months
Changes to 'refs/tags/spacewalk-utils-2.1.27-1'
by StephenHerr
Tag 'spacewalk-utils-2.1.27-1' created by Stephen Herr <sherr(a)redhat.com> at 2014-01-30 22:50 +0000
Tagging package [spacewalk-utils] version [2.1.27-1] in directory [utils/].
Changes since spacewalk-java-2.1.136-1:
Matej Kollar (2):
Small code cleanup
Removing unaesthetic spaces around dots in IPv4 address
Stephen Herr (2):
1059910 - create api for channel errata syncing, have clone-by-date call it
Automatic commit of package [spacewalk-utils] release [2.1.27-1].
Tomas Kasparek (5):
update copyright year in page footer in java
update copyright year in perl footer
style table for system comparsion
use rhn:toolbar for page headers
fix style on kickstart profile creation wizard + use rhn:toolbar
---
branding/css/spacewalk-tables.less | 18 +
branding/templates/footer.pxt | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 33 +++
java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java | 8
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 99 ++++++++++
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 22 ++
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf | 43 +---
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp | 54 ++---
rel-eng/packages/spacewalk-utils | 2
utils/cloneByDate.py | 26 ++
utils/spacewalk-clone-by-date | 4
utils/spacewalk-clone-by-date.sgml | 12 +
utils/spacewalk-utils.spec | 5
30 files changed, 293 insertions(+), 97 deletions(-)
---
10 years, 2 months
Changes to 'refs/tags/spacewalk-java-2.1.137-1'
by StephenHerr
Tag 'spacewalk-java-2.1.137-1' created by Stephen Herr <sherr(a)redhat.com> at 2014-01-30 22:51 +0000
Tagging package [spacewalk-java] version [2.1.137-1] in directory [java/].
Changes since spacewalk-java-2.1.136-1:
Matej Kollar (2):
Small code cleanup
Removing unaesthetic spaces around dots in IPv4 address
Stephen Herr (3):
1059910 - create api for channel errata syncing, have clone-by-date call it
Automatic commit of package [spacewalk-utils] release [2.1.27-1].
Automatic commit of package [spacewalk-java] release [2.1.137-1].
Tomas Kasparek (5):
update copyright year in page footer in java
update copyright year in perl footer
style table for system comparsion
use rhn:toolbar for page headers
fix style on kickstart profile creation wizard + use rhn:toolbar
---
branding/css/spacewalk-tables.less | 18 +
branding/templates/footer.pxt | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 33 +++
java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java | 8
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 99 ++++++++++
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 22 ++
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf | 43 +---
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp | 54 ++---
java/spacewalk-java.spec | 10 -
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-utils | 2
utils/cloneByDate.py | 26 ++
utils/spacewalk-clone-by-date | 4
utils/spacewalk-clone-by-date.sgml | 12 +
utils/spacewalk-utils.spec | 5
32 files changed, 303 insertions(+), 99 deletions(-)
---
10 years, 2 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages utils/cloneByDate.py utils/spacewalk-clone-by-date utils/spacewalk-clone-by-date.sgml utils/spacewalk-utils.spec
by StephenHerr
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 33 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 99 ++++++++++
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 22 ++
java/spacewalk-java.spec | 10 -
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-utils | 2
utils/cloneByDate.py | 26 ++
utils/spacewalk-clone-by-date | 4
utils/spacewalk-clone-by-date.sgml | 12 +
utils/spacewalk-utils.spec | 5
10 files changed, 204 insertions(+), 11 deletions(-)
New commits:
commit 0aa2ed99cc98f183ae558cb13c3e44a368c931e3
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jan 30 17:51:02 2014 -0500
Automatic commit of package [spacewalk-java] release [2.1.137-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 48d4757..fc43375 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.136
+Version: 2.1.137
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,14 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 30 2014 Stephen Herr <sherr(a)redhat.com> 2.1.137-1
+- 1059910 - create api for channel errata syncing, have clone-by-date call it
+- fix style on kickstart profile creation wizard + use rhn:toolbar
+- use rhn:toolbar for page headers
+- update copyright year in page footer in java
+- Removing unaesthetic spaces around dots in IPv4 address
+- Small code cleanup
+
* Thu Jan 30 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.136-1
- Fixed ssm reboot scheduling.
- Sometimes we don't want "add to ssm" option...
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1c41b95..bf1e5c2 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.136-1 java/
+2.1.137-1 java/
commit 27a394670e132cc1282baecc936d5bad3bf76933
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jan 30 17:50:11 2014 -0500
Automatic commit of package [spacewalk-utils] release [2.1.27-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index c38810d..d98be26 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.1.26-1 utils/
+2.1.27-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 678837b..88bb248 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.1.26
+Version: 2.1.27
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -91,6 +91,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Thu Jan 30 2014 Stephen Herr <sherr(a)redhat.com> 2.1.27-1
+- 1059910 - create api for channel errata syncing, have clone-by-date call it
+
* Wed Jan 29 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.26-1
- adding postgresql92-postgresql to possible db service names
commit f0da6be14e30c2570301c0692217171fad1ac690
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jan 30 17:49:51 2014 -0500
1059910 - create api for channel errata syncing, have clone-by-date call it
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index dc41206..f858e4c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -1296,6 +1296,39 @@ WHERE C.package_id IS NULL
</query>
</mode>
+<mode name="list_packages_needing_sync" class="com.redhat.rhn.frontend.dto.PackageOverview">
+ <query params="ocid, cid">
+SELECT p.id, pn.name AS package_name,
+ pn.name || '-' || evr_t_as_vre_simple(pevr.evr) || '.' || pa.label AS nvrea,
+ p.summary
+FROM
+(
+ SELECT
+ oep.package_id, ec.id AS clone_errata_id
+ FROM rhnChannelPackage ocp
+ JOIN rhnChannelErrata oce ON oce.channel_id = ocp.channel_id
+ JOIN rhnErrataPackage oep ON oep.errata_id = oce.errata_id
+ AND oep.package_id = ocp.package_id
+ JOIN rhnErrataCloned ec ON ec.original_id = oep.errata_id
+WHERE ocp.channel_id = :ocid
+) O
+LEFT JOIN (
+ SELECT
+ cep.package_id, cep.errata_id
+ FROM rhnChannelPackage ccp
+ JOIN rhnChannelErrata cce ON cce.channel_id = ccp.channel_id
+ JOIN rhnErrataPackage cep ON cep.errata_id = cce.errata_id
+ AND cep.package_id = ccp.package_id
+WHERE ccp.channel_id = :cid
+) C ON C.errata_id = O.clone_errata_id AND C.package_id = O.package_id
+JOIN rhnPackage p ON p.id = O.package_id
+JOIN rhnPackageName pn ON pn.id = p.name_id
+JOIN rhnPackageEVR pevr ON pevr.id = p.evr_id
+JOIN rhnPackageArch pa ON pa.id = p.package_arch_id
+WHERE C.package_id IS NULL
+ </query>
+</mode>
+
<mode name="list_packages_needing_sync_from_set" class="com.redhat.rhn.frontend.dto.PackageOverview">
<query params="set_label, ocid, cid">
SELECT p.id, pn.name AS package_name,
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index abdeb26..b2d5de7 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -30,6 +30,7 @@ import com.redhat.rhn.domain.channel.ContentSource;
import com.redhat.rhn.domain.channel.ContentSourceFilter;
import com.redhat.rhn.domain.channel.InvalidChannelRoleException;
import com.redhat.rhn.domain.channel.NewChannelHelper;
+import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.ErrataFactory;
import com.redhat.rhn.domain.org.Org;
@@ -41,6 +42,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ErrataOverview;
+import com.redhat.rhn.frontend.dto.PackageOverview;
import com.redhat.rhn.frontend.events.UpdateErrataCacheEvent;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.DuplicateChannelLabelException;
@@ -99,6 +101,103 @@ public class ChannelSoftwareHandler extends BaseHandler {
private static Logger log = Logger.getLogger(ChannelSoftwareHandler.class);
/**
+ * If you have satellite-synced a new channel then Red Hat Errata
+ * will have been updated with the packages that are in the newly synced
+ * channel. A cloned erratum will not have been automatically updated
+ * however. If you cloned a channel that includes those cloned errata and
+ * should include the new packages, they will not be included when they
+ * should. This method lists the errata that will be updated if you run the
+ * syncErrata method.
+ * @param sessionKey WebSession containing User information.
+ * @param channelLabel Label of cloned channel to check
+ * @return List of errata that are missing packages
+ *
+ * @xmlrpc.doc If you have satellite-synced a new channel then Red Hat
+ * Errata will have been updated with the packages that are in the newly
+ * synced channel. A cloned erratum will not have been automatically updated
+ * however. If you cloned a channel that includes those cloned errata and
+ * should include the new packages, they will not be included when they
+ * should. This method lists the errata that will be updated if you run the
+ * syncErrata method.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("string", "channelLabel", "channel to update")
+ * @xmlrpc.returntype
+ * #array()
+ * $ErrataOverviewSerializer
+ * #array_end()
+ */
+ public List<ErrataOverview> listErrataNeedingSync(String sessionKey,
+ String channelLabel) {
+ User user = getLoggedInUser(sessionKey);
+ Channel channel = lookupChannelByLabel(user, channelLabel);
+
+ return ChannelManager.listErrataNeedingResync(channel, user);
+ }
+
+ /**
+ * If you have satellite-synced a new channel then Red Hat Errata
+ * will have been updated with the packages that are in the newly synced
+ * channel. A cloned erratum will not have been automatically updated
+ * however. If you cloned a channel that includes those cloned errata and
+ * should include the new packages, they will not be included when they
+ * should. This method updates all the errata in the given cloned channel
+ * with packages that have recently been added, and ensures that all the
+ * packages you expect are in the channel.
+ * @param sessionKey WebSession containing User information.
+ * @param channelLabel Label of cloned channel to update
+ * @return Returns 1 if successfull, FaultException otherwise
+ * @throws NoSuchChannelException thrown if no channel is found.
+ *
+ * @xmlrpc.doc If you have satellite-synced a new channel then Red Hat
+ * Errata will have been updated with the packages that are in the newly
+ * synced channel. A cloned erratum will not have been automatically updated
+ * however. If you cloned a channel that includes those cloned errata and
+ * should include the new packages, they will not be included when they
+ * should. This method updates all the errata in the given cloned channel
+ * with packages that have recently been added, and ensures that all the
+ * packages you expect are in the channel.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("string", "channelLabel", "channel to update")
+ * @xmlrpc.returntype #return_int_success()
+ */
+ public Integer syncErrata(String sessionKey, String channelLabel) {
+ User user = getLoggedInUser(sessionKey);
+ Channel channel = lookupChannelByLabel(user, channelLabel);
+ //Verify permissions
+ if (!(UserManager.verifyChannelAdmin(user, channel) ||
+ user.hasRole(RoleFactory.CHANNEL_ADMIN))) {
+ throw new PermissionCheckFailureException();
+ }
+
+ List<ErrataOverview> errata = ChannelManager.listErrataNeedingResync(channel, user);
+ List<Long> eids = new ArrayList<Long>();
+ for (ErrataOverview e : errata) {
+ eids.add(e.getId());
+ }
+
+ List<PackageOverview> packages = ChannelManager
+ .listErrataPackagesForResync(channel, user);
+ List<Long> pids = new ArrayList<Long>();
+ for (PackageOverview p : packages) {
+ pids.add(p.getId());
+ }
+
+ ChannelEditor.getInstance().addPackages(user, channel, pids);
+
+ for (Long eid : eids) {
+ Errata e = ErrataManager.lookupErrata(eid, user);
+ if (e.isPublished() && e.isCloned()) {
+ ErrataFactory.syncErrataDetails((PublishedClonedErrata) e);
+ }
+ else {
+ log.fatal("Tried to sync errata with id " + eid +
+ " But it was not published or was not cloned");
+ }
+ }
+ return 1;
+ }
+
+ /**
* Lists the packages with the latest version (including release and epoch)
* for the unique package names
* @param sessionKey WebSession containing User information.
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 658f41f..025d880 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -2584,6 +2584,28 @@ public class ChannelManager extends BaseManager {
* List errata packages that need to be resynced
* @param c the channel to look for packages in
* @param user the user doing it
+ * @return the list of PackageOverview objects
+ */
+ public static List listErrataPackagesForResync(Channel c, User user) {
+ if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) {
+ throw new PermissionException(RoleFactory.CHANNEL_ADMIN);
+ }
+
+ if (c.isCloned()) {
+ Map params = new HashMap();
+ params.put("cid", c.getId());
+ params.put("ocid", c.getOriginal().getId());
+ SelectMode m = ModeFactory.getMode("Errata_queries",
+ "list_packages_needing_sync");
+ return m.execute(params);
+ }
+ return Collections.EMPTY_LIST;
+ }
+
+ /**
+ * List errata packages that need to be resynced
+ * @param c the channel to look for packages in
+ * @param user the user doing it
* @param setLabel the set of errata to base the package off of
* @return the list of PackageOverview objects
*/
diff --git a/utils/cloneByDate.py b/utils/cloneByDate.py
index b199a38..588a1da 100644
--- a/utils/cloneByDate.py
+++ b/utils/cloneByDate.py
@@ -145,12 +145,13 @@ def main(options):
options.to_date, options.blacklist,
options.removelist, options.background,
options.security_only, options.use_update_date,
- options.parents)
+ options.no_errata_sync, options.parents)
else:
tree_cloner = ChannelTreeCloner(channel_list, xmlrpc, db,
options.to_date, options.blacklist,
options.removelist, options.background,
- options.security_only,options.use_update_date)
+ options.security_only,options.use_update_date,
+ options.no_errata_sync)
cloners.append(tree_cloner)
needed_channels += tree_cloner.needing_create().values()
@@ -202,8 +203,8 @@ class ChannelTreeCloner:
"""
# pylint: disable=R0902
def __init__(self, channels, remote_api, db_api, to_date, blacklist,
- removelist, detached,
- security_only, use_update_date, parents = None):
+ removelist, detached, security_only, use_update_date,
+ no_errata_sync, parents = None):
self.remote_api = remote_api
self.db_api = db_api
self.channel_map = channels
@@ -223,13 +224,15 @@ class ChannelTreeCloner:
self.detached = detached
self.security_only = security_only
self.use_update_date = use_update_date
+ self.no_errata_sync = no_errata_sync
self.validate_source_channels()
for from_label in self.ordered_labels():
to_label = self.channel_map[from_label]
cloner = ChannelCloner(from_label, to_label, self.to_date,
self.remote_api, self.db_api, self.detached,
- self.security_only,self.use_update_date)
+ self.security_only, self.use_update_date,
+ self.no_errata_sync)
self.cloners.append(cloner)
@@ -427,7 +430,7 @@ class ChannelTreeCloner:
class ChannelCloner:
# pylint: disable=R0902
def __init__(self, from_label, to_label, to_date, remote_api, db_api,
- detached, security_only, use_update_date):
+ detached, security_only, use_update_date, no_errata_sync):
self.remote_api = remote_api
self.db_api = db_api
self.from_label = from_label
@@ -441,6 +444,7 @@ class ChannelCloner:
self.detached = detached
self.security_only = security_only
self.use_update_date = use_update_date
+ self.no_errata_sync = no_errata_sync
def dest_label(self):
@@ -547,6 +551,12 @@ class ChannelCloner:
self.reset_new_pkgs()
pb.printComplete()
+ if not self.no_errata_sync:
+ log_clean(0, "")
+ log_clean(0, "Synchronizing Errata in %s with originals"
+ % self.to_label)
+ self.remote_api.sync_errata(self.to_label)
+
def get_errata(self):
""" Returns tuple of all available for cloning, and what falls in the date range"""
available_errata = self.db_api.applicable_errata(self.from_label, self.to_label)
@@ -674,6 +684,10 @@ class RemoteApi:
self.auth_check()
self.client.errata.cloneAsOriginalAsync(self.auth_token, to_label, errata_list)
+ def sync_errata(self, to_label):
+ self.auth_check()
+ self.client.channel.software.syncErrata(self.auth_token, to_label)
+
def get_details(self, label):
self.auth_check()
try:
diff --git a/utils/spacewalk-clone-by-date b/utils/spacewalk-clone-by-date
index dd48729..862e9c6 100755
--- a/utils/spacewalk-clone-by-date
+++ b/utils/spacewalk-clone-by-date
@@ -43,6 +43,7 @@ SAMPLE_CONFIG = """
"skip_depsolve":false,
"security_only":false,
"use_update_date":false,
+ "no_errata_sync":false,
"blacklist": {
"ALL":["sendmail"],
"my-rhel5-x86_64-clone":["emacs"],
@@ -87,7 +88,7 @@ def merge_config(options):
# add it to options
overwrite = ["username", "password", "blacklist", "removelist", "channels",
"server", "assumeyes", "to_date", "skip_depsolve",
- "security_only", "use_update_date"]
+ "security_only", "use_update_date", "no_errata_sync"]
for key in overwrite:
if config.has_key(key) and not getattr(options, key):
setattr(options, key, config[key])
@@ -156,6 +157,7 @@ def parse_args():
+ "original parent and destination parent of child "
+ "channels cloned this session.")
parser.add_option("-z", "--use-update-date", dest="use_update_date", action='store_true', help="While cloning errata by date, clone all errata that have last been updated on or before the date provided by to_date. If omitted will use issue date of errata (default).")
+ parser.add_option("-n", "--no-errata-sync", dest="no_errata_sync", action='store_true', help="Do not automatically sychronize the package list of cloned errata with their originals. This may make spacewalk-clone-by-date have unexpected results if the original errata have been updated (e.g.: syncing another architecture for a channel) since the cloned errata were created. If omitted we will synchronize the cloned errata with the originals to ensure the expected packages are included (default).")
(options, args) = parser.parse_args()
diff --git a/utils/spacewalk-clone-by-date.sgml b/utils/spacewalk-clone-by-date.sgml
index f2fbf8f..45452b9 100644
--- a/utils/spacewalk-clone-by-date.sgml
+++ b/utils/spacewalk-clone-by-date.sgml
@@ -71,6 +71,9 @@ Utility for cloning errata by date.
<arg>-g</arg><arg>--background</arg>
</cmdsynopsis>
<cmdsynopsis>
+ <arg>-n</arg><arg>--no-errata-sync</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
<arg>-h</arg><arg>--help</arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -210,6 +213,15 @@ Utility for cloning errata by date.
</listitem>
</varlistentry>
<varlistentry>
+ <term>-n --no-errata-sync</term>
+ <listitem>
+ <para>Do not automatically sychronize the package list of cloned errata with their originals. This may make spacewalk-clone-by-date have unexpected results if the original errata have been updated (e.g.: syncing another architecture for a channel) since the cloned errata were created. If omitted we will synchronize the cloned errata with the originals to ensure the expected packages are included (default).
+ </para>
+ <para>Errata clones do not necessarily get out-of-sync by satellite-syncing new architectures of existing channels. Another example would be if the errata contains some packages in one channel (say the base channel) and additional packages in another channel (say a child channel). Or it may be due to simply adding or removing packages from a custom errata that you have already created a clone of. Since cloned errata are not automatically updated when the original errata are, over time they may become out-of-sync are require synchronization in order for associating the cloned errata with a cloned channel to have the normally expected effect.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>-a <replaceable>SRC_PARENT DEST_PARENT</replaceable>, --parents=<replaceable>SRC_PARENT DEST_PARENT</replaceable></term>
<listitem>
<para>Space separated list of source parent channel and destination parent channel. These channels are used for resolving dependencies and cloning the children, but will not be cloned themselves. Both channels specified here must already exist. There is no way to specify this option through the config channel, you must simply re-list the parent src:dest channels as part of the list to clone. Spacewalk-clone-by-date will detect that the dest parent channel already exists and will not try to re-create it.</para>
10 years, 2 months
2 commits - java/code
by Tomáš Kašpárek
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp | 54 +++++-----
2 files changed, 30 insertions(+), 26 deletions(-)
New commits:
commit bf1531f1e10ff6e1e3ece3ed95b11ee793b07fd1
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jan 30 13:58:17 2014 +0100
fix style on kickstart profile creation wizard + use rhn:toolbar
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp
index a17a601..66adf2c 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp
@@ -60,31 +60,35 @@ function movePrevious() {
<html:hidden property="virtualizationTypeLabel" />
<html:hidden property="kstreeId" />
<html:hidden property="kstreeUpdateType" />
- <h1><bean:message key="kickstart.jsp.create.wizard.step.two"/></h1>
- <table class="details" width="80%">
- <tr>
- <td colspan="2"><bean:message key="kickstart.jsp.create.wizard.second.heading1" /></td>
- </tr>
- <tr>
- <th width="10%"><bean:message key="kickstart.jsp.create.wizard.default.download.location.label" />:</th>
- <td>
- <html:radio styleId="wizard-defaultdownloadon" property="defaultDownload" value="true" onclick="disableCtl('wizard-userdefdload');"><bean:write name="kickstartCreateWizardForm" property="defaultDownloadLocation" /></html:radio>
- </td>
- </tr>
- <tr>
- <th width="10%"><bean:message key="kickstart.jsp.create.wizard.custom.download.location.label" />:</th>
- <td>
- <html:radio styleId="wizard-defaultdownloadoff" property="defaultDownload" value="false" onclick="enableCtl('wizard-userdefdload');"><html:text property="userDefinedDownload" styleId="wizard-userdefdload" size="50" maxlength="512" /></html:radio>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="right">
- <input type="button" value="<bean:message key='wizard.jsp.previous.step'/>" onclick="movePrevious();" />
-
- <input type="button" value="<bean:message key='wizard.jsp.next.step'/>" onclick="moveNext();" />
- </td>
- </tr>
- </table>
+ <rhn:toolbar base="h1" icon="header-kickstart"><bean:message key="kickstart.jsp.create.wizard.step.two"/></rhn:toolbar>
+ <p><bean:message key="kickstart.jsp.create.wizard.second.heading1" /></p>
+ <div class="panel panel-default">
+ <ul class="list-group">
+ <div class="row">
+ <div class="col-sm-2">
+ <bean:message key="kickstart.jsp.create.wizard.default.download.location.label" />:
+ </div>
+ <div class="col-sm-10">
+ <html:radio styleId="wizard-defaultdownloadon" property="defaultDownload" value="true" onclick="disableCtl('wizard-userdefdload');"><bean:write name="kickstartCreateWizardForm" property="defaultDownloadLocation" /></html:radio>
+ </div>
+ </div>
+ </ul>
+ <ul class="list-group">
+ <div class="row">
+ <div class="col-sm-2">
+ <bean:message key="kickstart.jsp.create.wizard.custom.download.location.label" />:
+ </div>
+ <div class="col-sm-10">
+ <html:radio styleId="wizard-defaultdownloadoff" property="defaultDownload" value="false" onclick="enableCtl('wizard-userdefdload');"><html:text property="userDefinedDownload" styleId="wizard-userdefdload" size="50" maxlength="512" /></html:radio>
+ </div>
+ </div>
+ </ul>
+ </div>
+ <div align="right">
+ <input type="button" value="<bean:message key='wizard.jsp.previous.step'/>" onclick="movePrevious();" class="btn btn-default"/>
+
+ <input type="button" value="<bean:message key='wizard.jsp.next.step'/>" onclick="moveNext();" class="btn btn-default"/>
+ </div>
</html:form>
</div>
</body>
commit 806f73dfbc0bb398f0ddac90376a6771fadff28b
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jan 30 13:53:13 2014 +0100
use rhn:toolbar for page headers
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
index c19a181..2cf0c32 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
@@ -62,7 +62,7 @@ function clickNewestTree() {
<html:hidden property="wizardStep" styleId="wizard-curstep" />
<html:hidden property="nextStep" styleId="wizard-nextstep" />
<html:hidden property="previousChannelId" />
- <h1><bean:message key="kickstart.jsp.create.wizard.step.one"/></h1>
+ <rhn:toolbar base="h1" icon="header-kickstart"><bean:message key="kickstart.jsp.create.wizard.step.one"/></rhn:toolbar>
<p><bean:message key="kickstart.jsp.create.wizard.first.heading1" /></p>
<div class="form-group">
10 years, 2 months
branding/css
by Tomáš Kašpárek
branding/css/spacewalk-tables.less | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
New commits:
commit 87773fd4aac0de1e7ce54f59d76eb2a11ff597e6
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jan 30 11:53:48 2014 +0100
style table for system comparsion
diff --git a/branding/css/spacewalk-tables.less b/branding/css/spacewalk-tables.less
index 256674d..68359fd 100644
--- a/branding/css/spacewalk-tables.less
+++ b/branding/css/spacewalk-tables.less
@@ -130,3 +130,21 @@ background-color: darken(#d9edf7, 3%) !important;
background-color: darken(#d9edf7, 13%) !important;
}
+.compare-list {
+ .border-rounded(0, 0, 3px, 3p);
+ border: 1px solid #DDDDDD;
+ width: 100%;
+}
+
+.compare-list th {
+ padding: 10px 0px 10px 10px;
+}
+
+.compare-list input[type="submit"] {
+ margin: 5px 0px 5px 15px;
+}
+
+.compare-list td:first-child {
+ background-color: #e2e2e2 !important;
+ border-right: 1px solid #DDDDDD;
+}
10 years, 2 months