Implements issue #168 and fix test suite...

collective · Apr 26, 2013 · 64cd83b · 64cd83b
1 parent 99d5966
commit 64cd83b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/collective/cover/browser/contentchooser_templates/content_contentchooser.pt b/src/collective/cover/browser/contentchooser_templates/content_contentchooser.pt
@@ -7,10 +7,10 @@
       tal:omit-tag="">
 <body tal:omit-tag="">
 
-<div id="contentchooser-content-search" class="right  ui-widget-content">
-
-    <div class="close" i18n:translate="">X</div>
-
+<div id="contentchooser-content-search" class="right ui-widget-content">
+	<div class="close">
+		<a href="#" class="hiddenStructure" title="Close this box">Close this box.</a>
+	</div>
     <ul class="formTabs">
       <li class="formTab"><a href="#recent" i18n:translate="">Recent items</a></li>
       <li class="formTab"><a href="#content-tree" i18n:translate="">Content tree</a></li>

diff --git a/src/collective/cover/static/contentchooser.css b/src/collective/cover/static/contentchooser.css
@@ -51,12 +51,13 @@
 }
 
 #contentchooser-content-search .close {
+    background-image: url("++resource++plone.app.jquerytools.pb_close.png");
     cursor: pointer;
-    font-size: 12px;
-    padding: 5px;
+    height: 30px;
+    left: -14px;
     position: absolute;
-    right: 0;
-    top: 0;
+    top: -14px;
+    width: 30px;
 }
 
 .current {

diff --git a/src/collective/cover/static/contentchooser.js b/src/collective/cover/static/contentchooser.js
@@ -80,7 +80,13 @@ $(function() {
 		return false;
 	});
 
-    if($("#contentchooser-content-search").length) {
+	$("#content-trees .contentchooser-clear").live("click", function(e){
+		$(e.currentTarget).prev().children("input").val("");
+		coveractions.getFolderContents(portal_url, '@@jsonbytype');
+		return false;
+	});
+
+	if($("#contentchooser-content-search").length) {
         var content_name = $("#contentchooser-content-search-compose-button").text();
         $("#content").prepend("<div class='btn' id='contentchooser-content-show-button'>"+content_name+"</div>");