java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++
java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp | 69
+---------
2 files changed, 27 insertions(+), 58 deletions(-)
New commits:
commit 4adb5742c0fcfba4e6b6f28d9f59234a8a229fdd
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 10:20:22 2010 -0400
pushing changes to prepare for master merge
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 33d5844..f5f6f87 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -9247,6 +9247,22 @@ Please note that some manual configuration of these scripts may
still be require
<context
context-type="sourcefile">/rhn/channel/manage/repo/RepoList.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="repos.jsp.toolbar">
+ <source>Create New Repository</source>
+ </trans-unit>
+ <trans-unit id="repos.jsp.header2">
+ <source>Create Repository</source>
+ </trans-unit>
+ <trans-unit id="repos.jsp.header2">
+ <source>Create Repository</source>
+ </trans-unit>
+ <trans-unit id="repos.jsp.create.label">
+ <source>Repository Label</source>
+ </trans-unit>
+ <trans-unit id="repos.jsp.create.url">
+ <source>Repository URL</source>
+ </trans-unit>
+
<!-- TNC -->
<trans-unit id="tnc.jsp.tnc">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
index 09cf099..8e7b356 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
@@ -3,22 +3,18 @@
<%@ taglib
uri="http://jakarta.apache.org/struts/tags-bean"
prefix="bean" %>
<%@ taglib
uri="http://jakarta.apache.org/struts/tags-html"
prefix="html" %>
-<head>
-<%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %>
-</head>
-
<html:html xhtml="true">
<body>
<c:choose>
<c:when test = "${not empty requestScope.create_mode}">
<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
- <bean:message key="snippetcreate.jsp.toolbar"/>
+ <bean:message key="repos.jsp.toolbar"/>
</rhn:toolbar>
-<h2><bean:message key="snippetcreate.jsp.header2"/></h2>
+<h2><bean:message key="repos.jsp.header2"/></h2>
</c:when>
<c:otherwise>
<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img"
-
deletionUrl="CobblerSnippetDelete.do?name=${cobblerSnippetsForm.map.name}"
+
deletionUrl="RepoDelete.do?label=${contentSourceForm.map.label}"
deletionType="snippets">
<c:out value="${requestScope.snippet.displayName}"/>
</rhn:toolbar>
@@ -29,10 +25,10 @@
<c:choose>
<c:when test="${empty requestScope.create_mode}">
- <c:set var="url" value
="/kickstart/cobbler/CobblerSnippetEdit"/>
+ <c:set var="url" value ="/channels/manage/repos/RepoEdit"/>
</c:when>
<c:otherwise>
- <c:set var="url" value
="/kickstart/cobbler/CobblerSnippetCreate"/>
+ <c:set var="url" value
="/channels/manage/repos/RepoCreate"/>
</c:otherwise>
</c:choose>
@@ -43,59 +39,16 @@
<table class="details">
<tr>
<th>
- <rhn:required-field key = "cobbler.snippet.name"/>
+ <rhn:required-field key = "repos.jsp.create.label"/>
</th>
<td>
- <html:text property="name"/>
- <rhn:tooltip key="snippetcreate.jsp.tip1"/>
- <c:if test = "${empty requestScope.create_mode}">
- <rhn:warning key="snippetcreate.jsp.warning.tip"/>
- <html:hidden property="oldName"/>
+ <html:text property="label"/>
+
+ <c:if test = "${empty requestScope.create_mode}">
+ <html:hidden property="oldLabel"/>
</c:if>
</td>
- </tr>
- <c:if test = "${empty requestScope.create_mode}">
- <tr>
- <th>
- <bean:message key="cobbler.snippet.path"/>:
- </th>
- <td>
- <c:out
value="${requestScope.snippet.displayPath}"/><br/>
- <rhn:tooltip key="cobbler.snippet.path.tip"/>
- </td>
- </tr>
- <tr>
- <th>
- <bean:message key="cobbler.snippet.macro"/>:
- </th>
- <td>
- <p><c:out
value="${requestScope.snippet.fragment}"/></p>
- <rhn:tooltip key="cobbler.snippet.copy-paste-snippet-tip"/>
- </td>
- </tr>
- </c:if>
- <tr>
- <th>
- <bean:message key="cobbler.snippet.type"/>:
- </th>
- <td>
- <bean:message key="Custom"/><br/>
- <rhn:tooltip><bean:message
key="cobbler.snippet.custom.tip"
- arg0="${requestScope.org}"/></rhn:tooltip>
- </td>
- </tr>
- </table>
- <h2><bean:message
key="snippetcreate.jsp.contents.header"/></h2>
-
- <table class="details">
- <tr>
- <th>
- <rhn:required-field key="snippetcreate.jsp.contents"/>
- </th>
- <td>
- <html:textarea property="contents" rows="24"
cols="80" styleId="contents"/>
- </td>
- </tr>
+ </tr>
</table>
<hr />