Author: ktlili
Date: Sun Nov 25 20:22:05 2007
New Revision: 19279
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19279&repname=
=3Djahia
Log:
- commit portlets categories( admin view ): ComplexTree
Modified:
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
ee.js
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
eeProperties.js
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=3D19279&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 Sun Nov 25 20:22:05 2007
@@ -164,6 +164,15 @@
parentDiv);
if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 29;
break;
+
+ case ComplexTreeProperties.PORTLET_CATEGORY_STYLE:
+ this._props =3D new ComplexTreeProperties(ComplexTreePrope=
rties.PORTLET_CATEGORY_STYLE,
+ ComplexTreeProperties.CATEGORY_PORTLET_TREE_STYLE_=
PATTERN,
+ [],
+ ComplexTreeProperties.CATEGORY,
+ entryPointURL, expandServerUrl, collapseServerUrl,=
expandServerUrlLoaded,
+ parentDiv);
+ break;
}
=
// Create the application shell and hide it
@@ -1254,6 +1263,19 @@
}
delete checked;
=
+ }else if (currentStyle =3D=3D ComplexTreeProperties.PORTLET_CATEGORY_S=
TYLE) {
+ var checked =3D XmlUtils.getAttrValue(pageInfo, this._props.CURREN=
T_XML_TAG_NAME, "checked");
+ if (checked) {
+ _keys.add("checked");
+ result.checked =3D checked;
+ }
+ delete checked;
+ var allsources =3D XmlUtils.getAttrValue(pageInfo, this._props.CUR=
RENT_XML_TAG_NAME, "allsources");
+ if(allsources){
+ _keys.add("allsources");
+ result.allsources =3D allsources;
+ }
+ delete allsources;
} else {
var lockedUrl =3D XmlUtils.getAttrValue(pageInfo, this._props.CURR=
ENT_XML_TAG_NAME, "locked");
if (lockedUrl) {
Modified: trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/Com=
plexTreeProperties.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/zimbra/complexTree/ComplexTreeProperties.js&rev=3D192=
79&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=
eeProperties.js (original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
eeProperties.js Sun Nov 25 20:22:05 2007
@@ -142,6 +142,9 @@
ComplexTreeProperties.MOVE_CATEGORY_SRC =3D "/jsp/jahia/javascript/zimbra/=
complexTree/move.gif";
ComplexTreeProperties.DELETE_CATEGORY_SRC =3D "/jsp/jahia/javascript/zimbr=
a/complexTree/delete.gif";
=
+//CATEGORY PORLTET
+ComplexTreeProperties.PORTLET_CATEGORY_ALLSOURCES_SRC =3D "/jsp/jahia/java=
script/zimbra/complexTree/allsources.png";
+
// Define types of data/html components that can be used in the ComplexTre=
eDisplay
//
// For the list view and the tree
@@ -174,6 +177,7 @@
ComplexTreeProperties.CATEGORY_LAUNCHERS =3D ComplexTreeProperties.I++;
ComplexTreeProperties.CATEGORY_RADIO =3D ComplexTreeProperties.I++;
ComplexTreeProperties.CATEGORY_CHECKBOX =3D ComplexTreeProperties.I++;
+ComplexTreeProperties.PORTLET_CHECKBOX =3D ComplexTreeProperties.I++;
ComplexTreeProperties.SELECTED_FILE =3D ComplexTreeProperties.I++;
=
// Define different styles for the ComplexTreeDisplay
@@ -190,6 +194,7 @@
ComplexTreeProperties.ADMIN_CATEGORY_STYLE =3D ComplexTreeProperties.I++;
ComplexTreeProperties.SELECT_CATEGORY_STYLE =3D ComplexTreeProperties.I++;
ComplexTreeProperties.MOVE_CATEGORY_STYLE =3D ComplexTreeProperties.I++;
+ComplexTreeProperties.PORTLET_CATEGORY_STYLE =3D ComplexTreeProperties.I++;
=
// Defines the patterns for the tree and listview. ComplexTreeProperties.K=
EY is mandatory for all tree styles as the
// first element !
@@ -224,6 +229,8 @@
ComplexTreeProperties.CATEGORY_ADMIN_TREE_STYLE_PATTERN =3D [ComplexTreePr=
operties.KEY, ComplexTreeProperties.TITLE, ComplexTreeProperties.SPACE, Com=
plexTreeProperties.CATEGORY_LAUNCHERS];
ComplexTreeProperties.CATEGORY_MOVE_TREE_STYLE_PATTERN =3D [ComplexTreePro=
perties.KEY, ComplexTreeProperties.CATEGORY_RADIO, ComplexTreeProperties.SP=
ACE, ComplexTreeProperties.TITLE];
ComplexTreeProperties.CATEGORY_SELECT_TREE_STYLE_PATTERN =3D [ComplexTreeP=
roperties.KEY, ComplexTreeProperties.CATEGORY_CHECKBOX, ComplexTreeProperti=
es.SPACE, ComplexTreeProperties.TITLE];
+ComplexTreeProperties.CATEGORY_PORTLET_TREE_STYLE_PATTERN =3D [ComplexTree=
Properties.KEY, ComplexTreeProperties.PORTLET_CHECKBOX, ComplexTreeProperti=
es.SPACE, ComplexTreeProperties.TITLE];
+
=
// XML Tag Names
ComplexTreeProperties.OBJECT =3D "object";
@@ -379,7 +386,7 @@
ComplexTreeProperties.DOUBLE_BUTTONS =3D true;
}
return ComplexTreeProperties.CONTEXT + ComplexTreeProperties.=
WORKFLOW_ICONS_PATH + state + '.png';
- } else { =
+ } else {
DBG.println("ComplexTreeProperties.getImageSrc - Not Found:
"=
+ state);
ComplexTreeProperties.Error =3D true;
return ComplexTreeProperties.CONTEXT +
ComplexTreeProperties.=
EMPTY_SRC;
@@ -422,6 +429,7 @@
case ComplexTreeProperties.IMAGE_LINK:
case ComplexTreeProperties.IMAGE_LINK_SAME_PAGE:
case ComplexTreeProperties.W_FLOW_TYPE:
+ case ComplexTreeProperties.PORTLET_CHECKBOX:
return 3;
=
case ComplexTreeProperties.W_FLOW_CHECKBOXES:
@@ -508,6 +516,9 @@
case ComplexTreeProperties.CATEGORY_CHECKBOX:
return [objectInfo.id, objectInfo.checked];
=
+ case ComplexTreeProperties.PORTLET_CHECKBOX:
+ return [objectInfo.id, objectInfo.checked,objectInfo.allsource=
s];
+
case ComplexTreeProperties.LINK:
case ComplexTreeProperties.LINK_SAME_PAGE:
var redLink =3D objectInfo.warnings || objectInfo.errors || ob=
jectInfo.locked;
@@ -996,6 +1007,10 @@
case ComplexTreeProperties.CATEGORY_CHECKBOX:
return "<input onclick=3D'javascript:clicked(this)' type=3D'ch=
eckbox' " + (data[1] ? "checked=3D'checked'" : "") + " name=3D'category_" +=
data[0] + "' />";
=
+ case ComplexTreeProperties.PORTLET_CHECKBOX:
+ var imgAllSources =3D "<img src=3D'"+ComplexTreeProper=
ties.CONTEXT+ComplexTreeProperties.PORTLET_CATEGORY_ALLSOURCES_SRC+"' />"
+ return "<input onclick=3D'javascript:this.value=3Dtrue=
;' type=3D'checkbox' " + (data[1] ? "checked=3D'checked'" : "") + " name=
=3D'category_" + data[0] + "' />"+ (data[2] ? imgAllSources : "");
+
default:
DBG.println("ComplexTreeProperties.getHtml - Not Found: " + ty=
pe);
return null;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
