Scarab commit: svn commit: r11040 - trunk/src/webapp/WEB-INF/templates: layouts screens viewIssue
[email protected] Fri, 11 Nov 2011 11:51:14 -0800 (PST)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2011-11-11 11:51:14-0800
New Revision: 11040
Modified:
trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm
Log:
temporary disable Feeds. Due to an incompatible development in Turbine the entire detection of the Rss-feed code is broken. This needs further investigation, maybe complete re implementation of the feeds system ?
Modified: trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/layouts/Default.vm?view=diff&pathrev=11040&r1=11039&r2=11040
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/layouts/Default.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/layouts/Default.vm 2011-11-11 11:51:14-0800
@@ -23,6 +23,7 @@
<script src="$staticLink.setPath("/scripts/sstree.js")"></script>
<script src="$staticLink.setPath("/scripts/tooltips.js")"></script>
<script src="$staticLink.setPath("/scripts/guiUtils.js")"></script>
+ <script src="$staticLink.setPath("/scripts/jquery.js")"></script>
<script language="Javascript" id="js1">
var calPopup = new CalendarPopup("datePopupDiv");
@@ -62,12 +63,11 @@
function initializeAll() {
#if ($hide_bars)
- setLeftcolAndBanner()
+ setLeftcolAndBanner();
#end
#if ($autoresize)
- initialRows()
+ initialRows();
#end
- initializeTreeview();
observer.subscribe(conditions_observer);
## Add your own observers below
@@ -81,6 +81,7 @@
## data[4] = display (DisplayName)
##
+ initializeTreeview();
}
@@ -112,7 +113,7 @@
// Helper array contains all RequiredMarkup elements
// which have already been visited form the current call of
// the conditions_observer. It is needed to correctly
- // set the visibility of all visited markers.
+ // set the display mode (inline/none) of all visited markers.
var visitedMarkers = {};
@@ -124,8 +125,10 @@
{
if(data[0] == "treeview")
{
- attributeName = data[1];
- displayValue = data[4];
+ var attributeName = data[1];
+ var displayValue = data[4];
+
+ //alert(data[1] + "=" + data[4]);
#if ($currentIssue)
#set ($indent=12)
@@ -144,22 +147,23 @@
*/
function setMarkerValueIf(condAttName, isRequired)
{
- cid = "conditional:"+condAttName;
- element = getElementByIdCompatible(cid);
+ var cid = "conditional:"+condAttName;
+ var element = getElementByIdCompatible(cid);
if (element != null)
{
if(isRequired)
{
- visitedMarkers[condAttName] = "visible";
+ visitedMarkers[condAttName] = "inline";
}
else
{
if (visitedMarkers[condAttName]==null)
{
- visitedMarkers[condAttName] = "hidden";
+ visitedMarkers[condAttName] = "none";
}
}
- element.style.visibility = visitedMarkers[condAttName];
+ //alert ("Set " + cid + " to " + visitedMarkers[condAttName] );
+ element.style.display = visitedMarkers[condAttName];
}
}
@@ -167,7 +171,10 @@
</head>
-
+#set ($view = $data.Parameters.get("view") )
+#if ($view && $view.length()>0)
+ $renderer.render("views/$view/layouts", "Default.vm")
+#else
################################################################
## Top row
################################################################
@@ -412,5 +419,5 @@
#end
</body>
-
-</html>
\ No newline at end of file
+#end
+</html>
Modified: trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm?view=diff&pathrev=11040&r1=11039&r2=11040
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm 2011-11-11 11:51:14-0800
@@ -1,4 +1,4 @@
-#* SCB2537: Feeds for queries are currently not supported.
+#* SCB2537: Feeds are currently not supported.
#if ($scarabR.Query.QueryId)
<link rel="alternate" type="application/rss+xml" title="RSS" href="$link.setPage('Index.vm')/action/Search/go/$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/rss_2.0">
<link rel="alternate" type="application/rss+xml" title="ATOM" href="$link.setPage('Index.vm')/action/Search/go/$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/atom_0.3">
@@ -30,7 +30,7 @@
#end
</td>
-#* SCB2537: Feeds for queries are currently not supported.
+#* SCB2537: Feeds are currently not supported.
#if ($scarabR.Query.QueryId)
<td align="right" nowrap="1">
<a style="align:right;" title="$l10n.SearchRSSFeed"
Modified: trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm?view=diff&pathrev=11040&r1=11039&r2=11040
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm 2011-11-11 11:51:14-0800
@@ -5,10 +5,14 @@
## ยท hasDeletePermission: true if the user has permission to delete issues in this modue.
##
##
+
+#* SCB2537: Feeds are currently not supported.
<link rel="alternate" type="application/rss+xml" title="RSS"
href="$link.setPage('RSSDataExport.vm')/feedType/IssueFeed/issueId/$currentIssue.UniqueId/type/rss_2.0">
<link rel="alternate" type="application/rss+xml" title="ATOM"
href="$link.setPage('RSSDataExport.vm')/feedType/IssueFeed/issueId/$currentIssue.UniqueId/type/atom_0.3">
+*#
+
#set ($currentIssueId = $data.Parameters.getString("id"))
#set ($currentIssue = $scarabR.getIssue($currentIssueId))
#set ($numUsers = $currentIssue.getAssociatedUsers().size())
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm?view=diff&pathrev=11040&r1=11039&r2=11040
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueBody.vm 2011-11-11 11:51:14-0800
@@ -369,6 +369,8 @@
</span>
#end
#end
+
+ #* SCB2537: Feeds are currently not supported.
<span style="color:white; position:relative; top:-5px; margin-left:5px; margin-right:2px;">
<a style="align:right;color:white" title="$l10n.IssueRSSFeed"
href="$link.setPage('RSSDataExport.vm')/feedType/IssueFeed/issueId/$currentIssue.UniqueId/type/rss_2.0"><img align="middle" src="$staticLink.setPath('/images/icon_rss.gif')" border="0"/></a>
@@ -377,6 +379,8 @@
<a style="align:right;color:white" title="$l10n.IssueATOMFeed"
href="$link.setPage('RSSDataExport.vm')/feedType/IssueFeed/issueId/$currentIssue.UniqueId/type/atom_0.3"><img align="middle" src="$staticLink.setPath('/images/icon_atom.gif')" border="0"/></a>
</span>
+ *#
+
<span style="color:white; position:relative; top:-5px; margin-right:0px;" >
<a style="align:right;color:white" title="$l10n.BookmarkToThisIssue"
href="$link.getIssueIdAbsoluteLink($currentIssue)"><img align="middle" src="$staticLink.setPath('/images/icon_url.gif')" alt="$l10n.SessionInfoLink $currentIssue.UniqueId" border="0"/></a>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2877326