Author: xlawrence Date: Fri Jun 8 16:57:39 2007 New Revision: 17529 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17529&repname= =3Djahia Log: resolve issues: =
- http://www.jahia.net/jira/browse/JAHIA-2021 - TEMPLATES-275 Modified: 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 branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr= a/complexTree/cTree.css 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=3D17529&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 Fri Jun 8 16:57:39 2007 @@ -64,7 +64,7 @@ ComplexTreeProperties.PAGE, entryPointURL, expandServerUrl, collapseServerUrl,= expandServerUrlLoaded, parentDiv); - if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 31; + if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 29; break; = case ComplexTreeProperties.VERSIONNING_STYLE: @@ -143,6 +143,7 @@ ComplexTreeProperties.CATEGORY, entryPointURL, expandServerUrl, collapseServerUrl,= expandServerUrlLoaded, parentDiv); + if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 29; break; = case ComplexTreeProperties.SELECT_CATEGORY_STYLE: @@ -161,6 +162,7 @@ ComplexTreeProperties.CATEGORY, entryPointURL, expandServerUrl, collapseServerUrl,= expandServerUrlLoaded, parentDiv); + if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 29; break; } = 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=3D17529&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 Fri Jun 8 16:57:39 2007 @@ -42,7 +42,7 @@ = // Properties used only in ComplexTreeDisplay.js for UI looks ComplexTreeProperties.LOADING_ID =3D -1; -ComplexTreeProperties.ROW_HEIGHT =3D (AjxEnv.isIE ? 29 : 28); +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; Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript= /zimbra/complexTree/cTree.css URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTree.css&r= ev=3D17529&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/cTree.css (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr= a/complexTree/cTree.css Fri Jun 8 16:57:39 2007 @@ -109,7 +109,6 @@ .DwtTreeItem-Text { display: block; height: 22px; - *height: 24px; *padding-bottom: 1px; border-bottom-width: 1px; border-bottom-style: solid; @@ -190,7 +189,6 @@ = .DwtListView .DwtListView-Rows { padding-top: 2px; - *padding-top:2px !important; position: relative; width: 100%; height: 100%; @@ -198,12 +196,11 @@ overflow: auto !important; } = +.DwtListView .DwtListView-Rows .Row-selected, .DwtListView .DwtListView-Rows .Row { padding-left: 5px; text-align: left; height: 27px; - *height: 29px !important; - /**height: 29px;*/ overflow: hidden !important; } = @@ -230,7 +227,6 @@ .DwtListView .DwtListView-Rows .Row-selected td { height: 27px; *height: 22px !important; - *height: 28px; overflow: hidden !important; vertical-align: top; } @@ -329,7 +325,7 @@ } = .divButtons { - display: none; + display: none; float: right; height: 20px; clear: both; _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
