xlawrence 2005/06/21 16:16:28 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/shared bigtext_field.jsp
Log:
The BigTextEngine now displays warnings regarding to URL integrity checks and
uses ressource bundles
Revision Changes Path
1.7 +26 -16
jahia/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp.diff?r1=1.6&r2=1.7&f=h
Index: bigtext_field.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bigtext_field.jsp 6 Jun 2005 15:03:59 -0000 1.6
+++ bigtext_field.jsp 21 Jun 2005 14:16:28 -0000 1.7
@@ -22,10 +22,10 @@
String fieldsEditCallingEngineName = (String) engineMap.get(
"fieldsEditCallingEngineName" );
-JahiaField theField = (JahiaField) engineMap.get(
fieldsEditCallingEngineName + "." + "theField" );
+JahiaField theField = (JahiaField) engineMap.get(
fieldsEditCallingEngineName + ".theField" );
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
String theURL = (String)
jParams.settings().getJahiaEnginesHttpPath();
-Boolean isSelectedField = (Boolean) engineMap.get(
fieldsEditCallingEngineName + "." +"isSelectedField" );
+Boolean isSelectedField = (Boolean) engineMap.get(
fieldsEditCallingEngineName + ".isSelectedField" );
HtmlEditorsViewHelper heViewHelper = (HtmlEditorsViewHelper)
engineMap.get(BigText_Field.HTMLEDITOR_VIEW_HELPER_ATTRIBUTE);
HtmlEditor defaultEditor = heViewHelper.getDefaultEditor(true);
@@ -80,22 +80,32 @@
</SCRIPT>
-<logic:present name="<%=theField.getID()+'.'+"engineMessages"%>">
- <br>Errors : <br>
+<logic:present name="<%=theField.getID()+".engineMessages"%>">
+ <br><font color="red"><strong><jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.BigText_Field.error.label"/>
:</strong></font><br>
<ul>
- <logic:iterate name="<%=theField.getID()+'.'+"engineMessages"%>"
property="messages" id="curMessage">
+ <logic:iterate name="<%=theField.getID()+".engineMessages"%>"
property="messages" id="curMessage">
+ <li><content:message name="curMessage"/></li>
+ </logic:iterate>
+ </ul>
+</logic:present>
+<logic:present name="<%=theField.getID()+".warning.engineMessages"%>">
+ <br><font color="red"><strong><jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.BigText_Field.warning.label"/>
:</strong></font><br>
+ <ul>
+ <logic:iterate name="<%=theField.getID()+".warning.engineMessages"%>"
property="messages" id="curMessage">
<li><content:message name="curMessage"/></li>
</logic:iterate>
</ul>
+ <p>
+ <input type="checkbox"
name="ignoreWarnings"> <jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.BigText_Field.ignoreWarning.label"/>
+ </p> <br>
</logic:present>
<span class="input">
<select name="htmlEditor" class="input"
onChange="changeHtmlEditor('<%=theScreen%>');">
<%
- Enumeration editors = heViewHelper.getEditors();
- HtmlEditor editor = null;
+ final Enumeration editors = heViewHelper.getEditors();
while ( editors.hasMoreElements() ) {
- editor = (HtmlEditor)editors.nextElement();
+ final HtmlEditor editor = (HtmlEditor)editors.nextElement();
%>
<option value="<%=editor.getId()%>"
<% if ( defaultEditor != null &&
editor.getId().equals(defaultEditor.getId())) {
@@ -109,7 +119,7 @@
<% if ( cssList.size() > 0 ){
boolean selectedCSS = ( cssList.get(heViewHelper.getDefaultCSSID()) !=
null );
if ( selectedCSS ){
-
engineMap.put("htmlEditorCSS",cssList.get(heViewHelper.getDefaultCSSID()));
+ engineMap.put("htmlEditorCSS",
cssList.get(heViewHelper.getDefaultCSSID()));
}
String defaultCSS = heViewHelper.getDefaultCSSID();
@@ -118,13 +128,13 @@
<span class="input">
<select name="htmlEditorCSS" class="input"
onChange="changeCSS('<%=theScreen%>');">
<%
- Iterator iterator = cssList.values().iterator();
+ final Iterator iterator = cssList.values().iterator();
while ( iterator.hasNext() ) {
- HtmlEditorCSS css = (HtmlEditorCSS)iterator.next();
+ final HtmlEditorCSS css = (HtmlEditorCSS)iterator.next();
if ( !selectedCSS ){
defaultCSS = css.getId();
selectedCSS = true;
- engineMap.put("htmlEditorCSS",css);
+ engineMap.put("htmlEditorCSS", css);
}
%>
<option value="<%=css.getId()%>"
@@ -138,12 +148,12 @@
<br>
<% if (defaultEditor == null) {
- String simpleTextEditor = jParams.settings().getHtmlEditorsContext()
+ "/simpletext/simpletext_htmleditor.jsp";
+ final String simpleTextEditor =
jParams.settings().getHtmlEditorsContext() +
"/simpletext/simpletext_htmleditor.jsp";
%><jsp:include page="<%=simpleTextEditor%>" flush="true"/>
<% } else {
-
- String includeViewFilePath = jParams.settings().getHtmlEditorsContext()
+ "/" + defaultEditor.getBaseDirectory() + "/" + defaultEditor.getIncludeFile();
+ final StringBuffer buff = new StringBuffer();
+
buff.append(jParams.settings().getHtmlEditorsContext()).append("/").append(defaultEditor.getBaseDirectory()).append("/").append(defaultEditor.getIncludeFile());
%>
-<jsp:include page="<%=includeViewFilePath%>" flush="true"/>
+<jsp:include page="<%=buff.toString()%>" flush="true"/>
<% } %>
\ No newline at end of file
