Author: knguyen
Date: Wed Aug 16 15:07:04 2006
New Revision: 14909
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14909&repname=jahia
Log:
- display preview when compare is present.
Modified:
trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc
Modified: trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc&rev=14909&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc (original)
+++ trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc Wed Aug 16
15:07:04 2006
@@ -17,12 +17,16 @@
--%><%
if (jData.page().checkWriteAccess(user,true)
|| (jData.page().checkAdminAccess(user,true) &&
jData.page().checkReadAccess(user))) {
+
+ ContentPage contentPage = jData.getProcessingContext().getContentPage();
+ boolean hasActiveEntries =
contentPage.hasEntries(ContentPage.ACTIVE_PAGE_INFOS,
jParams.getLocale().toString());
+ boolean isAvailable = contentPage.isAvailable();
%>
<div class="tab">
<ul>
<%
// Display Live button
- if
(ContentPage.getPage(jData.page().getID()).hasEntries(ContentPage.ACTIVE_PAGE_INFOS,
jParams.getLocale().toString()) &&
ContentPage.getPage(jData.page().getID()).isAvailable()) {
+ if (hasActiveEntries && isAvailable) {
String liveUrl = jData.gui().drawNormalModeLink();
%>
<li <%= jData.gui().isNormalMode() ? "class='selected'" : ""%>>
@@ -40,28 +44,28 @@
boolean displayPreview = false;
boolean isSharedInStaging_1 = false;
Integer sharedState_1 = (Integer) languagesStates.get("shared");
- boolean writeAccess =
ContentPage.getPage(jData.page().getID()).checkWriteAccess(jData.params().getUser());
+ boolean writeAccess =
contentPage.checkWriteAccess(jData.params().getUser());
+ boolean isMarkedForDelete =
contentPage.isStagedEntryMarkedForDeletion(jParams.getLocale().toString());
if (sharedState_1 != null) {
if (sharedState_1.intValue() >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE) {
isSharedInStaging_1 = true;
+ displayPreview = true;
}
}
- if (languageState != null) {
+ if (!displayPreview && languageState != null) {
if (languageState.intValue() >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE) {
displayPreview = true;
}
}
- if
(ContentPage.getPage(jData.page().getID()).isStagedEntryMarkedForDeletion(jParams.getLocale().toString()))
+ if (isMarkedForDelete)
{
displayPreview = false;
isSharedInStaging_1 = false;
}
- displayPreview = (displayPreview &&
ContentPage.getPage(jData.page().getID()).isAvailable());
+ displayPreview = (displayPreview && isAvailable);
- if ((displayPreview || isSharedInStaging_1 ||
jData.gui().isCompareMode()) &&
-
ContentPage.getPage(jData.page().getID()).hasEntries(ContentPage.ACTIVE_PAGE_INFOS
| ContentPage.STAGING_PAGE_INFOS,
- jParams.getLocale().toString()) && writeAccess) {
+ if ((displayPreview || isSharedInStaging_1 ||
jData.gui().isCompareMode()) && writeAccess) {
if (displayPreview) {
String previewUrl = jData.gui().drawPreviewModeLink();
%>
@@ -74,7 +78,7 @@
</li>
<%
}
- if
(ContentPage.getPage(jData.page().getID()).hasEntries(ContentPage.ACTIVE_PAGE_INFOS,
jParams.getLocale().toString())) {
+ if (hasActiveEntries) {
String compareUrl = jData.gui().drawRevDifferenceModeLink(1,
jData.params().getOperationMode());
%>
<li <%= jData.gui().isCompareMode() ? "class='selected'" : ""%>>
