Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv4645
Modified Files:
assetsearch.jsp contentsearch.jsp
Log Message:
CMSC-681 Asset Maintenance code refacted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: assetsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- assetsearch.jsp 25 Dec 2008 05:40:55 -0000 1.10
+++ assetsearch.jsp 26 Dec 2008 07:09:44 -0000 1.11
@@ -58,7 +58,7 @@
<div class="tab">
<div class="body">
<div>
- <a href="SearchInitAction.do"><fmt:message
key="content.search.title" /></a>
+ <a href="SearchInitAction.do?index=yes"><fmt:message
key="content.search.title" /></a>
</div>
</div>
</div>
Index: contentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- contentsearch.jsp 25 Dec 2008 08:40:34 -0000 1.6
+++ contentsearch.jsp 26 Dec 2008 07:09:44 -0000 1.7
@@ -30,17 +30,16 @@
<mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer">0</mm:import>
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
-
<div class="tabs">
+<c:if test="${param.index eq 'yes'}">
<!-- active TAB -->
<div class="${(contenttypes == 'contentelement' || contenttypes ==
null)?'tab_active':'tab'}">
<div class="body">
<div>
- <a href="SearchInitAction.do"><fmt:message
key="content.search.title"/></a>
+ <a href="SearchInitAction.do?index=yes"><fmt:message
key="content.search.title"/></a>
</div>
</div>
</div>
-<c:if test="${param.index eq 'yes'}">
<div class="${contenttypes == 'asset'?'tab_active':'tab'}">
<div class="body">
<div>
@@ -49,6 +48,16 @@
</div>
</div>
</c:if>
+<c:if test="${empty param.index}">
+ <div class="tabs">
+ <div class="${(contenttypes == 'contentelement' || contenttypes ==
null)?'tab_active':'tab'}">
+ <div class="body">
+ <div>
+ <a href="SearchInitAction.do"><fmt:message
key="content.search.title"/></a>
+ </div>
+ </div>
+ </div>
+</c:if>
</div>
<div class="editor">
<br />
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
