media-manager fixes

4 files changed, 15 insertions, 5 deletions

diff --git a/inc/html.php b/inc/html.php
index 59b4cb6a9..df28a2096 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -476,7 +476,7 @@ function html_revisions($first=0, $media_id = false){
         $form->addElement('<img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt="" />');
 
         if (!$media_id) $href = wl($id);
-        else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view'));
+        else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view'), '&');
         $form->addElement(form_makeOpenTag('a', array(
                         'class' => 'wikilink1',
                         'href'  => $href)));
@@ -536,7 +536,7 @@ function html_revisions($first=0, $media_id = false){
 
         if($exists){
             if (!$media_id) $href = wl($id,"rev=$rev,do=diff", false, '&');
-            else $href = media_managerURL(array('image' => $id, 'rev' => $rev, 'mediado' => 'diff'));
+            else $href = media_managerURL(array('image' => $id, 'rev' => $rev, 'mediado' => 'diff'), '&');
             $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'diff_link')));
             $form->addElement(form_makeTag('img', array(
                             'src'    => DOKU_BASE.'lib/images/diff.png',
@@ -546,7 +546,7 @@ function html_revisions($first=0, $media_id = false){
                             'alt'    => $lang['diff'])));
             $form->addElement(form_makeCloseTag('a'));
             if (!$media_id) $href = wl($id,"rev=$rev",false,'&');
-            else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev));
+            else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev), '&');
             $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'wikilink1')));
             $form->addElement($id);
             $form->addElement(form_makeCloseTag('a'));
diff --git a/inc/media.php b/inc/media.php
index ced88f82a..341692f5f 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -621,10 +621,11 @@ function media_tabs_details($image, $selected=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_tab_files_options(){
+function media_tab_files_options($ns){
     global $lang;
 
     echo '<div class="background-container">';
+    echo $ns;
     echo '<div id="mediamanager__tabs_list" style="display: inline;">';
     echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'"
         rel=".mediamanager-files-thumbnails-tab" class="mediamanager-link-thumbnails">'.
@@ -650,7 +651,7 @@ function media_tab_files($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    media_tab_files_options();
+    media_tab_files_options($ns);
 
     echo '<div class="scroll-container" >';
     $view = $_REQUEST['view'];
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 8c68fa569..f261bd2d5 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -340,6 +340,10 @@
             if ($link.hasClass('idx_dir')) {
                 //changing namespace
                 jQuery('#mediamanager__layout_detail').empty();
+                jQuery('#media__tree .selected').each(function(){
+                    $(this).removeClass('selected');
+                });
+                $link.addClass('selected');
             }
 
             jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 88e00d8fc..eea62ea46 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -232,6 +232,7 @@ form.meta textarea.edit {
     padding: 2px;
     vertical-align: top;
     zoom: 1;
+    color: black !important;
 }
 * html .mediamanager-table-50 li {
     display: inline;
@@ -239,4 +240,8 @@ form.meta textarea.edit {
 
 .mediamanager-preview {
     margin-bottom: 5px;
+}
+
+.idx .selected {
+    color: red !important;
 }
\ No newline at end of file