Author: rfelden
Date: Thu Nov 29 10:15:42 2007
New Revision: 19317
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19317&repname=
=3Djahia
Log:
scrollbar added to rights management window (MIN-378)
NavMenu edit mode refactoring
jahia topbar font refactored
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/wor=
kflow/changeworkflow.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
topbar.css
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/menus/NavMenuTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/menus/NavMenuTag.java&rev=
=3D19317&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java Thu Nov 29 10:15:42 2007
@@ -238,8 +238,8 @@
}
}
=
- if (editMode) {
- if (begin) {
+ if (editMode && level >=3D reqLevel-1) { // new page can only be c=
reated as a sibling or a child
+ if (begin) { // to the current page (vis=
ual coherence limitation)
if (menuStyle =3D=3D null) {
out.print("<ul>");
} else {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engin=
es/workflow/changeworkflow.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.jsp&=
rev=3D19317&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-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/wor=
kflow/changeworkflow.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/wor=
kflow/changeworkflow.jsp Thu Nov 29 10:15:42 2007
@@ -119,7 +119,7 @@
var myWin =3D 0;
=
function puselectUsrGrp(url, _selectBoxName){
- var params =3D "width=3D900,height=3D768,status=3D0,menubar=3D0,re=
sizable=3D1,scrollbars=3D0";
+ var params =3D "width=3D900,height=3D768,status=3D0,menubar=3D0,re=
sizable=3D1,scrollbars=3D1";
var name =3D "selectUsrGrp";
=
myWin =3D window.open(url, name, params);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topba=
r/css/topbar.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/topbar.css&rev=3D19317&re=
pname=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-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
topbar.css (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
topbar.css Thu Nov 29 10:15:42 2007
@@ -3,7 +3,8 @@
height:76px;
background:url(../images/toolbarbg.gif) repeat-x;
position:absolute;
- font: 12px Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-family:Arial;
color: #75868e;
top:0;
left:0;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
