Author: sshyrkov
Date: Thu Nov 8 15:30:42 2007
New Revision: 19072
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19072&repname=
=3Djahia
Log:
Enable workflow state retrieval
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.t=
ag
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/topbar/css/=
topbar.css
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/to=
pbar.tag
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.tag&rev=3D19072&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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 (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/tags/topbar.t=
ag Thu Nov 8 15:30:42 2007
@@ -15,20 +15,30 @@
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" %>
+<%@ 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" =
+%><%@ taglib uri=3D"/WEB-INF/etc/taglibs/jstl/c" prefix=3D"c" %>
<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]-->
+ <link rel=3D"stylesheet" type=3D"text/css" href=3D"<content:serverHttp=
Path/>/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/adva=
ncedoptions.htc');
+ }
+ </style>
+ <![endif]-->
+ <logic:equal name=3D"currentRequest" property=3D"editMode" value=3D"tr=
ue">
+ <script type=3D"text/javascript" src=3D"<c:url value=3D'/jsp/jahia=
/javascript/prototype/proto15sc17-compressed.js'/>"></script>
+ <script type=3D"text/javascript" src=3D"<c:url value=3D'/jsp/jahia=
/javascript/workflow.js'/>"></script>
+ <script type=3D"text/javascript">
+ Event.observe(window, 'load', function () {
+ jahia.config.contextPath =3D '${pageContent.request.contex=
tPath}';
+ jahia.config.pageId =3D '${currentPage.id}';
+ new JahiaWorkflowStateInfo().showState();
+ });
+ Event.observe(window, 'unload', Event.unloadCache);
+ </script>
</logic:equal>
-
<%@ include file=3D"declarations.tagf"%>
<div id=3D"jahiatoolbar">
<ul>
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=3D19072&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 8 15:30:42 2007
@@ -261,3 +261,6 @@
margin-top:76px;
=
}
+img.wfState {
+ border: none;
+}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
