svn commit: [jahia] r18750 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: java/org/jahia/gui/ webapp/jsp/jahia/engines/filemanager/ webapp/jsp/jahia/engines/shared/ webapp/jsp/jahia/javascript/zimbra/complexTree/

ktlili Thu, 04 Oct 2007 04:07:33 -0700

Author: ktlili
Date: Thu Oct  4 13:07:26 2007
New Revision: 18750

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18750&repname=
=3Djahia
Log:
- Fix JAHIA-2242: resize file manager, move close box
- Fix JAHIA-2428: Align text


Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/AjaxFileManager.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
ategory_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTree.js
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTreeProperties.js

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLTool=
Box.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.java&rev=3D18750&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va Thu Oct  4 13:07:26 2007
@@ -85,7 +85,7 @@
     private static final org.apache.log4j.Logger logger =3D org.apache.log=
4j.Logger.getLogger(HTMLToolBox.class);
 =

     private static final int JS_WINDOW_WIDTH =3D 950;
-    private static final int JS_WINDOW_HEIGHT =3D 800;
+    private static final int JS_WINDOW_HEIGHT =3D 820;
 =

     private static String previousSessionID =3D "";
     private static String previousCleanSessionID =3D "";
@@ -198,7 +198,7 @@
         return (popupAjaxFileManagerURL.equals("")) ? "" :
                 buff.append("javascript:OpenJahiaScrollableWindow('").appe=
nd(popupAjaxFileManagerURL).
                         append("','AjaxFileManager',").append(JS_WINDOW_WI=
DTH).append(",").
-                        append(JS_WINDOW_HEIGHT).append(");").toString();
+                        append(935).append(");").toString();
     }
 =

     public String drawAjaxFileManagerHelpPopupLauncher(final String proper=
tyName) throws JahiaException {

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/fi=
lemanager/AjaxFileManager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/AjaxFileManager.jsp&r=
ev=3D18750&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/AjaxFileManager.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/AjaxFileManager.jsp Thu Oct  4 13:07:26 2007
@@ -483,24 +483,8 @@
 </script>
 =

 <h3 class=3D"filemanagerIcon"><jahia:engineResourceBundle resourceName=3D"=
org.jahia.engines.filemanager.Filemanager_Engine.name.label"/></h3>
-<div class=3D"buttons">
-       <% if (fckEditorTarget) {%>
-    <div class=3D"button">
-        <a href=3D"javascript:doSelectResource();"
-           title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.filemanager.Filemanager_Engine.selectFile.label"/>">
-            <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
filemanager.Filemanager_Engine.selectFile.label"/>
-        </a>
-    </div>
-       <% } %>
-    <div class=3D"button">
-        <a href=3D"javascript:window.close();"
-           title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
close.button"/>">
-            <jahia:engineResourceBundle resourceName=3D"org.jahia.close.bu=
tton"/>
-        </a>
-    </div>
-</div>
 =

-<br/>
+
 <table cellpadding=3D"0" cellspacing=3D"0" border=3D"0">
     <tr>
         <td class=3D"tdIcone" id=3D"newDir">
@@ -649,10 +633,26 @@
                                                                           =
                                          height=3D"24"/>
             </a>
         </td>
+        <td>
+           <div class=3D"buttons">
+                   <% if (fckEditorTarget) {%>
+                    <div class=3D"button">
+                        <a href=3D"javascript:doSelectResource();" title=
=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanag=
er.Filemanager_Engine.selectFile.label"/>">
+                            <jahia:engineResourceBundle resourceName=3D"or=
g.jahia.engines.filemanager.Filemanager_Engine.selectFile.label"/>
+                        </a>
+                    </div>
+                   <% } %>
+                <div class=3D"button">
+                    <a href=3D"javascript:window.close();" title=3D"<jahia=
:engineResourceBundle resourceName=3D"org.jahia.close.button"/>">
+                        <jahia:engineResourceBundle resourceName=3D"org.ja=
hia.close.button"/>
+                    </a>
+                </div>
+            </div>
+        </td>
     </tr>
 </table>
 =

-<br/>
+
 <input type=3D"hidden" id=3D"addressBar" name=3D"addressBar" />
 <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanager.=
Filemanager_Engine.path.label"/>: <input id=3D"addressBarDisp" type=3D"text=
" name=3D"addressBarDisp" style=3D"width:100%;display:inline;" onkeypress=
=3D"return keyDown(event)"/>
 =


Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/category_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp&rev=3D1=
8750&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
ategory_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
ategory_field.jsp Thu Oct  4 13:07:26 2007
@@ -340,7 +340,7 @@
                 resourceName=3D"org.jahia.engines.filemanager.Filemanager_=
Engine.simpleSearch.label"/></b><br/>&nbsp;<br/>
         <table cellpadding=3D"0" cellspacing=3D"0" style=3D"margin:0; padd=
ing:0">
             <tr>
-                <td>
+                <td style=3D"text-align: right;display: block;">
                     <jahia:engineResourceBundle
                             resourceName=3D"org.jahia.engines.filemanager.=
Filemanager_Engine.categoryKey.label"/>:
                 </td>
@@ -361,7 +361,7 @@
         <b>&nbsp;</b><br/>&nbsp;<br/>
         <table cellpadding=3D"0" cellspacing=3D"0" style=3D"margin:0; padd=
ing:0">
             <tr>
-                <td>
+                <td style=3D"text-align: right;display: block;">
                     <jahia:engineResourceBundle
                             resourceName=3D"org.jahia.engines.filemanager.=
Filemanager_Engine.categoryValue.label"/>:
                 </td>

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/zimbra/complexTree/ComplexTree.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree=
.js&rev=3D18750&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTree.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTree.js Thu Oct  4 13:07:26 2007
@@ -1302,8 +1302,8 @@
  */
 ComplexTree.prototype._adjustBestHeight =3D
 function () {
-    if (this._props.CURRENT_STYLE =3D=3D ComplexTreeProperties.FILEMANAGER=
_STYLE &&
-        this.DATA_HEIGHT > ComplexTreeProperties.MAX_DATA_HEIGHT) {
+    /* max size for file manager even if this.DATA_HEIGHT < ComplexTreePro=
perties.MAX_DATA_HEIGHT*/
+    if (this._props.CURRENT_STYLE =3D=3D ComplexTreeProperties.FILEMANAGER=
_STYLE) {
         this.DATA_HEIGHT =3D ComplexTreeProperties.MAX_DATA_HEIGHT;
     }
     ComplexTreeProperties.SHELL_HEIGHT =3D this.DATA_HEIGHT + ComplexTreeP=
roperties.ROW_HEIGHT;

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/zimbra/complexTree/ComplexTreeProperties.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree=
Properties.js&rev=3D18750&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTreeProperties.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTreeProperties.js Thu Oct  4 13:07:26 2007
@@ -45,7 +45,7 @@
 ComplexTreeProperties.ROW_HEIGHT =3D (AjxEnv.isIE ? 27 : 28);
 ComplexTreeProperties.SHELL_HEIGHT =3D 320;
 ComplexTreeProperties.MIN_TREE_WIDTH =3D 200;
-ComplexTreeProperties.MAX_DATA_HEIGHT =3D 600;
+ComplexTreeProperties.MAX_DATA_HEIGHT =3D 550;
 ComplexTreeProperties.TREE_WIDTH =3D 250;
 ComplexTreeProperties.SASH_HEIGHT =3D 24;
 ComplexTreeProperties.RESIZE =3D 50;

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

svn commit: [jahia] r18750 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: java/org/jahia/gui/ webapp/jsp/jahia/engines/filemanager/ webapp/jsp/jahia/engines/shared/ webapp/jsp/jahia/javascript/zimbra/complexTree/

Reply via email to