client/rhel
by Milan Zazrivec
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7760c859623fa262effcc6aad295f5f5e0383794
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Feb 3 16:20:43 2014 +0100
1043850 - avoid insecure use of /var/tmp
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 188bc90..f879868 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -49,16 +49,16 @@ export pluginconf='/etc/yum/pluginconf.d/rhnplugin.conf'
if [ $1 -gt 1 ] && [ -f /etc/sysconfig/rhn/systemid ] && [ -f "$pluginconf" ]; then
if grep -q '^[[:space:]]*enabled[[:space:]]*=[[:space:]]*1[[:space:]]*$' \
"$pluginconf"; then
- touch /var/tmp/enable-yum-rhn-plugin
+ echo "1" > /etc/enable-yum-rhn-plugin
fi
fi
%post
# 682820 - re-enable yum-rhn-plugin after package upgrade if the system is already registered
export pluginconf='/etc/yum/pluginconf.d/rhnplugin.conf'
-if [ $1 -gt 1 ] && [ -f "$pluginconf" ] && [ -f "/var/tmp/enable-yum-rhn-plugin" ]; then
+if [ $1 -gt 1 ] && [ -f "$pluginconf" ] && [ -f "/etc/enable-yum-rhn-plugin" ]; then
sed -i '/\[main]/,/^$/{/enabled/s/0/1/}' "$pluginconf"
- rm -f /var/tmp/enable-yum-rhn-plugin
+ rm -f /etc/enable-yum-rhn-plugin
fi
%files -f %{name}.lang
10 years, 2 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 19 +++++++++-
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java | 3 +
2 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit c2dfd93413b74413e464fcc5949b6b7c3b90d94a
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Feb 3 15:14:28 2014 +0100
make ExpansionDecorator work again
due to changes in ListTag id of table no longer belongs to table but to some <div> enveloping the table
new id is generated for the the <table> if the ListTag has ExpansionDecorator to make javascript around it work again
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index a98fc99..30f28e1 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -36,6 +36,7 @@ import com.redhat.rhn.frontend.context.Context;
import com.redhat.rhn.frontend.html.HtmlTag;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.taglibs.RhnListTagFunctions;
+import com.redhat.rhn.frontend.taglibs.list.decorators.ExpansionDecorator;
import com.redhat.rhn.frontend.taglibs.list.decorators.ListDecorator;
import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
@@ -999,7 +1000,13 @@ public class ListTag extends BodyTagSupport {
}
private void startTable() throws JspException {
- ListTagUtil.write(pageContext, "<table class=\"table table-striped\"");
+ if (hasExpansionDecorator()) {
+ ListTagUtil.write(pageContext, "<table class=\"table table-striped\"" +
+ "id=\"" + this.getStyleId() + "_exp\"");
+ }
+ else {
+ ListTagUtil.write(pageContext, "<table class=\"table table-striped\"");
+ }
if (width != null) {
ListTagUtil.write(pageContext, " width=\"");
@@ -1237,4 +1244,14 @@ public class ListTag extends BodyTagSupport {
public void setReflinkkeyarg0(String refLinkKeyArg0In) {
this.refLinkKeyArg0 = refLinkKeyArg0In;
}
+
+ private boolean hasExpansionDecorator() {
+ for (ListDecorator dec : getDecorators()) {
+ if (dec.getClass().equals(ExpansionDecorator.class)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
index 9343e30..6cc7e59 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
@@ -63,6 +63,7 @@ public class ExpansionDecorator extends BaseListDecorator {
public void afterList() throws JspException {
ListTag list = getCurrentList();
ListTagUtil.write(pageContext, String.format(LOAD_SCRIPT,
- list.getColumnCount(), list.getStyleId(), listName, listName));
+ list.getColumnCount(), list.getStyleId() + "_exp",
+ listName, listName));
}
}
10 years, 2 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/data/Makefile | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 239d56682d9401376835f0b173d5c193bc490149
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Feb 3 14:50:00 2014 +0100
1060742 - new information icon in gnome3
diff --git a/client/rhel/rhn-client-tools/data/Makefile b/client/rhel/rhn-client-tools/data/Makefile
index 8dfd214..01fedaf 100644
--- a/client/rhel/rhn-client-tools/data/Makefile
+++ b/client/rhel/rhn-client-tools/data/Makefile
@@ -86,6 +86,8 @@ endif
ifeq ($(shell test $(RHEL) -ge 7 -o $(FEDORA) -ge 18 && echo "newerror"), newerror)
sed -i -e "s|gtk-dialog-error|dialog-error|g" \
$(RHNSHARE_DIR)/up2date_client/rh_register.glade
+ sed -i -e "s|gtk-dialog-info|dialog-information|g" \
+ $(RHNSHARE_DIR)/up2date_client/rh_register.glade
endif
# this is lame and should be dealt with in the code
10 years, 2 months
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 1 +
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 03cb1a20fd696365e6b1f0d6448a26b544f90025
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 3 13:28:27 2014 +0100
new icon for item edit
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 a997d44..686a31d 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -115,6 +115,7 @@ public class IconTag extends TagSupport {
icons.put("item-disabled", "fa fa-circle-o text-muted");
icons.put("item-download", "fa fa-download");
icons.put("item-download-csv", "fa spacewalk-icon-download-csv");
+ icons.put("item-edit", "fa fa-edit");
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");
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
index c3804c4..f7db58e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
@@ -14,7 +14,7 @@
<c:if test="${is_suite_probe}">
<rhn:toolbar base="h2" icon="header-system"
miscAlt="probedetails.jsp.editsuiteprobe"
- miscIcon="item-clone"
+ miscIcon="item-edit"
miscUrl="/rhn/monitoring/config/ProbeSuiteProbeEdit.do?suite_id=${probe.templateProbe.probeSuite.id}&probe_id=${probe.templateProbe.id}"
miscText="probedetails.jsp.editsuiteprobe"
creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}"
@@ -27,7 +27,7 @@
deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}"
deletionType="probe"
miscAlt="probedetails.jsp.editthisprobe"
- miscIcon="item-clone"
+ miscIcon="item-edit"
miscUrl="ProbeEdit.do?probe_id=${probe.id}&sid=${system.id}"
miscText="probedetails.jsp.editthisprobe"
creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}"
10 years, 2 months
2 commits - branding/css
by Michael Mraka
branding/css/spacewalk-theme.less | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
New commits:
commit 086334ce2579fc00634e805135b52cf0d46473ed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 3 12:49:57 2014 +0100
help links are already hidden via spacewalk-help-link class
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less
index 9307890..4935e58 100644
--- a/branding/css/spacewalk-theme.less
+++ b/branding/css/spacewalk-theme.less
@@ -459,10 +459,6 @@ aside .nav > li > a {
/* spacewalk toolbar: contains the H1 of each page + the toolbar */
.spacewalk-toolbar-h1 {
margin-bottom: 1.5em;
- /* we want to hide quesiton mark pointing to satellite docs in spacewalk */
- a .fa-stack {
- .hidden;
- }
}
.spacewalk-toolbar {
commit 845d79295a847d7c388b008b4ba6d54388af38ee
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 3 12:47:09 2014 +0100
move toolbar items right for all header levels
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less
index ac0b595..9307890 100644
--- a/branding/css/spacewalk-theme.less
+++ b/branding/css/spacewalk-theme.less
@@ -463,19 +463,20 @@ aside .nav > li > a {
a .fa-stack {
.hidden;
}
- .spacewalk-toolbar {
- .pull-right;
- padding: .5em 1em;
- a {
- border-right:1px solid @gray-light;
- padding: 0 .5em
- }
- a:hover {
- text-decoration: none;
- }
- a:last-child {
- border-right:0
- }
+}
+
+.spacewalk-toolbar {
+ .pull-right;
+ padding: .5em 1em;
+ a {
+ border-right:1px solid @gray-light;
+ padding: 0 .5em
+ }
+ a:hover {
+ text-decoration: none;
+ }
+ a:last-child {
+ border-right:0
}
}
10 years, 2 months