ktlili 2005/08/26 18:17:53 CEST
Modified files:
core/src/webapp/jsp/clipbuilder/html/actions manageAction.jsp
selectPartAction.jsp
Log:
- fix select part bug (chew bug)
- add back to menu in the manage template
Revision Changes Path
1.2 +44 -25
jahia/core/src/webapp/jsp/clipbuilder/html/actions/manageAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/manageAction.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +6 -6
jahia/core/src/webapp/jsp/clipbuilder/html/actions/selectPartAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/clipbuilder/html/actions/selectPartAction.jsp.diff?r1=1.1&r2=1.2&f=h
Index: manageAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/manageAction.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manageAction.jsp 19 Aug 2005 13:42:53 -0000 1.1
+++ manageAction.jsp 26 Aug 2005 16:17:53 -0000 1.2
@@ -4,32 +4,24 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-template"
prefix="template"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-html" prefix="html"%>
-<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia" %>
-<%@ page language="Java" import="org.jahia.clipbuilder.html.bean.*" %>
-<%@ page language="Java" import="org.jahia.data.*" %>
-
-<jsp:useBean id="URL" class="java.lang.String" scope="request"/> <% //
http files path. %>
+<[EMAIL PROTECTED] uri="JahiaLib" prefix="jahia"%>
+<[EMAIL PROTECTED] language="Java"
import="org.jahia.clipbuilder.html.bean.*"%>
+<[EMAIL PROTECTED] language="Java" import="org.jahia.data.*"%>
+<[EMAIL PROTECTED] import="org.jahia.bin.*"%>
+<jsp:useBean id="URL" class="java.lang.String" scope="request"/>
+<%// http files path.%>
<jsp:useBean id="userMessage" class="java.lang.String" scope="session"/>
<html:form action="manageAction">
<!-- Main table -->
<table align="center" width="100%">
<!-- Header -->
<table class="text" align="center" width="100%">
- <!-- Title-->
<tr>
+ <!-- Title-->
<td class="text" colspan="2">
- <b><bean:message key="manage.title"/></b>
- <img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
- </td>
-
- <!-- Help -->
- <td width="10%">
- <%
- String helpUrl =
response.encodeURL(request.getContextPath()+"/jsp/clipbuilder/html/help/manageHelp.jsp");
- %>
- <a href="javascript:popitup('<%=helpUrl%>')">
- <bean:message key="wizard.help"/>
- </a>
+ <b>
+ <bean:message key="manage.title"/>
+ </b>
<img src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.hr.image"/>" width="100%" height="2">
</td>
</tr>
@@ -42,20 +34,19 @@
<html:submit property="webClippingAction">
<bean:message key="manage.button.add"/>
</html:submit>
-
<!-- Load/delete -->
<logic:notEqual name="<%=ClippersManagerBean.class.toString()%>"
property="empty" value="1">
- <html:submit property="webClippingAction" disabled="true">
- <bean:message key="manage.button.delete"/>
- </html:submit>
+ <html:submit property="webClippingAction" disabled="true">
+ <bean:message key="manage.button.delete"/>
+ </html:submit>
<html:submit property="webClippingAction" disabled="true">
<bean:message key="manage.button.load"/>
</html:submit>
</logic:notEqual>
<logic:notEqual name="<%=ClippersManagerBean.class.toString()%>"
property="empty" value="0">
- <html:submit property="webClippingAction" disabled="false">
- <bean:message key="manage.button.delete"/>
- </html:submit>
+ <html:submit property="webClippingAction" disabled="false">
+ <bean:message key="manage.button.delete"/>
+ </html:submit>
<html:submit property="webClippingAction" disabled="false">
<bean:message key="manage.button.load"/>
</html:submit>
@@ -97,3 +88,31 @@
</table>
</table>
</html:form>
+<br/>
+<br/>
+<table border="0" cellpadding="0" cellspacing="0">
+ <!-- Help -->
+ <tr>
+ <td nowrap width="145" valign="top">
+ <font class="text">
+ <b>
+ <jahia:adminResourceBundle
resourceName="org.jahia.admin.otherOperations.label"/>
+
+ :
+
+</b>
+ </font>
+ </td>
+ <td valign="top">
+ <%String helpUrl = response.encodeURL(request.getContextPath() +
"/jsp/clipbuilder/html/help/manageHelp.jsp"); %>
+ <li> <font class="text"> <a
href="javascript:popitup('<%=helpUrl%>')"> <bean:message key="wizard.help"/>
</a> </font> </li>
+ </td>
+ </tr>
+ <!-- Back to menu -->
+ <tr>
+ <td nowrap width="145" valign="top"> </td>
+ <td valign="top">
+ <li> <font class="text"> <a
href='<%=JahiaAdministration.composeActionURL(request,response,"displaymenu","")%>'><jahia:adminResourceBundle
resourceName="org.jahia.admin.backToMenu.label"/></a><br> </font> </li>
+ </td>
+ </tr>
+</table>
Index: selectPartAction.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/clipbuilder/html/actions/selectPartAction.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selectPartAction.jsp 19 Aug 2005 13:42:53 -0000 1.1
+++ selectPartAction.jsp 26 Aug 2005 16:17:53 -0000 1.2
@@ -50,18 +50,18 @@
f.submit();
return;
}
-</script><%
+</script>
+<%
String options = "\n";
- // javax.swing.text.html.HTML.Tag[] tags =
javax.swing.text.html.HTML.getAllTags();
- // for (int i = 0; i < tags.length; i++) {
- //String name = tags[i].toString();
- String name = "table";
+ javax.swing.text.html.HTML.Tag[] tags =
javax.swing.text.html.HTML.getAllTags();
+ for (int i = 0; i < tags.length; i++) {
+ String name = tags[i].toString();
options = options + "\n" + "<option value=" + name;
if (name.equalsIgnoreCase("table")) {
options = options + " selected=selected" + " ";
}
options = options + " > " + name + "</option>";
- // }
+ }
%>
<table class="text" align="center" width="100%">
<html:form action="selectPart">
