[prev in list] [next in list] [prev in thread] [next in thread]
List: spacewalk-commits
Subject: 2 commits - java/code
From: Tomáš Kašpárek <tkasparek () fedoraproject ! org>
Date: 2014-01-31 8:07:20
Message-ID: 20140131080720.2763A6109B () fedorahosted ! org
[Download RAW message or body]
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@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@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);
}
/**
_______________________________________________
spacewalk-commits mailing list
spacewalk-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/spacewalk-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic