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">
Show replies by date