Author: ktlili
Date: Thu Oct 4 14:15:17 2007
New Revision: 18751
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18751&repname=
=3Djahia
Log:
- Fix JAHIA-2242: resize file manager, move close box
- Fix JAHIA-2428: Align text
- fix category portlet bug (only head)
Modified:
trunk/core/src/java/org/jahia/engines/shared/Application_Field.java
trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
trunk/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
ee.js
Modified: trunk/core/src/java/org/jahia/engines/shared/Application_Field.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Application_Field.java&rev=3D18751&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
--- trunk/core/src/java/org/jahia/engines/shared/Application_Field.java (or=
iginal)
+++ trunk/core/src/java/org/jahia/engines/shared/Application_Field.java Thu=
Oct 4 14:15:17 2007
@@ -158,6 +158,37 @@
}
=
/**
+ * Find if an app. is selected
+ *
+ * @param theField the field we are working on
+ * @return true if an app. is selected .
+ */
+ private boolean isAppSelected(JahiaField theField) {
+ String selectedEntryPoint =3D (String) theField.getRawValue();
+ if (selectedEntryPoint =3D=3D null) {
+ logger.debug("Not app. selected");
+ return false;
+ }
+
+ if (selectedEntryPoint.equalsIgnoreCase("")) {
+ logger.debug("Not app. selected");
+ return false;
+ }
+ int separatorPos =3D selectedEntryPoint.indexOf("_");
+ if (separatorPos !=3D -1) {
+ String appIDStr =3D selectedEntryPoint.substring(0, separatorP=
os);
+ if (appIDStr !=3D null) {
+ logger.debug("App. selected: Application["+appIDStr+"]");
+ return true;
+ }
+ logger.debug("Not app. selected");
+ return false;
+ }
+ logger.debug("Not app. selected");
+ return false;
+ }
+
+ /**
* saves data in datasource
*
* @param jParams a ProcessingContext object
@@ -175,7 +206,7 @@
boolean success =3D true;
int selectedAppID =3D -1;
if (engineMap.get("createApplication_" +
- theField.getDefinition().getName()) !=3D null) {
+ theField.getDefinition().getName()) !=3D null && isAppSele=
cted(theField)) {
=
String selectedEntryPoint =3D theField.getRawValue();
int separatorPos =3D selectedEntryPoint.indexOf("_");
Modified: trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/gui/HTMLToolBox.java&rev=3D18751&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
--- trunk/core/src/java/org/jahia/gui/HTMLToolBox.java (original)
+++ trunk/core/src/java/org/jahia/gui/HTMLToolBox.java Thu Oct 4 14:15:17 =
2007
@@ -81,7 +81,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 720;
+ private static final int JS_WINDOW_HEIGHT =3D 800;
=
private static String previousSessionID =3D "";
private static String previousCleanSessionID =3D "";
@@ -194,7 +194,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: trunk/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/category_field.jsp&rev=3D18751&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp (orig=
inal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp Thu O=
ct 4 14:15:17 2007
@@ -338,7 +338,7 @@
resourceName=3D"org.jahia.engines.filemanager.Filemanager_=
Engine.simpleSearch.label"/></b><br/> <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>
@@ -359,7 +359,7 @@
<b> </b><br/> <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: trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/Com=
plexTree.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/zimbra/complexTree/ComplexTree.js&rev=3D18751&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
--- trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
ee.js (original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
ee.js Thu Oct 4 14:15:17 2007
@@ -1285,8 +1285,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;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
