You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2011/10/02 11:48:06 UTC
svn commit: r1178166 - in /ofbiz/trunk:
applications/content/webapp/content/website/
framework/widget/src/org/ofbiz/widget/html/ framework/widget/templates/
specialpurpose/ebaystore/webapp/ebaystore/store/
Author: jleroux
Date: Sun Oct 2 09:48:05 2011
New Revision: 1178166
URL: http://svn.apache.org/viewvc?rev=1178166&view=rev
Log:
* Uses rather minified css
In last commits (1178141, 1178111) I put wrong paths for:
* elrteEditor for css pathes is now elrte-1.3
* missed js in elrte-1.3/js/i18n for i18n files
Modified:
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1178166&r1=1178165&r2=1178166&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl Sun Oct 2 09:48:05 2011
@@ -19,7 +19,7 @@
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<link href="/images/jquery/plugins/elrte-1.3/css/elrte.full.css" rel="stylesheet" type="text/css">
+<link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css">
<script type="text/javascript">
jQuery(document).ready(loadTrees);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1178166&r1=1178165&r2=1178166&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Sun Oct 2 09:48:05 2011
@@ -491,7 +491,7 @@ public class HtmlFormRenderer extends Ht
if (textareaField.getVisualEditorEnable()) {
writer.append("<script language=\"javascript\" src=\"/images/jquery/plugins/elrte-1.3/js/elrte.min.js\" type=\"text/javascript\"></script>");
- writer.append("<link href=\"/images/jquery/plugins/elrteEditor/css/elrte.full.css\" rel=\"stylesheet\" type=\"text/css\">");
+ writer.append("<link href=\"/images/jquery/plugins/elrte-1.3/css/elrte.min.css\" rel=\"stylesheet\" type=\"text/css\">");
writer.append("<script language=\"javascript\" type=\"text/javascript\"> var opts = { cssClass : 'el-rte', toolbar : ");
// define the toolsbar
String buttons = textareaField.getVisualEditorButtons(context);
@@ -501,7 +501,7 @@ public class HtmlFormRenderer extends Ht
writer.append("maxi");
}
writer.append(", doctype : '<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">', //'<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\">'");
- writer.append(", cssfiles : ['/images/jquery/plugins/elrteEditor/css/elrte-inner.css'] ");
+ writer.append(", cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css'] ");
writer.append("}");
// load the wysiwyg editor
writer.append("jQuery('#");
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1178166&r1=1178165&r2=1178166&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Oct 2 09:48:05 2011
@@ -85,9 +85,9 @@ under the License.
<#if visualEditorEnable?has_content>
<script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/elrte.min.js" type="text/javascript"></script><#rt/>
<#if language?has_content && language != "en">
- <script language="javascript" src="/images/jquery/plugins/elrte-1.3/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/>
+ <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/>
</#if>
- <link href="/images/jquery/plugins/elrte-1.3/css/elrte.full.css" rel="stylesheet" type="text/css">
+ <link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css">
<script language="javascript" type="text/javascript">
var opts = {
cssClass : 'el-rte',
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1178166&r1=1178165&r2=1178166&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Sun Oct 2 09:48:05 2011
@@ -497,7 +497,7 @@ under the License.
<table cellspacing="0">
<tr><td>
<script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/elrte.min.js" type="text/javascript"></script>
- <link href="/images/jquery/plugins/elrte-1.3/css/elrte.full.css" rel="stylesheet" type="text/css">
+ <link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css">
<script language="javascript" type="text/javascript">
var opts = {
cssClass : 'el-rte',