Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory 
james.mmbase.org:/tmp/cvs-serv21317/cmsc/contentrepository/src/webapp/editors/recyclebin

Modified Files:
        contenttrash.jsp assettrash.jsp 
Log Message:
WOO-1291 index.jsp is needed in path for linking after delete or restore 


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/WOO-1291


Index: contenttrash.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- contenttrash.jsp    13 Jan 2009 05:54:03 -0000      1.3
+++ contenttrash.jsp    11 Feb 2009 13:55:01 -0000      1.4
@@ -86,11 +86,11 @@
                                        <thead>
                                           <tr>
                                              <th style="width: 56px;"></th>
-                                             <th style="width: 68px;"><a 
href="?sortBy=otype&direction=${direction}" class="headerlink"><fmt:message 
key="locate.typecolumn" /></a></th>
-                                             <th><a 
href="?sortBy=title&direction=${direction}" class="headerlink"><fmt:message 
key="locate.titlecolumn" /></a></th>
-                                             <th style="width: 50px;"><a 
href="?sortBy=creator&direction=${direction}" class="headerlink"><fmt:message 
key="locate.authorcolumn" /></a></th>
-                                             <th style="width: 120px;"><a 
href="?sortBy=lastmodifieddate&direction=${direction}" 
class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th>
-                                             <th style="width: 60px;"><a 
href="?sortBy=number&direction=${direction}" class="headerlink"><fmt:message 
key="locate.numbercolumn" /></a></th>
+                                             <th style="width: 68px;"><a 
href="contenttrash.jsp?sortBy=otype&direction=${direction}" 
class="headerlink"><fmt:message key="locate.typecolumn" /></a></th>
+                                             <th><a 
href="contenttrash.jsp?sortBy=title&direction=${direction}" 
class="headerlink"><fmt:message key="locate.titlecolumn" /></a></th>
+                                             <th style="width: 50px;"><a 
href="contenttrash.jsp?sortBy=creator&direction=${direction}" 
class="headerlink"><fmt:message key="locate.authorcolumn" /></a></th>
+                                             <th style="width: 120px;"><a 
href="contenttrash.jsp?sortBy=lastmodifieddate&direction=${direction}" 
class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th>
+                                             <th style="width: 60px;"><a 
href="contenttrash.jsp?sortBy=number&direction=${direction}" 
class="headerlink"><fmt:message key="locate.numbercolumn" /></a></th>
                                           </tr>
                                        </thead>
                                        <tbody class="hover">


Index: assettrash.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- assettrash.jsp      13 Jan 2009 05:54:03 -0000      1.5
+++ assettrash.jsp      11 Feb 2009 13:55:01 -0000      1.6
@@ -85,11 +85,11 @@
                                        <thead>
                                           <tr>
                                              <th style="width: 56px;"></th>
-                                             <th style="width: 68px;"><a 
href="?sortBy=otype&direction=${direction}" class="headerlink"><fmt:message 
key="locate.typecolumn" /></a></th>
-                                             <th><a 
href="?sortBy=title&direction=${direction}" class="headerlink"><fmt:message 
key="locate.titlecolumn" /></a></th>
-                                             <th style="width: 50px;"><a 
href="?sortBy=creator&direction=${direction}" class="headerlink"><fmt:message 
key="locate.authorcolumn" /></a></th>
-                                             <th style="width: 120px;"><a 
href="?sortBy=lastmodifieddate&direction=${direction}" 
class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th>
-                                             <th style="width: 60px;"><a 
href="?sortBy=number&direction=${direction}" class="headerlink"><fmt:message 
key="locate.numbercolumn" /></a></th>
+                                             <th style="width: 68px;"><a 
href="assettrash.jsp?sortBy=otype&direction=${direction}" 
class="headerlink"><fmt:message key="locate.typecolumn" /></a></th>
+                                             <th><a 
href="assettrash.jsp?sortBy=title&direction=${direction}" 
class="headerlink"><fmt:message key="locate.titlecolumn" /></a></th>
+                                             <th style="width: 50px;"><a 
href="assettrash.jsp?sortBy=creator&direction=${direction}" 
class="headerlink"><fmt:message key="locate.authorcolumn" /></a></th>
+                                             <th style="width: 120px;"><a 
href="assettrash.jsp?sortBy=lastmodifieddate&direction=${direction}" 
class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th>
+                                             <th style="width: 60px;"><a 
href="assettrash.jsp?sortBy=number&direction=${direction}" 
class="headerlink"><fmt:message key="locate.numbercolumn" /></a></th>
                                           </tr>
                                        </thead>
                                        <tbody class="hover">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to