Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv4896/src/webapp/editors/repository
Modified Files:
assetsearch.jsp contentsearch.jsp search.js
Log Message:
CMSC-1126 using Assets in contentElements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: assetsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- assetsearch.jsp 2 Dec 2008 02:40:21 -0000 1.2
+++ assetsearch.jsp 2 Dec 2008 03:46:28 -0000 1.3
@@ -59,14 +59,14 @@
<div class="${assettypes == 'content'?'tab_active':'tab'}">
<div class="body">
<div>
- <a href="SearchInitAction.do"><fmt:message key="content.title"
/></a>
+ <a href="SearchInitAction.do"><fmt:message
key="content.search.title" /></a>
</div>
</div>
</div>
<div class="${(assettypes == 'assetelement' || assettypes ==
null)?'tab_active':'tab'}">
<div class="body">
<div>
- <a href="AssetSearchInitAction.do"><fmt:message
key="asset.title"/></a>
+ <a href="AssetSearchInitAction.do"><fmt:message
key="asset.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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- contentsearch.jsp 2 Dec 2008 02:40:21 -0000 1.2
+++ contentsearch.jsp 2 Dec 2008 03:46:28 -0000 1.3
@@ -36,14 +36,14 @@
<div class="${(contenttypes == 'contentelement' || contenttypes ==
null)?'tab_active':'tab'}">
<div class="body">
<div>
- <a href="SearchInitAction.do"><fmt:message
key="content.title"/></a>
+ <a href="SearchInitAction.do"><fmt:message
key="content.search.title"/></a>
</div>
</div>
</div>
<div class="${contenttypes == 'asset'?'tab_active':'tab'}">
<div class="body">
<div>
- <a href="AssetSearchInitAction.do"><fmt:message key="asset.title"
/></a>
+ <a href="AssetSearchInitAction.do"><fmt:message
key="asset.search.title" /></a>
</div>
</div>
</div>
Index: search.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/search.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- search.js 24 Sep 2008 06:06:33 -0000 1.6
+++ search.js 2 Dec 2008 03:46:28 -0000 1.7
@@ -60,3 +60,15 @@
window.top.opener.selectElement(element, title, url, width, height,
description);
window.top.close();
}
\ No newline at end of file
+
+function selectAssettype(initUrl) {
+ // parentchannel is only there when linking is active...
+ try {
+ document.forms[0].parentchannel.value='';
+ } catch (e) {
+ ;
+ }
+ // This doesn't work in IE...
+ // document.forms[0].action=initUrl;
+ document.forms[0].submit();
+ }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
