diff --git a/view/global.css b/view/global.css index 3fb31a30c..b8fe5723f 100644 --- 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 6856d12ba..c267de4c5 100644 --- a/view/theme/frio/js/filebrowser.js +++ b/view/theme/frio/js/filebrowser.js @@ -88,12 +88,12 @@ var FileBrowser = { console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id ); - $(".error a.close").on("click", function(e) { + $(".error .close").on("click", function(e) { e.preventDefault(); $(".error").addClass("hidden"); }); - $(".folders a, .path a").on("click", function(e) { + $(".folders a, .path a, .folders button, .path button").on("click", function(e) { e.preventDefault(); var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none"; diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl index 3fede8f7c..3b0b24b5d 100644 --- a/view/theme/frio/templates/filebrowser.tpl +++ b/view/theme/frio/templates/filebrowser.tpl @@ -30,7 +30,7 @@
{{foreach $files as $f}}
-