[Yanel-commits] rev 40851 - in public/yanel/contributions/resources/tinymce: . htdocs htdocs/css htdocs/js src/build

simon at wyona.com simon at wyona.com
Fri Jan 9 02:36:21 CET 2009


Author: simon
Date: 2009-01-09 02:36:20 +0100 (Fri, 09 Jan 2009)
New Revision: 40851

Added:
   public/yanel/contributions/resources/tinymce/htdocs/js/tinymceinit.js
Removed:
   public/yanel/contributions/resources/tinymce/htdocs/js/tinymceInit.js
Modified:
   public/yanel/contributions/resources/tinymce/build.xml
   public/yanel/contributions/resources/tinymce/htdocs/css/tinymce-resource.css
   public/yanel/contributions/resources/tinymce/htdocs/tinymce.jelly
   public/yanel/contributions/resources/tinymce/src/build/dependencies.xml
Log:
updated to version 3.2.1.1

Modified: public/yanel/contributions/resources/tinymce/build.xml
===================================================================
--- public/yanel/contributions/resources/tinymce/build.xml	2009-01-08 21:41:22 UTC (rev 40850)
+++ public/yanel/contributions/resources/tinymce/build.xml	2009-01-09 01:36:20 UTC (rev 40851)
@@ -2,6 +2,15 @@
 
 <project name="yanel-resource" default="compile">
 
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <!-- <property name="yanel.home" value="${yanel.source.home}"/> -->
+  <property file="${user.home}/.ant-global.properties"/>
+  <echo>YANEL_HOME is set to: ${yanel.home}</echo>
+
+  <property file="${yanel.home}/src/build/local.build.properties"/>
+  <property file="${yanel.home}/src/build/build.properties"/>
+  
   <import file="src/build/dependencies.xml"/>
 
   <target name="init" description="Initialize build" depends="dependencies">

Modified: public/yanel/contributions/resources/tinymce/htdocs/css/tinymce-resource.css
===================================================================
--- public/yanel/contributions/resources/tinymce/htdocs/css/tinymce-resource.css	2009-01-08 21:41:22 UTC (rev 40850)
+++ public/yanel/contributions/resources/tinymce/htdocs/css/tinymce-resource.css	2009-01-09 01:36:20 UTC (rev 40851)
@@ -10,4 +10,15 @@
   height:160px;
   overflow:auto;
   position:relative;
+}
+
+/* kind a hack. had to overwrite definitions, made in global.css but not in tinymce.css, disturbing the editors style */
+
+#content .mceEditor table  { 
+  border-collapse:separate;
+} 
+
+#content .mceEditor td { 
+  border:0px;
+  padding:0px;
 }
\ No newline at end of file

Deleted: public/yanel/contributions/resources/tinymce/htdocs/js/tinymceInit.js
===================================================================
--- public/yanel/contributions/resources/tinymce/htdocs/js/tinymceInit.js	2009-01-08 21:41:22 UTC (rev 40850)
+++ public/yanel/contributions/resources/tinymce/htdocs/js/tinymceInit.js	2009-01-09 01:36:20 UTC (rev 40851)
@@ -1,9 +0,0 @@
-        tinyMCE.init({
-            mode : "textareas",
-            theme : "advanced",
-            theme_advanced_layout_manager: "RowLayout",
-            theme_advanced_containers: "container1,mceEditor",
-            theme_advanced_container_container1: "bold,italic,underline,separator,bullist,separator,undo,redo,separator,link,unlink,separator,formatselect,image,code",
-            plugins : "fullpage",
-            entity_encoding : "raw"
-        });
\ No newline at end of file

Copied: public/yanel/contributions/resources/tinymce/htdocs/js/tinymceinit.js (from rev 40598, public/yanel/contributions/resources/tinymce/htdocs/js/tinymceInit.js)
===================================================================
--- public/yanel/contributions/resources/tinymce/htdocs/js/tinymceinit.js	                        (rev 0)
+++ public/yanel/contributions/resources/tinymce/htdocs/js/tinymceinit.js	2009-01-09 01:36:20 UTC (rev 40851)
@@ -0,0 +1,10 @@
+        tinyMCE.init({
+            mode : "textareas",
+            theme : "advanced",
+    plugins : "fullpage",
+            theme_advanced_toolbar_location : "top",
+theme_advanced_toolbar_align : "left",
+theme_advanced_statusbar_location : "bottom",
+theme_advanced_resizing : true,
+entity_encoding : "numeric"
+        });
\ No newline at end of file


Property changes on: public/yanel/contributions/resources/tinymce/htdocs/js/tinymceinit.js
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: public/yanel/contributions/resources/tinymce/htdocs/tinymce.jelly
===================================================================
--- public/yanel/contributions/resources/tinymce/htdocs/tinymce.jelly	2009-01-08 21:41:22 UTC (rev 40850)
+++ public/yanel/contributions/resources/tinymce/htdocs/tinymce.jelly	2009-01-09 01:36:20 UTC (rev 40851)
@@ -5,24 +5,22 @@
       <title>Edit ${resource.getEditPath()} with tinyMCE</title>
       <link rel="stylesheet" type="text/css" href="${yanel.back2realm}${yanel.reservedPrefix}/resource-types/http://www.wyona.org/yanel/resource/1.0::tinymce/css/tinymce-resource.css"/>
       <script language="javascript" type="text/javascript" src="${yanel.back2realm}${yanel.reservedPrefix}/resource-types/http://www.wyona.org/yanel/resource/1.0::tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
-      <script language="javascript" type="text/javascript" src="${yanel.back2realm}${yanel.reservedPrefix}/resource-types/http://www.wyona.org/yanel/resource/1.0::tinymce/js/tinymceInit.js"></script>
+      <script language="javascript" type="text/javascript" src="${yanel.back2realm}${yanel.reservedPrefix}/resource-types/http://www.wyona.org/yanel/resource/1.0::tinymce/js/tinymceinit.js"></script>
     </head>
     <body>
       <p class="yanel-usecase-error">${resource.getErrorMessages()}</p>
       <p>${resource.getInfoMessages()}</p>
       <j:choose>
         <j:when test="${resource.getEditPath() != null &amp;&amp; !resource.getEditPath().equals('')}">
-          <div class="yui-skin-sam">
-            <form method="post" action="">
-              <input type="hidden" name="edit-path" value="${resource.getEditPath()}"/>
-              <textarea id="${resource.getEditPath()}" name="${resource.getEditPath()}" rows="15" cols="80" style="width: 100%">
-                ${resource.getEditorFormContent()}
-              </textarea>
-              <br />
-              <input type="submit" id="submit" name="submit" value="Save" />
-              <input type="submit" id="submit" name="cancel" value="Cancel" />
-            </form>
-          </div>
+          <form method="post" action="">
+            <input type="hidden" name="edit-path" value="${resource.getEditPath()}"/>
+            <textarea id="${resource.getEditPath()}" name="${resource.getEditPath()}" rows="15" cols="80" style="width: 100%">
+              ${resource.getEditorFormContent()}
+            </textarea>
+            <br />
+            <input type="submit" id="submit" name="submit" value="Save" />
+            <input type="submit" id="submit" name="cancel" value="Cancel" />
+          </form>
         </j:when>
         <j:otherwise>
           ${resource.getLookup()}

Modified: public/yanel/contributions/resources/tinymce/src/build/dependencies.xml
===================================================================
--- public/yanel/contributions/resources/tinymce/src/build/dependencies.xml	2009-01-08 21:41:22 UTC (rev 40850)
+++ public/yanel/contributions/resources/tinymce/src/build/dependencies.xml	2009-01-09 01:36:20 UTC (rev 40851)
@@ -9,7 +9,7 @@
     <!--     get tinyMCE by maven -->    
     <artifact:dependencies filesetId="maven2.tinymce.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="moxiecode" artifactId="tinymce" version="2.1.1.1" scope="provided" type="zip"/>
+      <dependency groupId="moxiecode" artifactId="tinymce" version="3.2.1.1" scope="provided" type="zip"/>
     </artifact:dependencies>
     
     <unzip dest="htdocs">



More information about the Yanel-commits mailing list