Author: pvollenweider
Date: Fri Nov 2 16:15:43 2007
New Revision: 19034
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19034&repname=
=3Djahia
Log:
First implementation of topbar reusable taglib
To use this on your template, you need to add following taglib declaration:
<%@ taglib tagdir=3D"/WEB-INF/tags" prefix=3D"h" %>
Then to add the topbar, you just need to add followind tag after the body t=
ag:
<h:topbar/>
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/advanced=
options.tagf
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/declarat=
ions.tagf
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/operatio=
nmodes.tagf
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/progress=
bar.tagf
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.t=
ag
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar_s=
plit.tag
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/usertool=
s.tagf
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/workflow=
.tagf
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
advancedoptions.htc
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
jahiaadvancedoptions.htc
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
topbar.css
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/advancedoptions_left.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/advancedoptions_right.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/chat.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/compare.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/edit.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/live.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/logout.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/mysettings.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/operationmodes_left.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/operationmodes_right.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/preview.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/progress.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/toolbarbg.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/toolbarbg2.gif (with props)
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/imag=
es/vertical_dot.gif (with props)
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/advan=
cedoptions.tagf
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/advancedoptions.tagf&rev=
=3D19034&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/WEB-INF/tags/advanced=
options.tagf (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/advanced=
options.tagf Fri Nov 2 16:15:43 2007
@@ -0,0 +1,63 @@
+<%--
+Copyright 2002-2007 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<ul class=3D"advancedoptions">
+ <li><a href=3D"#"><span><content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"advancedEditSettings"
+ defaultValue=3D"Advanced options"/></span>=
</a>
+ <ul>
+ <content:pagePropertiesURL id=3D"pagePropertiesURL" display=3D=
"false" />
+ <logic:present name=3D"pagePropertiesURL">
+ <li>
+ <a href=3D"<bean:write name=3D'pagePropertiesURL'/>" t=
itle=3D"Pages properties"
+ class=3D"pageproperties">
+ <span>
+ <content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"pageSettings"
+ defaultValue=3D"Page properties"/>
+ </span>
+ </a>
+ </li>
+ </logic:present>
+ <li>
+ <a class=3D"filemanager"
+ title=3D'<content:resourceBundle resourceBundle=3D"jah=
iatemplates.common"
+ resourceName=3D"filemanager.name" defaultValue=3D"=
File manager"/>'
+ href=3D"<%=3DjData.gui().html().drawAjaxFileManagerLau=
ncher()%>"><span><content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common" resourceName=
=3D"filemanager.name"
+ defaultValue=3D"File manager"/></span></a>
+ </li>
+ <%
+ if ( org.jahia.registries.ServicesRegistry.getInstance().getJa=
hiaACLManagerService().getSiteActionPermission("admin.JahiaAdministration",=
jData.params().getUser(), org.jahia.services.acl.JahiaBaseACL.READ_RIGHTS,=
jData.params().getSiteID()) > 0 ) {
+ %><li><a href=3D"<%=3DjData.gui().html().drawAdministratio=
nLauncher()%>" class=3D"administration"
+ title=3D'<content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common" resourceName=
=3D"administration"
+ defaultValue=3D"Administration"/>'><span><content:reso=
urceBundle
+ resourceBundle=3D"jahiatemplates.common" resourceName=
=3D"administration"
+ defaultValue=3D"Administration"/></span></a></li><%
+ }
+ %>
+ <li><a href=3D"#" class=3D"sitesettings" title=3D'<content:res=
ourceBundle
+ resourceBundle=3D"jahiatemplates.common" resourceName=
=3D"siteSettings"
+ defaultValue=3D"Site settings"/>'><span><content:resou=
rceBundle
+ resourceBundle=3D"jahiatemplates.common" resourceName=
=3D"siteSettings"
+ defaultValue=3D"Site settings"/></span></a></li>
+ </ul>
+ </li>
+</ul>
\ No newline at end of file
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/decla=
rations.tagf
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/declarations.tagf&rev=3D19=
034&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/WEB-INF/tags/declarat=
ions.tagf (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/declarat=
ions.tagf Fri Nov 2 16:15:43 2007
@@ -0,0 +1,52 @@
+<%--
+Copyright 2002-2007 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%><%!
+ public String getCommonResource(String resourceKey, String defaultValu=
e, java.util.Locale l) {
+ String resourceBundle =3D "jahiatemplates.common";
+ java.util.ResourceBundle res =3D null;
+ String resValue =3D null;
+ try {
+ res =3D java.util.ResourceBundle.getBundle(resourceBundle, l);
+ resValue =3D res.getString(resourceKey);
+ } catch (java.util.MissingResourceException mre) {
+ }
+ if (resValue =3D=3D null) {
+ resValue =3D defaultValue;
+ }
+ return resValue;
+ }
+%><%
+org.jahia.data.JahiaData jData =3D (org.jahia.data.JahiaData) request.getA=
ttribute( "org.jahia.data.JahiaData" );
+java.util.HashMap engineMap =3D (java.util.HashMap) request.getAttribute( =
"org.jahia.engines.EngineHashMap" );
+if(jData =3D=3D null) {
+ jData =3D (org.jahia.data.JahiaData) engineMap.get( "jData" );
+}
+org.jahia.params.ParamBean jParams =3D jData.params();
+
+org.jahia.services.pages.ContentPage contentPage =3D
+ org.jahia.services.pages.ContentPage.getPage(jData.page().getID());
+java.util.Map languagesStates =3D contentPage.getLanguagesStates(true);
+
+// get the current user
+org.jahia.services.usermanager.JahiaUser user =3D jData.params().getUser();
+
+String chatstatus=3D(String) session.getAttribute("chatstatus");
+if(chatstatus=3D=3Dnull) chatstatus=3D"false";
+
+org.jahia.services.acl.JahiaACLManagerService aclService =3D
+ org.jahia.registries.ServicesRegistry.getInstance().getJahiaACLManager=
Service();
+%>
\ No newline at end of file
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/opera=
tionmodes.tagf
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/operationmodes.tagf&rev=3D=
19034&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/WEB-INF/tags/operatio=
nmodes.tagf (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/operatio=
nmodes.tagf Fri Nov 2 16:15:43 2007
@@ -0,0 +1,125 @@
+<%--
+Copyright 2002-2007 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<ul class=3D"operationmodes">
+<%
+boolean writeAccess =3D false;
+boolean editModePermission =3D org.jahia.registries.ServicesRegistry.getIn=
stance().getJahiaACLManagerService()
+ .getSiteActionPermission("engines.actions.editMode", jParams.getUser()=
, org.jahia.services.acl.JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > 0;
+if (editModePermission) {
+ // we have a permission to use edit mode, now let's check if we have w=
rite access
+ // on the content.
+ writeAccess =3D jData.page().checkWriteAccess(user, true);
+ if (writeAccess || jData.page().checkAdminAccess(user, true)) {
+
+ // reduce the scope of this local var to avoid conflicts with corp=
orate2: please check against both corporate sets before commit
+ org.jahia.services.pages.ContentPage thecontentPage =3D jData.getP=
rocessingContext().getContentPage();
+ String thelocale =3D jParams.getLocale().toString();
+ boolean hasActiveEntries =3D thecontentPage.hasEntries(org.jahia.s=
ervices.pages.ContentPage.ACTIVE_PAGE_INFOS, thelocale);
+
+ boolean isAvailable =3D true;
+ //check the isAvailable only if tbp display activated
+ /*if(tbp_visu.equalsIgnoreCase("true"))*/
+ isAvailable =3D thecontentPage.isAvailable();
+
+ String expiredMsg =3D org.jahia.resourcebundle.JahiaResourceBundle=
.getEngineResource("org.jahia.engines.timebasedpublishing.timebpstatus.0.la=
bel",jParams,
+ jParams.getLocale(),"expired");
+ String notValidMsg =3D org.jahia.resourcebundle.JahiaResourceBundl=
e.getEngineResource("org.jahia.engines.timebasedpublishing.timebpstatus.1.l=
abel",jParams,
+ jParams.getLocale(),"not available");
+
+ Integer languageState =3D (Integer) languagesStates.get(thelocale);
+
+ // Display Live button
+ if (hasActiveEntries && isAvailable) {
+ %>
+ <li <%=3D jData.gui().isNormalMode() ? "class=3D'selected'" : =
""%>>
+ <a href=3D"<%=3DjData.gui().drawNormalModeLink()%>" title=
=3D'<content:resourceBundle
+ resourceBundle=3D"JahiaAdministrationResources"
+ resourceName=3D"operationMode.live"
+ defaultValue=3D"Live"/>'>
+ <span><span class=3D"live"><content:resourceBundle
+ resourceBundle=3D"JahiaAdministrationResources"
+ resourceName=3D"operationMode.live"
+ defaultValue=3D"Live"/></span></span>
+ </a>
+ </li>
+ <%
+ }
+
+
+ if ( !jData.gui().isNormalMode() || writeAccess) {
+ boolean displayPreview =3D (!thecontentPage.isStagedEntryM=
arkedForDeletion(thelocale));
+
+ // Display Preview & compare buttons
+ if (displayPreview) {
+ %>
+ <li <%=3D jData.gui().isPreviewMode() ? "class=3D'selected=
'" : ""%>>
+ <a href=3D"<%=3DjData.gui().drawPreviewModeLink()%>" t=
itle=3D'<content:resourceBundle
+ resourceBundle=3D"JahiaAdministrationResources"
+ resourceName=3D"operationMode.preview" default=
Value=3D"Preview"/>'>
+ <span><span class=3D"preview"><content:resourceBun=
dle
+ resourceBundle=3D"JahiaAdministrationResources"
+ resourceName=3D"operationMode.preview" default=
Value=3D"Preview"/>
+ <%
+ if (!isAvailable){
+ if ( thecontentPage.getTimeBasedPublishing=
State()=3D=3D org.jahia.content.TimeBasedPublishingState.EXPIRED_STATE ){
+ %>
+ <img style=3D"border:0px;"
+ src=3D'<%=3Dorg.jahia.bin.Jahia.ge=
tContextPath()%>/jsp/jahia/engines/images/icons/timebasedpublishing/red_clo=
ck.gif'
+ alt=3D'<%=3DexpiredMsg%>' title=3D=
'<%=3DexpiredMsg%>'/>
+ <%
+ } else {
+ %><img style=3D"border:0px;"
+ src=3D'<%=3Dorg.jahia.bin.Jahia.getCon=
textPath()%>/jsp/jahia/engines/images/icons/timebasedpublishing/yellow_cloc=
k.gif'
+ alt=3D'<%=3DnotValidMsg%>' title=3D'<%=
=3DnotValidMsg%>'/>
+ <%
+ }
+ }
+ %>
+ </span></span>
+ </a>
+ </li>
+ <li <%=3D jData.gui().isCompareMode() ? "class=3D'selected=
'" : ""%>>
+ <a href=3D"<%=3DjData.gui().drawRevDifferenceModeLink(=
1, jData.params().getOperationMode())%>"
+ title=3D'<content:resourceBundle
+ resourceBundle=3D"JahiaAdministrationResou=
rces"
+ resourceName=3D"operationMode.compare" def=
aultValue=3D"Compare"/>'>
+ <span><span class=3D"compare"><content:resourceBun=
dle
+ resourceBundle=3D"JahiaAdministrationResou=
rces"
+ resourceName=3D"operationMode.compare" def=
aultValue=3D"Compare"/></span></span>
+ </a>
+ </li>
+ <%
+ }
+ // Display Edit button
+ %>
+ <li <%=3D jData.gui().isEditMode() ? "class=3D'selected'" : ""=
%>>
+ <a href=3D"<%=3DjData.gui().drawEditModeLink()%>" title=3D=
'<content:resourceBundle
+ resourceBundle=3D"JahiaAdministrationResources"
+ resourceName=3D"operationMode.edit" defaultVal=
ue=3D"Edit"/>'>
+ <span><span class=3D"edit"><content:resourceBundle
+ resourceBundle=3D"JahiaAdministrationResources"
+ resourceName=3D"operationMode.edit" defaultVal=
ue=3D"Edit"/></span></span>
+ </a>
+ </li>
+ <%
+
+ } // if writeAccess
+ }
+}
+%>
+</ul>
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/progr=
essbar.tagf
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/progressbar.tagf&rev=3D190=
34&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/WEB-INF/tags/progress=
bar.tagf (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/progress=
bar.tagf Fri Nov 2 16:15:43 2007
@@ -0,0 +1,22 @@
+<%--
+Copyright 2002-2006 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<div class=3D"progressbar">
+<div>
+<!-- progressbar here -->
+</div>
+</div>
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topba=
r.tag
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.tag&rev=3D19034&rep=
name=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/WEB-INF/tags/topbar.t=
ag (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.t=
ag Fri Nov 2 16:15:43 2007
@@ -0,0 +1,45 @@
+<%--
+Copyright 2002-2006 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
+<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %>
+<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
+<logic:equal name=3D"currentRequest" property=3D"logged" value=3D"true">
+ <logic:equal name=3D"currentRequest" property=3D"logged" value=3D"true=
">
+ <link rel=3D"stylesheet" type=3D"text/css" href=3D"<content:server=
HttpPath/>/jsp/jahia/topbar/css/topbar.css"></link>
+ <!--[if IE]><style type=3D"text/css">
+ #jahiatoolbar ul ul.advancedoptions li {
+ behavior: url('<content:serverHttpPath/>/jsp/jahia/topbar/css/=
advancedoptions.htc');
+ }
+ </style>
+ <![endif]-->
+ </logic:equal>
+
+ <%@ include file=3D"declarations.tagf"%>
+ <div id=3D"jahiatoolbar">
+ <ul>
+ <li class=3D"dot"><%@ include file=3D"operationmodes.tagf"%></=
li>
+ <li class=3D"dot"><%@ include file=3D"advancedoptions.tagf"%><=
/li>
+ <li class=3D"dot"><%@ include file=3D"workflow.tagf"%></li>
+ </ul>
+
+ <%@ include file=3D"progressbar.tagf"%>
+ <%@ include file=3D"usertools.tagf"%>
+
+ </div>
+ <div id=3D"endjahiatoolbar"></div>
+</logic:equal>
\ No newline at end of file
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topba=
r_split.tag
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar_split.tag&rev=3D190=
34&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/WEB-INF/tags/topbar_s=
plit.tag (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar_s=
plit.tag Fri Nov 2 16:15:43 2007
@@ -0,0 +1,35 @@
+<%--
+Copyright 2002-2006 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
+<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %>
+<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
+<logic:equal name=3D"currentRequest" property=3D"logged" value=3D"true">
+ <%@ include file=3D"declarations.jspf"%>
+ <div id=3D"jahiatoolbar">
+ <ul>
+ <li class=3D"dot"><%@ include file=3D"operationmodes.jspf"%></=
li>
+ <li class=3D"dot"><%@ include file=3D"advancedoptions.jspf"%><=
/li>
+ <li class=3D"dot"><%@ include file=3D"workflow.jspf"%></li>
+ </ul>
+
+ <%@ include file=3D"progressbar.jspf"%>
+ <%@ include file=3D"usertools.jspf"%>
+
+ </div>
+ <div id=3D"endjahiatoolbar"></div>
+</logic:equal>
\ No newline at end of file
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/usert=
ools.tagf
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/usertools.tagf&rev=3D19034=
&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/WEB-INF/tags/usertool=
s.tagf (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/usertool=
s.tagf Fri Nov 2 16:15:43 2007
@@ -0,0 +1,41 @@
+<%--
+Copyright 2002-2006 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<ul class=3D"usertools">
+ <li><a href=3D"<%=3DjData.gui().html().drawLogoutLauncher()%>" class=
=3D"logout" title=3D'<content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"logout" defaultValue=3D"Logout=
"/>'><span><content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"logout" defaultValue=3D"Logout=
"/></span></a></li>
+
+ <li><a href=3D"#" class=3D"mysettings" title=3D'<content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"mySettings" defaultValue=3D"My=
settings"/>'><span><content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"mySettings" defaultValue=3D"My=
settings"/></span></a></li>
+
+ <li><a href=3D"#" class=3D"chat" title=3D'<content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"chatModule" defaultValue=3D"Ch=
at"/>'><span><content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"chatModule" defaultValue=3D"Ch=
at"/></span></a></li>
+
+ <li><content:resourceBundle resourceBundle=3D"jahiatemplates.common"
+ resourceName=3D"user" defaultValue=3D"User"/>:=
<strong><%=3DjParams.getUser().getUsername()%></strong></li>
+
+</ul>
+
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/workf=
low.tagf
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/workflow.tagf&rev=3D19034&=
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/WEB-INF/tags/workflow=
.tagf (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/workflow=
.tagf Fri Nov 2 16:15:43 2007
@@ -0,0 +1,95 @@
+<%--
+Copyright 2002-2007 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%
+if (!jData.gui().isNormalMode() && !jData.getProcessingContext().settings(=
).isReadOnlyMode()){
+
+ if (jData.page().checkWriteAccess(user, true)
+ || (jData.page().checkAdminAccess(user, true) && jData.page().checkR=
eadAccess(user))) {
+
+ java.util.Vector languageSettings =3D jParams.getSite().getLanguag=
eSettings();
+ if (languageSettings.size() > 0) {
+ java.util.Locale toploc=3DjData.params().getLocale();
+ %>
+ <a href=3D"javascript:<%=3DjData.gui().html().drawWorkflowLaun=
cher()%>" class=3D"workflow" title=3D'<content:resourceBundle
+ resourceBundle=3D"jahiatemplates.common" resourceName=
=3D"workflow"
+ defaultValue=3D"Workflow"/>'><span><content:resourceBu=
ndle
+ resourceBundle=3D"jahiatemplates.common" resourceName=
=3D"workflow"
+ defaultValue=3D"Workflow"/></span></a>
+ <%
+ java.util.HashMap resourceBundleState =3D new java.util.HashMa=
p();
+ resourceBundleState.put(new Integer(-1),"workflowArchivedState=
");
+ resourceBundleState.put(new Integer(0),"workflowArchivedState"=
);
+ resourceBundleState.put(new Integer(1),"workflowActiveState");
+ resourceBundleState.put(new Integer(2),"workflowEditState");
+ resourceBundleState.put(new Integer(3),"workflowWaitingState");
+
+ org.jahia.services.sites.JahiaSite thsite =3D jParams.getSite(=
);
+ org.jahia.services.pages.ContentPage cop =3D
org.jahia.services.pages.C=
ontentPage.getPage(jData.page().getID());
+ java.util.Vector siteLangSettings =3D thsite.getLanguageSettin=
gs();
+ java.util.Enumeration siteLangSettingsEnum =3D siteLangSetting=
s.elements();
+
+ java.util.Map pageOnlyLanguagesStates =3D
cop.getLanguagesStates(true);
+ java.util.Enumeration languageEnum =3D languageSettings.elemen=
ts();
+
+ %><ul class=3D"workflowstates"><%
+ while (siteLangSettingsEnum.hasMoreElements()) {
+ org.jahia.services.sites.SiteLanguageSettings curSetting =
=3D
+ (org.jahia.services.sites.SiteLanguageSettings)siteLan=
gSettingsEnum.nextElement();
+ String languageCode =3D curSetting.getCode();
+ java.util.Locale loc =3D org.jahia.utils.LanguageCodeConve=
rters.languageCodeToLocale(languageCode);
+ String currentLanguageCode =3D jParams.getLocale().toStrin=
g();
+ String languageName =3D loc.getDisplayLanguage(loc) + " ["=
+ loc.getDisplayName() + "]";
+ java.util.Hashtable pageTitles =3D
cop.getTitles(true);
+
+ Integer languageState =3D (Integer)languagesStates.get(lan=
guageCode);
+ Integer sharedLanguageState =3D (Integer)languagesStates.g=
et(org.jahia.content.ContentObject.SHARED_LANGUAGE);
+ Integer pageLanguageState =3D
(Integer)pageOnlyLanguagesStates.get(lan=
guageCode);
+
+ if (curSetting.isActivated()){
+ if (languageState !=3D null && languageState.intValue()
!=
=3D -1) {
+ if ( sharedLanguageState !=3D null
&& languageState.intValue() < =
sharedLanguageState.intValue() ){
+ languageState =3D
sharedLanguageState;
+ }
+ if ( languageState.intValue() >
org.jahia.services.version.EntryLoad=
Request.STAGING_WORKFLOW_STATE ){
+ if ( pageLanguageState
=3D=3D null || pageLanguageState.intValue() =
< languageState.intValue() ){
+ // the page
cannot be in waiting for approval if it has no entry (=
jahia page info ) at waiting for approval state.
+ languageState
=3D new Integer(org.jahia.services.version.EntryLoad=
Request.STAGING_WORKFLOW_STATE);
+ }
+ }
+ }
+ %>
+ <li>
+ <content:displayLanguageFlag code=3D"<%=3DlanguageCode=
%>"
+ href=3D'<%=3DcurrentLanguageCode.equals(languageCo=
de) ? "" : jData.gui().drawPageLanguageSwitch(languageCode)%>'
+ alt=3D"<%=3DlanguageName%>"/><%
+ if (languageState !=3D null /*&& wf_visu.trim().eq=
ualsIgnoreCase("true")*/) {
+ %><content:displayIcon src=3D"<%=3DlanguageSta=
te.toString()%>" lang=3D"<%=3DlanguageCode%>"/><%
+ }
+ %>
+ </li>
+ <%
+ }
+ }
+ %>
+ </ul>
+ <%
+ }
+ }
+}
+
+%>
\ No newline at end of file
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/c=
ss/advancedoptions.htc
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/advancedoptions.ht=
c&rev=3D19034&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/topbar/css/=
advancedoptions.htc (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
advancedoptions.htc Fri Nov 2 16:15:43 2007
@@ -0,0 +1,16 @@
+<?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>
+<public:component xmlns:public=3D"urn:HTMLComponent" lightweight=3D"true">
+<public:attach event=3D"onmouseover" handler=3D"mouseover"/>
+<public:attach event=3D"onmouseout" handler=3D"mouseout"/>
+
+<script type=3D"text/javascript">
+//<![CDATA[
+function mouseover() {
+ this.className+=3D" hover";
+}
+function mouseout() {
+ this.className=3Dthis.className.replace(" hover", "");
+}
+//]]>
+</script>
+</public:component>
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/c=
ss/jahiaadvancedoptions.htc
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/jahiaadvancedoptio=
ns.htc&rev=3D19034&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/topbar/css/=
jahiaadvancedoptions.htc (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
jahiaadvancedoptions.htc Fri Nov 2 16:15:43 2007
@@ -0,0 +1,16 @@
+<?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>
+<public:component xmlns:public=3D"urn:HTMLComponent" lightweight=3D"true">
+<public:attach event=3D"onmouseover" handler=3D"mouseover"/>
+<public:attach event=3D"onmouseout" handler=3D"mouseout"/>
+
+<script type=3D"text/javascript">
+//<![CDATA[
+function mouseover() {
+ this.className+=3D" hover";
+}
+function mouseout() {
+ this.className=3Dthis.className.replace(" hover", "");
+}
+//]]>
+</script>
+</public:component>
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/c=
ss/topbar.css
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/topbar.css&rev=3D1=
9034&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/topbar/css/=
topbar.css (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
topbar.css Fri Nov 2 16:15:43 2007
@@ -0,0 +1,254 @@
+#jahiatoolbar {
+ width: 100%;
+ height:76px;
+ background:url(../images/toolbarbg.gif) repeat-x;
+ position:absolute;
+ font: 12px Verdana, Arial, Helvetica, sans-serif;
+ color: #75868e;
+ top:0;
+ left:0;
+ z-index:1;
+ text-align:left;
+}
+#jahiatoolbar a {
+ text-decoration:none;
+}
+#jahiatoolbar ul {
+ position:absolute;
+ top: 49px;
+ left:28px;
+ margin: 0;
+ padding:0;
+ list-style-type: none;
+ z-index:2;
+}
+#jahiatoolbar ul li.dot {
+ display: inline;
+ margin:0;
+ padding:0 5px;
+ background: url(../images/vertical_dot.gif) repeat-y top right;
+ float:left;
+}
+#jahiatoolbar ul ul {
+ position:relative;
+ top: 0;
+ left:0;
+ margin: 0;
+ padding:0;
+ list-style-type: none;
+ float:left;
+}
+#jahiatoolbar ul ul.operationmodes li {
+ display: inline;
+ padding: 0 3px 0 0;
+ background-image:none;
+ margin:0;
+ float:left;
+}
+#jahiatoolbar ul ul.operationmodes li a {
+ background: url(../images/operationmodes_left.gif) no-repeat left top;
+ float: left;
+ text-decoration: none;
+ margin:0px;
+ height:25px;
+}
+#jahiatoolbar ul ul.operationmodes li a span{
+ background: url(../images/operationmodes_right.gif) no-repeat right top;
+ display: block;
+ float: left;
+}
+#jahiatoolbar ul ul.operationmodes li a span span {
+ white-space: nowrap;
+ background-image: none;
+ height:20px;
+ color:#000000;
+ font-weight: bold;
+ display: block;
+ float:left;
+ padding: 5px 10px 0 10px;
+}
+#jahiatoolbar ul ul.operationmodes li a span span.live {
+ background: url(../images/live.gif) no-repeat 8px 5px;
+ padding-left:25px;
+}
+#jahiatoolbar ul ul.operationmodes li a span span.preview {
+ background: url(../images/preview.gif) no-repeat 8px 5px;
+ padding-left:25px;
+}
+#jahiatoolbar ul ul.operationmodes li a span span.compare {
+ background: url(../images/compare.gif) no-repeat 8px 5px;
+ padding-left:25px;
+}
+#jahiatoolbar ul ul.operationmodes li a span span.edit {
+ background: url(../images/edit.gif) no-repeat 8px 5px;
+ padding-left:25px;
+}
+#jahiatoolbar ul ul.operationmodes li.selected a,
+#jahiatoolbar ul ul.operationmodes li.selected a:hover {
+ background-position: 0 -25px;
+}
+#jahiatoolbar ul ul.operationmodes li.selected a span,
+#jahiatoolbar ul ul.operationmodes li.selected a:hover span{
+ background-position: 100% -25px;
+ color:#ffffff;
+}
+#jahiatoolbar ul ul.operationmodes li.selected a span span,
+#jahiatoolbar ul ul.operationmodes li.selected a:hover span span{
+ background-position: 8px 5px;
+ color:#ffffff;
+}
+#jahiatoolbar ul ul.operationmodes li a:hover {
+ background-position: 0 -50px;
+}
+#jahiatoolbar ul ul.operationmodes li a:hover span{
+ background-position: 100% -50px;
+}
+
+
+
+#jahiatoolbar ul ul.advancedoptions {
+ float:left;
+ padding-top:3px;
+}
+#jahiatoolbar ul ul.advancedoptions li a {
+ background: url(../images/advancedoptions_left.gif) no-repeat left top;
+ float: left;
+ text-decoration: none;
+ margin:0px;
+ height:25px;
+}
+#jahiatoolbar ul ul.advancedoptions li a span {
+ background: url(../images/advancedoptions_right.gif) no-repeat right
top;
+ display: block;
+ float: left;
+ white-space: nowrap;
+ padding: 2px 20px 0 10px;
+ height:20px;
+ color:#656565;
+ font-weight: bold;
+}
+#jahiatoolbar ul ul.advancedoptions ul {
+ display:none;
+ margin:0px;
+ padding:0px;
+ position:relative;
+ top:18px;
+ left:-180px;
+ margin:0px;
+ padding:0px;
+ background: #dfdfdf;
+ border-top: 1px solid #c2cfd5;
+ border-right: 1px solid #c2cfd5;
+ border-left: 1px solid #c2cfd5;
+
+}
+#jahiatoolbar ul ul.advancedoptions li:hover ul,
+#jahiatoolbar ul ul.advancedoptions li.hover ul {
+ display:block;
+}
+#jahiatoolbar ul ul.advancedoptions li:hover ul li,
+#jahiatoolbar ul ul.advancedoptions li.hover ul li {
+ clear: left;
+ background-image:none;
+ margin:0;
+ padding:0;
+}
+#jahiatoolbar ul ul.advancedoptions li:hover ul li a,
+#jahiatoolbar ul ul.advancedoptions li.hover ul li a {
+ display:block;
+ border-bottom: 1px solid #c2cfd5;
+ background-image:none;
+ width:200px;
+ padding:0;
+ line-height:20px;
+}
+#jahiatoolbar ul ul.advancedoptions li:hover ul li a span,
+#jahiatoolbar ul ul.advancedoptions li.hover ul li a span {
+ background-image:none;
+ padding:3px 0 0 5px;
+}
+#jahiatoolbar ul ul.advancedoptions li:hover ul li a:hover,
+#jahiatoolbar ul ul.advancedoptions li.hover ul li a:hover {
+ background: #656565;
+}
+#jahiatoolbar ul ul.advancedoptions li:hover ul li a:hover span,
+#jahiatoolbar ul ul.advancedoptions li.hover ul li a:hover span {
+ color:#ffffff;
+}
+#jahiatoolbar ul li a.workflow {
+ float:left;
+ border-width:0;
+ padding:0;
+}
+#jahiatoolbar ul li a.workflow span{
+ color:#2f9ecc;
+ font-weight: bold;
+ padding-top:5px;
+ display:block;
+}
+#jahiatoolbar ul ul.workflowstates {
+ float:left;
+ padding:3px 0 0 5px;
+}
+
+#jahiatoolbar ul ul.workflowstates li {
+ display: inline;
+ padding-right:3px;
+}
+
+#jahiatoolbar ul.usertools {
+ position:absolute;
+ top: 10px;
+ left:350px;
+ padding:0 20px 0 0;
+ list-style-type: none;
+ z-index:4;
+}
+#jahiatoolbar ul.usertools li {
+ float:right;
+ display:block;
+ font-size:11px;
+ display: inline;
+ margin:0;
+ padding:0 5px;
+ background: url(../images/vertical_dot.gif) repeat-y top right;
+}
+
+#jahiatoolbar ul.usertools li a {
+ color:#2f9ecc;
+ padding:0 5px 2px 5px;
+}
+#jahiatoolbar ul.usertools li a.chat {
+ background: url(../images/chat.gif) no-repeat 0 0;
+ padding-left:16px;
+}
+#jahiatoolbar ul.usertools li a.mysettings {
+ background: url(../images/mysettings.gif) no-repeat 0 0;
+ padding-left:16px;
+}
+#jahiatoolbar ul.usertools li a.logout {
+ background: url(../images/logout.gif) no-repeat 0 3px;
+ padding-left:20px;
+
+}
+
+#jahiatoolbar div.progressbar {
+ position:absolute;
+ top: 52px;
+ left:700px;
+ padding:0 20px 0 0;
+ list-style-type: none;
+ z-index:5;
+}
+#jahiatoolbar div.progressbar div {
+ float:right;
+ background: url(../images/progress.gif) no-repeat 0 0;
+ width:132px;
+ height:16px;
+ display:block;
+}
+
+#endjahiatoolbar {
+ margin-top:76px;
+
+}
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/advancedoptions_left.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/advancedoptions=
_left.gif&rev=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/advancedoptions_right.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/advancedoptions=
_right.gif&rev=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/chat.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/chat.gif&rev=3D=
19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/compare.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/compare.gif&rev=
=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/edit.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/edit.gif&rev=3D=
19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/live.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/live.gif&rev=3D=
19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/logout.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/logout.gif&rev=
=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/mysettings.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/mysettings.gif&=
rev=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/operationmodes_left.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/operationmodes_=
left.gif&rev=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/operationmodes_right.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/operationmodes_=
right.gif&rev=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/preview.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/preview.gif&rev=
=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/progress.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/progress.gif&re=
v=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/toolbarbg.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/toolbarbg.gif&r=
ev=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/toolbarbg2.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/toolbarbg2.gif&=
rev=3D19034&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
Binary file - no diff available.
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/i=
mages/vertical_dot.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/images/vertical_dot.gi=
f&rev=3D19034&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
Binary file - no diff available.
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
