[Openutils-svn] SF.net SVN: openutils:[1299] trunk/openutils-mgnlmedia/src/main

[<mol...@us...>]

Revision: 1299
          http://openutils.svn.sourceforge.net/openutils/?rev=1299&view=rev
Author:   molaschi
Date:     2009-08-24 14:54:40 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
improve search by putting search button in function bar. clicking the button will bring up a modal dialog for text sentence input

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
    trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_en.properties
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_it.properties
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html

Added Paths:
-----------
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search24.gif

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java	2009-08-24 14:52:59 UTC (rev 1298)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java	2009-08-24 14:54:40 UTC (rev 1299)
@@ -231,6 +231,11 @@
     public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
     {
         tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
+        ContextMenuItem search = new ContextMenuItem("search");
+        search.setLabel(getMessages().get("media.menu.search"));
+        search.setIcon(request.getContextPath() + "/.resources/icons/24/view.gif");
+        search.setOnclick("parent.search()");
+        tree.addFunctionBarItem(new FunctionBarItem(search));
     }
 
     /**

Modified: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl	2009-08-24 14:52:59 UTC (rev 1298)
+++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl	2009-08-24 14:54:40 UTC (rev 1299)
@@ -20,12 +20,12 @@
 <#if menu?exists && (menu.menuItems?size >0)>
     ${menu.html}
 </#if>
-
-<#if tree.browseMode && selectMedia?exists && selectMedia>
+<!-- 
+<#if selectMedia?exists && selectMedia>
     <#include "MediaTreeAddress.ftl"/>
 </#if>
-
-<#if tree.browseMode && (!selectMedia?exists || !selectMedia)>
+ -->
+<#if tree.browseMode>
     <#include "TreeAddressBar.ftl"/>
 </#if>
 

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_en.properties	2009-08-24 14:52:59 UTC (rev 1298)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_en.properties	2009-08-24 14:54:40 UTC (rev 1299)
@@ -93,4 +93,5 @@
 
 media.menu.title=Media
 media.menu.browse=Browse
-media.menu.search=Search
\ No newline at end of file
+media.menu.search=Search
+media.menu.search.results=Results for: 
\ No newline at end of file

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_it.properties	2009-08-24 14:52:59 UTC (rev 1298)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_it.properties	2009-08-24 14:54:40 UTC (rev 1299)
@@ -94,4 +94,5 @@
 
 media.menu.title=Media
 media.menu.browse=Naviga
-media.menu.search=Cerca
\ No newline at end of file
+media.menu.search=Cerca
+media.menu.search.results=Risultati per:
\ No newline at end of file

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search24.gif
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search24.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2009-08-24 14:52:59 UTC (rev 1298)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2009-08-24 14:54:40 UTC (rev 1299)
@@ -15,6 +15,7 @@
 var openPath = "${this.openPath!''}";
 var actMediaHandle = "${this.actMediaHandle!''}";
 var mediaType = "${this.mediaType!''}"; // get tree url
+
 function getTreeUrl() {
   var url = "${this.request.contextPath}/.magnolia/trees/media.html?mgnlCK=" + (new Date()).getTime();
   if (selectMedia)
@@ -29,7 +30,16 @@
   return url;
 }
 
-function search(textToSearch) {
+function search() {
+  Ext.Msg.prompt('${this.msgs.get('media.menu.search')}', '${this.msgs.get('media.menu.search')}', function(btn, text){
+    if (btn == 'ok'){
+      searchForMedia(text);
+    }
+  });
+}
+
+function searchForMedia(textToSearch){
+
   viewport.getComponent('center-panel').setTitle("Search results for : "+ textToSearch);
 
   var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?search="+ textToSearch + "&mgnlCK=" + (new Date()).getTime();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.