summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2013-08-03 17:15:09 +0200
committerChristopher Smith <chris@jalakai.co.uk>2013-08-03 17:15:09 +0200
commit89274c0d2b04d8f0524cc37fa18bdd4cc592294a (patch)
treebc15fb55ef8b4557ffb931195a3484df0d758e7c
parent354c39ffc9aa3bbd7d59d5e182a36d1f390c5b7e (diff)
downloadrpg-89274c0d2b04d8f0524cc37fa18bdd4cc592294a.tar.gz
rpg-89274c0d2b04d8f0524cc37fa18bdd4cc592294a.tar.bz2
move the media search formlet up
Currently the search box is below the media file list, where it is effectively inaccessible in a namespace with lots of files. This change moves the search box above the media file list and below the upload form.
-rw-r--r--inc/media.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/inc/media.php b/inc/media.php
index c4378fe9e..a182ecb33 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -586,7 +586,10 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
// FIXME: print permission warning here instead?
echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
}else{
- if (!$fullscreenview) media_uploadform($ns, $auth);
+ if (!$fullscreenview) {
+ media_uploadform($ns, $auth);
+ media_searchform($ns);
+ }
$dir = utf8_encodeFN(str_replace(':','/',$ns));
$data = array();
@@ -609,7 +612,6 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
if ($fullscreenview) echo '</ul>'.NL;
}
}
- if (!$fullscreenview) media_searchform($ns);
}
/**