knguyen 2005/08/12 11:14:10 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp/include admin_menu.inc
Log:
- rollback of rollback
Revision Changes Path
1.4.4.3 +3 -3
corporate_portal_templates/src/view/jsp/include/admin_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/admin_menu.inc.diff?r1=1.4.4.2&r2=1.4.4.3&f=h
Index: admin_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/admin_menu.inc,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -u -r1.4.4.2 -r1.4.4.3
--- admin_menu.inc 12 Aug 2005 09:08:05 -0000 1.4.4.2
+++ admin_menu.inc 12 Aug 2005 09:14:10 -0000 1.4.4.3
@@ -44,7 +44,7 @@
<jahia:tabButtonsList>
<%
// Display Live button
- if (
cp.hasEntries(ContentPage.ACTIVE_PAGE_INFOS,jParams.getLocale().toString())){
+ if ( cp.isAvailable() &&
cp.hasEntries(ContentPage.ACTIVE_PAGE_INFOS,jParams.getLocale().toString())){
%>
<jahia:tabButton
label='<%=getResourceBundle("live","live",jData)%>'
url="<%=jData.gui().drawNormalModeLink()%>"
@@ -64,9 +64,9 @@
displayPreview = false;
isSharedInStaging = false;
}
- if ( (displayPreview || isSharedInStaging ||
jData.gui().isCompareMode()) &&
+ if ( cp.isAvailable() && ( (displayPreview ||
isSharedInStaging || jData.gui().isCompareMode()) &&
cp.hasEntries(ContentPage.ACTIVE_PAGE_INFOS |
ContentPage.STAGING_PAGE_INFOS,
- jParams.getLocale().toString()) ) {
+ jParams.getLocale().toString())) ) {
%>
<jahia:tabButton
label='<%=getResourceBundle("preview","preview",jData)%>'
url="<%=jData.gui().drawPreviewModeLink()%>"
