java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 40 ++++++----
1 file changed, 25 insertions(+), 15 deletions(-)
New commits:
commit 5fe07f4162a7dbad2559220bd72e8047c5ad8620
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed May 12 10:24:01 2010 -0400
Revert "fixing accidental branch creation, removing cobbler stubs"
This reverts commit ba2c85ace5e35e7388e59673e0bb7f899a1fc8bb.
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
index 09ef2a6..1a73888 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
@@ -7,15 +7,17 @@
<html>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
- creationUrl="RepoCreate.do"
- creationType="repos"
+ creationUrl="CobblerSnippetCreate.do"
+ creationType="snippets"
imgAlt="info.alt.img">
- <bean:message key="repos.jsp.toolbar"/>
+ <bean:message key="snippets.jsp.toolbar"/>
</rhn:toolbar>
+<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/snippet_tabs.xml"
+ renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
<div class="page-summary">
-<p><bean:message key="repos.jsp.summary"/></p>
+<p><bean:message key="snippets.jsp.summary"/></p>
<c:if test="${not empty requestScope.default}">
- <rhn:note key = "repos.jsp.note.default"/>
+ <rhn:note key = "snippets.jsp.note.default"/>
</c:if>
</div>
@@ -25,7 +27,7 @@
width="100%"
name="keysList"
styleclass="list"
- emptykey="cobbler.repo.jsp.norepos"
+ emptykey="cobbler.snippet.jsp.nosnippets"
alphabarcolumn="name">
<rl:decorator name="PageSizeDecorator"/>
@@ -33,19 +35,27 @@
<!-- Description name column -->
<rl:column bound="false"
sortable="true"
- headerkey="channel.repo.label"
+ headerkey="cobbler.snippet.name"
styleclass="first-column"
- sortattr= "label"
- filterattr="label">
- <c:choose>
- <c:out value="<a
href=\"/rhn/channels/manage/repos/RepoEdit.do?id=${current.id}\">${current.label}</a>"
escapeXml="false" />
+ sortattr= "name"
+ filterattr="name">
+ <c:choose>
+ <c:when test = "${current.editable}">
+ <c:out value="<a
href=\"/rhn/kickstart/cobbler/CobblerSnippetEdit.do?name=${current.name}\">${current.name}</a>"
escapeXml="false" />
+ </c:when>
+ <c:otherwise>
+ <c:out value="<a
href=\"/rhn/kickstart/cobbler/CobblerSnippetView.do?path=${current.displayPath}\">${current.name}</a>"
escapeXml="false" />
+ </c:otherwise>
+
</c:choose>
</rl:column>
- <rl:column headerkey="channel.repo.lastsync"
styleclass="last-column">
- <c:out value="${current.sync}"/>
- </rl:column>
+ <rl:column headerkey="cobbler.snippet.macro"
styleclass="last-column">
+ <c:out value="${current.fragment}"/>
+ </rl:column>
</rl:list>
- </rl:listset>
+ </rl:listset>
+
+ <rhn:tooltip key="cobbler.snippet.copy-paste-snippet-tip"/>
</body>
</html>
Show replies by date