Author: vmassol
Date: 2008-01-15 10:07:42 +0100 (Tue, 15 Jan 2008)
New Revision: 6838
Modified:
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/skins/albatross/menuview.vm
Log:
Hide the watchlist feature in virtual mode until XPWATCHLIST-4 resolution
Minor changes in the UI
* Fixed error introduced in previous commit which had the condition inverted...
Merged from trunk (rev 6837)
Modified:
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/skins/albatross/menuview.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/skins/albatross/menuview.vm
2008-01-15 09:05:25 UTC (rev 6837)
+++
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/skins/albatross/menuview.vm
2008-01-15 09:07:42 UTC (rev 6838)
@@ -84,9 +84,10 @@
##
## Watch menu
##
-## FIXME (JIRA : http://jira.xwiki.org/jira/browse/XPWATCHLIST-4)
-#if ($xwiki.isVirtual())
-#if ($xwiki.watchlist && $context.user != "XWiki.XWikiGuest" && !$doc.isNew())
+## We're disabling the Watchlist menu for now since the Watchlist doesn't work
yet in multiwiki
+## mode. Remove when http://jira.xwiki.org/jira/browse/XPWATCHLIST-4 is fixed.
+#if (!$xwiki.isVirtual())
+ #if ($xwiki.watchlist && $context.user != "XWiki.XWikiGuest" &&
!$doc.isNew())
<script type="text/javascript">
//<![CDATA[
function reloadActionMenu()
@@ -114,29 +115,29 @@
}
//]]>
</script>
-#set ($isWatchedDoc = $xwiki.watchlist.isWatchedDocument())
-#set ($isWatchedSpace = $xwiki.watchlist.isWatchedSpace())
-#if ($isWatchedDoc || $isWatchedSpace)
- #xwikitopmenuentrystart("javascript:watchlist('removedocument')"
$msg.get("core.menu.watch") "tmWatched")
-#else
- #xwikitopmenuentrystart("javascript:watchlist('adddocument')"
$msg.get("core.menu.watch") "tmWatch")
+ #set ($isWatchedDoc = $xwiki.watchlist.isWatchedDocument())
+ #set ($isWatchedSpace = $xwiki.watchlist.isWatchedSpace())
+ #if ($isWatchedDoc || $isWatchedSpace)
+ #xwikitopmenuentrystart("javascript:watchlist('removedocument')"
$msg.get("core.menu.watch") "tmWatched")
+ #else
+ #xwikitopmenuentrystart("javascript:watchlist('adddocument')"
$msg.get("core.menu.watch") "tmWatch")
+ #end
+ #if (!$isWatchedDoc)
+ #submenuitem("javascript:watchlist('adddocument')"
$msg.get("core.menu.watchlist.add.page"))
+ #else
+ #submenuitem("javascript:watchlist('removedocument')"
$msg.get("core.menu.watchlist.remove.page"))
+ #end
+ #submenuseparator()
+ #if (!$isWatchedSpace)
+ #submenuitem("javascript:watchlist('addspace')"
$msg.get("core.menu.watchlist.add.space"))
+ #else
+ #submenuitem("javascript:watchlist('removespace')"
$msg.get("core.menu.watchlist.remove.space"))
+ #end
+ #submenuseparator()
+ #submenuitem($docuser.getURL("view", "xpage=watchlist")
$msg.get("core.menu.watchlist.management"))
+ #xwikitopmenuentryend()
+ #end
#end
-#if (!$isWatchedDoc)
- #submenuitem("javascript:watchlist('adddocument')"
$msg.get("core.menu.watchlist.add.page"))
-#else
- #submenuitem("javascript:watchlist('removedocument')"
$msg.get("core.menu.watchlist.remove.page"))
-#end
-#submenuseparator()
-#if (!$isWatchedSpace)
- #submenuitem("javascript:watchlist('addspace')"
$msg.get("core.menu.watchlist.add.space"))
-#else
- #submenuitem("javascript:watchlist('removespace')"
$msg.get("core.menu.watchlist.remove.space"))
-#end
-#submenuseparator()
-#submenuitem($docuser.getURL("view", "xpage=watchlist")
$msg.get("core.menu.watchlist.management"))
-#xwikitopmenuentryend()
-#end
-#end
</div>
</div>
#end
\ No newline at end of file
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
