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

[<fg...@us...>]

Revision: 3388
          http://openutils.svn.sourceforge.net/openutils/?rev=3388&view=rev
Author:   fgiust
Date:     2011-03-13 14:05:35 +0000 (Sun, 13 Mar 2011)

Log Message:
-----------
MEDIA-184 cleaning up search filters when changing the active folder

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
    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/icons_readme.txt

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	2011-03-13 13:32:27 UTC (rev 3387)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java	2011-03-13 14:05:35 UTC (rev 3388)
@@ -36,7 +36,6 @@
 
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 
 import org.apache.commons.lang.StringUtils;
@@ -235,11 +234,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));
+        // 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));
     }
 
     /**

Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt	2011-03-13 14:05:35 UTC (rev 3388)
@@ -0,0 +1,5 @@
+You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
+http://led24.de/iconset/ or http://led24.de/ would be appreciated.
+
+Follow us on twitter http://twitter.com/gasyoun or email le...@gm...
+512 icons 20/05/2009
\ No newline at end of file


Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icons_readme.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

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	2011-03-13 13:32:27 UTC (rev 3387)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2011-03-13 14:05:35 UTC (rev 3388)
@@ -234,8 +234,14 @@
 
   var url = frames['mediaFolderView'].location.pathname;
   
-  var querystring = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+  var querystringoriginal = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+   
+  var querystring = {};
   
+  if (!querystringoriginal['search']){
+    querystring = querystringoriginal;
+  }
+  
   if (isbrowse || url == "") {
     url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html";
   }


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