Fix filebrowser display

diff --git a/view/global.css b/view/global.css
index 3fb31a30cc15e7b54e15af75a31785b5134480fd..b8fe5723f2c3d78535243ed49ffce33cc8535b17 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -273,19 +273,19 @@ img.acpopup-img {
 
 /* plain text editor upload/select popup */
 
-.fbrowser .path a { padding: 5px; }
-.fbrowser .path a:before { content: "/"; padding-right: 5px;}
+.fbrowser .path a, .fbrowser .path .btn-link { padding: 5px; }
+.fbrowser .path a:before, .fbrowser .path .btn-link:before { content: "/"; padding-right: 5px;}
 .fbrowser .folders ul { list-style-type: none; padding-left: 10px;}
 .fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; }
 .fbrowser.image .photo-album-image-wrapper { float: left; }
-.fbrowser.image a img { height: 48px; }
-.fbrowser.image a p { display: none;}
+.fbrowser.image a img, .fbrowser.image .btn-link img { height: 48px; }
+.fbrowser.image a p, .fbrowser.image .btn-link p { display: none;}
 .fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; }
 .fbrowser.file img { display: inline; }
 .fbrowser.file p  { display: inline; white-space: nowrap; }
 .fbrowser .upload { clear: both; padding-top: 1em;}
 .fbrowser .error { background: #ffeeee; border: 1px solid #994444; color: #994444; padding: 0.5em;}
-.fbrowser .error a.close { float: right; font-weight: bold; }
+.fbrowser .error .close { float: right; font-weight: bold; }
 .fbrowser .error.hidden { display: none; }
 
 a {

diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js
index 6856d12ba28737202e34f115621190fe8fc6f1cf..c267de4c5d31e3e21f8f3fa1c000b5f051d8cd8b 100644 (file)
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -88,12 +88,12 @@ var FileBrowser = {
 \r
                console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );\r
 \r
-               $(".error a.close").on("click", function(e) {\r
+               $(".error .close").on("click", function(e) {\r
                        e.preventDefault();\r
                        $(".error").addClass("hidden");\r
                });\r
 \r
-               $(".folders a, .path a").on("click", function(e) {\r
+               $(".folders a, .path a, .folders button, .path button").on("click", function(e) {\r
                        e.preventDefault();\r
                        var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";\r
 \r

diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl
index 3fede8f7c913386ad45a7e1e6211d179edad1d42..3b0b24b5dfdb8cdf742b0fd9cef623a950e302f0 100644 (file)
--- a/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@@ -30,7 +30,7 @@
        <div class="list">
                {{foreach $files as $f}}
                <div class="photo-album-image-wrapper">
-                       <button type="button" class="btn btn-link" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+                       <button type="button" class="btn btn-link photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
                                <img src="{{$f.2}}">
                                <p>{{$f.1}}</p>
                        </button>