From bc8594bd030c9e2eed4b19148b41be6270e6924f Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Tue, 30 Aug 2016 15:17:40 +0800
Subject: [PATCH] MDL-55805 theme_noname: File manager/picker layout
 adjustments

Part of MDL-55071
---
 theme/noname/scss/moodle/core.scss            |  3 +
 theme/noname/scss/moodle/filemanager.scss     | 57 +++----------------
 .../core/filemanager_fileselect.mustache      | 12 ++--
 .../filemanager_modal_generallayout.mustache  |  2 +-
 .../core/filemanager_selectlayout.mustache    |  2 +-
 5 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/theme/noname/scss/moodle/core.scss b/theme/noname/scss/moodle/core.scss
index 1e89938ffe1d3..ddc567d168d2e 100644
--- a/theme/noname/scss/moodle/core.scss
+++ b/theme/noname/scss/moodle/core.scss
@@ -1158,6 +1158,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
 .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft {
     @extend .modal-footer;
 }
+.moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft:empty {
+    display: none;
+}
 .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft.yui3-widget-ft {
     // Undo some YUI damage.
     background: initial;
diff --git a/theme/noname/scss/moodle/filemanager.scss b/theme/noname/scss/moodle/filemanager.scss
index 4dad0f3617d6d..8b3efa9a9d54d 100644
--- a/theme/noname/scss/moodle/filemanager.scss
+++ b/theme/noname/scss/moodle/filemanager.scss
@@ -29,9 +29,10 @@
 .file-picker .fp-navbar {
     border-bottom: 1px solid #e5e5e5;
     min-height: 40px;
+    padding: 4px;
 }
-
 .file-picker .fp-content {
+    border-top: 0;
     background: #FFFFFF;
     clear: none;
     overflow: auto;
@@ -89,51 +90,14 @@
     vertical-align: -15%;
     margin-right: 5px;
 }
-.fp-viewbaffr {
-    float: right;
-    height: 30px;
-    border: 1px solid #CCC;
-    border-bottom: 1px solid #B3B3B3;
-    border-radius: 4px;
-    background: white;
-}
-.fp-repo-items fp-viewbar {
-    margin: 4px;
-}
-.fp-viddewbar a {
-    width: 30px;
-    height: 30px;
-    border-right: 1px solid #CCC;
-    display: block;
-    float:left;
-}
-.fp-viddewbar a.checked:hover,
-.fp-viddewbar a:hover {
-    background-image: radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%);
-    background-color: #ebebeb;
-}
 
-.fp-viddewbar a.checked,
-.fp-vieddwbar a:active {
-    background-image: radial-gradient(ellipse at center, #ffffff 40%,#dfdfdf 100%);
-    background-color: #dfdfdf;
+.fp-viewbar:not(.disabled) a.checked {
+    @extend .btn-secondary.active;
 }
 
-.fp-viewddbar a.fp-vb-icons {
-    border-radius: 4px 0 0 4px;
-}
-.fp-vieddwbar a.fp-vb-tree {
-    border-right: 0;
-    border-radius: 0 4px 4px 0;
-}
-.fp-vieddwbar a img {
-    margin: 7px;
-}
-
-.fp-viewddbar.disabled a {
-    opacity: .45;
-    background: none;
-    cursor: default;
+.fp-viewbar.disabled a {
+    @extend .btn.disabled;
+    @extend .btn-secondary.disabled;
 }
 
 .file-picker .fp-clear-left {
@@ -435,9 +399,6 @@ a.ygtvspacer:hover {
     padding-top: 50px;
 }
 // Select Dialogue (File Picker and File Manager)
-.fp-select form {
-    padding: 20px 20px 0;
-}
 .fp-select .fp-select-loading {
     text-align: center;
     margin-top: 20px;
@@ -455,9 +416,7 @@ a.ygtvspacer:hover {
     float: right;
 }
 .fp-select .fp-info {
-    display: block;
-    clear: both;
-    padding: 1px 20px 0;
+    font-size: $font-size-xs
 }
 .fp-select .fp-thumbnail {
     float: left;
diff --git a/theme/noname/templates/core/filemanager_fileselect.mustache b/theme/noname/templates/core/filemanager_fileselect.mustache
index 75402a839d485..bd65dc7d1f22f 100644
--- a/theme/noname/templates/core/filemanager_fileselect.mustache
+++ b/theme/noname/templates/core/filemanager_fileselect.mustache
@@ -2,14 +2,14 @@
     <div class="fp-select-loading">
         {{#pix}}i/loading_small{{/pix}}
     </div>
-    <form class="form">
+    <form class="form clearfix">
         <div class="form-group">
             <button class="fp-file-download btn btn-secondary">{{#str}}download{{/str}}</button>
-            <button class="fp-file-delete btn-secondary">{{#str}}delete{{/str}}</button>
-            <button class="fp-file-setmain btn-secondary">{{#str}}setmainfile, repository{{/str}}</button>
-            <span class="fp-file-setmain-help btn-secondary">{{helpicon}}</span>
-            <button class="fp-file-zip btn-secondary">{{#str}}zip, editor{{/str}}</button>
-            <button class="fp-file-unzip btn-secondary">{{#str}}unzip{{/str}}</button>
+            <button class="fp-file-delete btn btn-secondary">{{#str}}delete{{/str}}</button>
+            <button class="fp-file-setmain btn btn-secondary">{{#str}}setmainfile, repository{{/str}}</button>
+            <span class="fp-file-setmain-help btn btn-secondary">{{helpicon}}</span>
+            <button class="fp-file-zip btn btn-secondary">{{#str}}zip, editor{{/str}}</button>
+            <button class="fp-file-unzip btn btn-secondary">{{#str}}unzip{{/str}}</button>
         </div>
 
                 <div class="fp-saveas form-group row">
diff --git a/theme/noname/templates/core/filemanager_modal_generallayout.mustache b/theme/noname/templates/core/filemanager_modal_generallayout.mustache
index 6e40449d86ef9..6eca8704d52ef 100644
--- a/theme/noname/templates/core/filemanager_modal_generallayout.mustache
+++ b/theme/noname/templates/core/filemanager_modal_generallayout.mustache
@@ -7,7 +7,7 @@
     </div>
     <div class="col-md-9">
         <div class="fp-repo-items" tabindex="0">
-            <div class="fp-navbar bg-faded p-x-1 card">
+            <div class="fp-navbar bg-faded card m-b-0 clearfix">
                 <div>
                     <div class="fp-toolbar">
                         <div class="fp-tb-back">
diff --git a/theme/noname/templates/core/filemanager_selectlayout.mustache b/theme/noname/templates/core/filemanager_selectlayout.mustache
index 60c95810c2dda..31b251db3161f 100644
--- a/theme/noname/templates/core/filemanager_selectlayout.mustache
+++ b/theme/noname/templates/core/filemanager_selectlayout.mustache
@@ -3,7 +3,7 @@
         <span class="sr-only">{{#str}}loadinghelp{{/str}}</span>
         {{#pix}}i/loading_small{{/pix}}
     </div>
-    <form class="form">
+    <form class="form clearfix">
         <div class="fp-forminset">
                 <div class="fp-linktype-2 form-group">
                     <label class="form-control-label control-radio">{{#str}}makefileinternal, repository{{/str}}</label>