Author: bpapez
Date: Fri Jun 15 14:35:32 2007
New Revision: 17595
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17595&repname=
=3Djahia
Log:
Site dependent action menu icons and fix positioning
Modified:
trunk/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java
trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
trunk/core/src/webapp/jsp/jahia/css/core_css.jsp
Modified: trunk/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/ajax/actionmenus/GetMenuItemsAction.java&rev=3D17595&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/ajax/actionmenus/GetMenuItemsAction.java =
(original)
+++ trunk/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java =
Fri Jun 15 14:35:32 2007
@@ -58,6 +58,7 @@
private static final String AJAX_LAUNCHER =3D "launcher";
private static final String AJAX_IMAGE =3D "image";
private static final String AJAX_METHOD =3D "method";
+ private static final String AJAX_STYLECLASS =3D "styleClass";
=
private static final String KEY =3D "key";
private static final String TYPE =3D "type";
@@ -211,6 +212,7 @@
xmlTagNames.addElement(AJAX_LAUNCHER);
xmlTagNames.addElement(AJAX_IMAGE);
xmlTagNames.addElement(AJAX_METHOD);
+ xmlTagNames.addElement(AJAX_STYLECLASS); =
=
// Fill up the tag values (Order matters !!!)
final Vector xmlTagValues =3D new Vector();
@@ -221,6 +223,7 @@
xmlTagValues.addElement(info.get(AJAX_LAUNCHER));
xmlTagValues.addElement(info.get(AJAX_IMAGE));
xmlTagValues.addElement(info.get(AJAX_METHOD));
+ xmlTagValues.addElement(info.get(AJAX_STYLECLASS)); =
=
// Build and send the response message...
sendResponse(xmlTagNames, xmlTagValues, response);
@@ -295,6 +298,7 @@
final StringBuffer launchers =3D new StringBuffer();
final StringBuffer methods =3D new StringBuffer();
final StringBuffer images =3D new StringBuffer();
+ final StringBuffer styleClasses =3D new StringBuffer();
=
while (actionURIIter.hasNext()) {
final Map.Entry curEntry =3D (Map.Entry) actionURIIter.next();
@@ -330,20 +334,20 @@
name =3D curActionURIBean.getName();
}
methods.append(name).append(DELIMITER);
- images.append(box.getURLImageContext());
=
if (curActionURIBean.isLocked()) {
if (lockIcon =3D=3D null) {
- images.append(SLASH).append(DEFAULT_LOCK_IMAGE);
+ images.append(box.getURLImageContext()).append(SLA=
SH).append(DEFAULT_LOCK_IMAGE);
} else {
- images.append(SLASH).append(lockIcon);
- }
-
+ images.append(lockIcon);
+ } =
+ styleClasses.append("lockgreyIcon"); =
=
} else {
- images.append(SLASH).append(curActionURIBean.getName()=
).append(GIF);
+ images.append(box.getURLImageContext()).append(SLASH).=
append(curActionURIBean.getName()).append(GIF);
+ styleClasses.append(curActionURIBean.getName() + "Icon=
"); =
}
-
images.append(DELIMITER);
+ styleClasses.append(DELIMITER); =
}
}
=
@@ -351,6 +355,7 @@
result.put(AJAX_LAUNCHER, launchers.toString());
result.put(AJAX_METHOD, methods.toString());
result.put(AJAX_IMAGE, images.toString());
+ result.put(AJAX_STYLECLASS, styleClasses.toString()); =
=
}
=
return result;
@@ -366,12 +371,14 @@
String launchers =3D (String) map.get(AJAX_LAUNCHER);
String methods =3D (String) map.get(AJAX_METHOD);
String images =3D (String) map.get(AJAX_IMAGE);
+ String styleClasses =3D (String) map.get(AJAX_STYLECLASS); =
=
StringBuffer result =3D new StringBuffer();
- if (launchers !=3D null && methods !=3D null && images !=3D null) {
+ if (launchers !=3D null && methods !=3D null && images !=3D null &=
& styleClasses !=3D null) {
String[] launcherarrays =3D launchers.split(";{2}");
String[] methodarrays =3D methods.split(";{2}");
String[] imagearrays =3D images.split(";{2}");
+ String[] styleclassarrays =3D styleClasses.split(";{2}"); =
=
result.append("ACTIONS INFO\n");
for (int i =3D 0; i < launcherarrays.length; i++) {
result.append("[").append(i).append("] - LAUNCHERS: ").app=
end(launcherarrays[i].replaceAll("\\n", ""));
@@ -379,6 +386,8 @@
else result.append(" METHODS: NA");
if (i < imagearrays.length) result.append(" IMAGES: ").app=
end(imagearrays[i].replaceAll("\\n", ""));
else result.append(" IMAGES:NA");
+ if (i < styleclassarrays.length) result.append(" STYLECLAS=
SES: ").append(styleclassarrays[i].replaceAll("\\n", ""));
+ else result.append(" STYLECLASSES:NA"); =
result.append("\n");
}
}
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=3D17595&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 Fri Jun 15 14:35:32 =
2007
@@ -1371,11 +1371,6 @@
=
final StringBuffer buff =3D new StringBuffer(100);
=
- final String picto =3D actionIcon =3D=3D null ?
- buff.append(getURLImageContext()).append("/action.gif").to=
String() :
- actionIcon;
- buff.delete(0, buff.length());
-
final String uniqueID =3D buildUniqueContentID(objectType, objectI=
D,
definitionID, parentID, pageID, lockIcon, useFieldSet, res=
ourceBundle, namePostFix);
=
@@ -1481,10 +1476,7 @@
out.print(uniqueID);
out.print("\" href=3D\"");
out.print(ajaxFunction);
- out.print("\"\n");
- out.print(" onmouseover=3D\"buttonMouseover(event, '");
- out.print(uniqueID);
- out.print("')\"><img\n");
+ out.print("\"><span class=3D\"actionmenu ");
=
String resource =3D getResource(resourceBundle, objectType + "Oper=
ations");
=
@@ -1505,9 +1497,16 @@
if (cc !=3D null && pickerObjectsSize > 0) {
//this container is picked
resource =3D resource + " (" + getResource(resourceBundle,=
"numbercopies") + ":" + pickerObjectsSize + ")";
- buff.append(" src=3D\"").append(picto).append("\" alt=3D\"=
").append(resource).
- append("\"").append(" title=3D\"").append(resource=
).append("\" border=3D\"0\"/>");
-
+ =
+ buff.append("actionIcon\""); =
+ if (actionIcon !=3D null) { =
+ buff.append(" style=3D\"background-image: url('").appe=
nd(actionIcon).
+ append("');background-repeat: no-repeat;\">").appe=
nd("<img class=3D\"actionIcon\" style=3D\"visibility:hidden;\" src=3D\"").
+ append(actionIcon).append("\" alt=3D\"").appen=
d(resource).append("\" border=3D\"0\"/>");
+ } else {
+ buff.append("><img class=3D\"actionIcon\" src=3D\"").a=
ppend(getURLImageContext()).append("/action.gif\" alt=3D\"").
+ append(resource).append("\" border=3D\"0\"/>");
+ } =
} else if (cc !=3D null && contentObject.isPicker() && cc.getP=
ickedObject() !=3D null) {
// picker status of object
pickedObject =3D cc.getPickedObject();
@@ -1518,28 +1517,43 @@
=
//pickedpageID=3D""+((ContentContainer)pickedObject).getPa=
geID();
=
- buff.append(" src=3D\"").append(getURLImageContext()).appe=
nd("/picker.gif").append("\" alt=3D\"").append(resource).
- append("\"").append(" title=3D\"").append(resource=
).append("\" border=3D\"0\"/>");
+ buff.append("pickerIcon\"");
+ buff.append("><img class=3D\"pickerIcon\" src=3D\"").appen=
d(getURLImageContext()).append("/picker.gif\" alt=3D\"").
+ append(resource).append("\" border=3D\"0\"/>");
=
=
} else {
// standard objects
- buff.append(" src=3D\"").append(picto).append("\" alt=3D\"=
").append(resource).
- append("\"").append(" title=3D\"").append(resource=
).append("\" border=3D\"0\"/>");
+ buff.append("actionIcon\"");
+ if (actionIcon !=3D null) { =
+ buff.append(" style=3D\"background-image: url('").appe=
nd(actionIcon).
+ append("');background-repeat: no-repeat;\">").appe=
nd("<img class=3D\"actionIcon\" style=3D\"visibility:hidden;\" src=3D\"").
+ append(actionIcon).append("\" alt=3D\"").appen=
d(resource).append("\" border=3D\"0\"/>");
+ } else {
+ buff.append("><img class=3D\"actionIcon\" src=3D\"").a=
ppend(getURLImageContext()).append("/action.gif\" alt=3D\"").
+ append(resource).append("\" border=3D\"0\"/>");
+ } =
}
} catch (JahiaException e) {
logger.debug(e);
// standard objects
- buff.append(" src=3D\"").append(picto).append("\" alt=3D\"").a=
ppend(resource).
- append("\"").append(" title=3D\"").append(resource).ap=
pend("\" border=3D\"0\"/>");
+ buff.append("actionIcon\"");
+ if (actionIcon !=3D null) { =
+ buff.append(" style=3D\"background-image: url('").append(a=
ctionIcon).
+ append("');background-repeat: no-repeat;\">").append("=
<img class=3D\"actionIcon\" style=3D\"visibility:hidden;\" src=3D\"").appen=
d(actionIcon).
+ append("\" alt=3D\"").append(resource).append("\" bord=
er=3D\"0\"/>");
+ } else {
+ buff.append("><img class=3D\"actionIcon\" src=3D\"").appen=
d(getURLImageContext()).append("/action.gif\" alt=3D\"").
+ append(resource).append("\" border=3D\"0\"/>");
+ } =
}
=
+ buff.append("</span>"); =
out.println(buff.toString());
buff.delete(0, buff.length());
=
=
if (labelKey !=3D null) {
- out.print(" ");
out.println(getResource(resourceBundle, labelKey));
}
out.println("</a>");
Modified: trunk/core/src/webapp/jsp/jahia/css/core_css.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/css/core_css.jsp&rev=3D17595&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/css/core_css.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/css/core_css.jsp Fri Jun 15 14:35:32 20=
07
@@ -589,7 +589,6 @@
}
=
div.topmenus a {
- float: left;
margin-left: 1px;
margin-top: 3px;
font-size: 11px;
@@ -607,21 +606,16 @@
background-color : #EEEEEE;
}
=
- div.topmenus span {
- float: left;
- margin-left: 1px;
- margin-top: 3px;
-
- /*border: 1px solid;*/
- }
-
- div.topmenus img {
- float: left;
- margin-left: 1px;
- margin-top: 3px;
-
- /*border: 1px solid;*/
+ DIV.topmenus .workflowState {
+ display: inline
}
+ DIV#mods {
+ margin-top: 5px; =
+ margin-bottom: 5px; =
+ }
+ DIV#mods span {
+ float: left
+ } =
=
#filemanagerLinkBoxFirstRow a,
#filemanagerLinkBoxFirstRow img {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
