svn commit: r539509 - in /lenya/trunk/src/modules/tinymce: resources/javascript/ resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/ usecases/

[ne...@apache.org]

Author: nettings
Date: Fri May 18 09:11:26 2007
New Revision: 539509

URL: http://svn.apache.org/viewvc?view=rev&rev=539509
Log:
fix missing scrollbars in insertAsset usecase popup.
improve insertAsset table layout to make it more robust for very large
image sizes.
get rid of "compiled" js, use pretty-printed one by default. the missing
scrollbars were caused by the two files being out of sync. if we want to
preserve bandwidth, we should get rid of js whitespace on-the-fly, not use
unmaintainable source files in svn.

Added:
    lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js
      - copied, changed from r538976, lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin_src.js
Removed:
    lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin_src.js
Modified:
    lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js
    lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx

Modified: lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js?view=diff&rev=539509&r1=539508&r2=539509
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/javascript/tiny_config.js Fri May 18 09:11:26 2007
@@ -39,9 +39,6 @@
       and search-and-replace. */
     plugins  : "save,fullscreen,searchreplace,table,contextmenu,simplebrowser",
     
-       plugin_simplebrowser_width : '800', //default
-       plugin_simplebrowser_height : '600', //default
-       
        plugin_simplebrowser_browselinkurl : currentURL + '?lenya.module=tinymce&lenya.step=link-show&language=en',
        plugin_simplebrowser_browseimageurl : currentURL + '?lenya.usecase=tinymce.insertAsset',
        plugin_simplebrowser_browseflashurl : '',

Copied: lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js (from r538976, lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin_src.js)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js?view=diff&rev=539509&p1=lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin_src.js&r1=538976&p2=lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js&r2=539509
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin_src.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js Fri May 18 09:11:26 2007
@@ -74,11 +74,9 @@
 			TinyMCE_SimpleBrowserPlugin.options['type'] = link_type;
 			TinyMCE_SimpleBrowserPlugin.options['target'] = win;
 
-		var sOptions = "toolbar=no,status=no,resizable=yes,dependent=yes";
+		var sOptions = "toolbar=no,scrollbars=yes,status=no,resizable=yes,dependent=yes";
 		sOptions += ",width=" + TinyMCE_SimpleBrowserPlugin.options['width'];
 		sOptions += ",height=" + TinyMCE_SimpleBrowserPlugin.options['height'];
-	    sOptions += ",scrollbars=yes";	
-
 		if (tinyMCE.isMSIE)	{
 			// The following change has been made otherwise IE will open the file 
 			// browser on a different server session (on some cases):

Modified: lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx?view=diff&rev=539509&r1=539508&r2=539509
==============================================================================
--- lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx Fri May 18 09:11:26 2007
@@ -35,15 +35,15 @@
     <form method="POST" name="image" id="image">
       <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
       <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
-      <table class="lenya-table">
+      <table class="lenya-table" style="table-layout:fixed; width:100%;">
         <tr>
-          <th/>
-          <th><i18n:text>Assets</i18n:text></th>
-          <th><i18n:text>Preview</i18n:text></th>
-          <th><i18n:text>Title</i18n:text></th>
-          <th><i18n:text>File Size</i18n:text></th>
-          <th><i18n:text>Dimension (w x h)</i18n:text></th>
-          <th><i18n:text>Creation Date</i18n:text></th>
+          <th style="width:1em;"/>
+          <th style="width:14em;"><i18n:text>Assets</i18n:text></th>
+          <th style=""><i18n:text>Preview</i18n:text></th>
+          <th style=""><i18n:text>Title</i18n:text></th>
+          <th style="width:5em;"><i18n:text>File Size</i18n:text></th>
+          <th style="width:8em;"><i18n:text>Dimension (w x h)</i18n:text></th>
+          <th style="width:6em;"><i18n:text>Creation Date</i18n:text></th>
         </tr>
         <jx:forEach var="asset" items="${usecase.getParameter('assets')}">
           <tr>
@@ -52,7 +52,7 @@
                 onClick="javascript:insertData('${cocoon.request.getContextPath()}/${asset.getPublication().getId()}/${asset.getArea()}${asset.getPath()}.${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}', '${asset.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}', '${asset.getMimeType()}', '${asset.getContentLength() / 1000}', '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('height')}', '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('width')}')"/> 
             </td>
             <td><jx:out value="${asset.getPath()}"/></td>
-            <td>        
+            <td style="overflow:hidden">        
               <jx:set var="mimeType" value="${asset.getMimeType()}"/>
               <jx:if test="${mimeType.startsWith('image/')}">
                 <jx:set var="doc" value="${usecase.getParameter('document')}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org