Merge branch 'develop' into improvement/frio-action-links-to-buttons

# Conflicts:
#	view/theme/frio/js/filebrowser.js
#	view/theme/frio/templates/filebrowser.tpl

diff --cc view/theme/frio/css/style.css
Simple merge

diff --cc view/theme/frio/js/filebrowser.js
index c267de4c5d31e3e21f8f3fa1c000b5f051d8cd8b,a66309865dc10e6a243bc2af97f33424e748bf3f..d216c40f33ba94558cde5d3e4ed14ce408d0a2a3
--- 1/view/theme/frio/js/filebrowser.js
--- 2/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@@ -88,19 -88,31 +88,30 @@@ var FileBrowser = 
  \r
                console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );\r
  \r
 -              $(".error a.close").on("click", function(e) {\r
+               // We need to add the AjaxUpload to the button\r
+               FileBrowser.uploadButtons();\r
+ \r
 +              $(".error .close").on("click", function(e) {\r
                        e.preventDefault();\r
                        $(".error").addClass("hidden");\r
                });\r
  \r
-               $(".folders a, .path a, .folders button, .path button").on("click", function(e) {\r
+               // Click on album link\r
 -              $(".fbrowser").on("click", ".folders a, .path a", function(e) {\r
++              $(".fbrowser").on("click", ".folders a, .path a, .folders button, .path button", function(e) {\r
                        e.preventDefault();\r
                        var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";\r
+                       $(".fbrowser-content").hide();\r
+                       $(".fbrowser .profile-rotator-wrapper").show();\r
  \r
                        // load new content to fbrowser window\r
-                       $(".fbrowser").load(url,function() {\r
-                               $(function() {FileBrowser.init(nickname, type, hash);});\r
+                       $(".fbrowser").load(url, function(responseText, textStatus){\r
+                               $(".profile-rotator-wrapper").hide();\r
+                               if (textStatus === 'success') {\r
+                                       $(".fbrowser_content").show();\r
+                                       // We need to add the AjaxUpload to the button\r
+                                       FileBrowser.uploadButtons();\r
+                               }\r
                        });\r
 -                      \r
                });\r
  \r
                //embed on click\r

diff --cc view/theme/frio/templates/filebrowser.tpl
index 3b0b24b5dfdb8cdf742b0fd9cef623a950e302f0,1a1bd9a6759aedb6a016937f6d08b18981cdac5c..20227f87965edda0ce0c1c44bd493b1f5292f8f2
--- 1/view/theme/frio/templates/filebrowser.tpl
--- 2/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@@@ -8,37 -8,42 +8,42 @@@
  {{*<script type="text/javascript" src="view/theme/frio/js/filebrowser.js"></script>*}}
  
  <div class="fbrowser {{$type}}">
-       <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
-       <input id="fb-type" type="hidden" name="type" value="{{$type}}" />
+       <div class="fbrowser-content">
+               <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
+               <input id="fb-type" type="hidden" name="type" value="{{$type}}" />
  
-       <div class="error hidden">
-               <span></span> <button type="button" class="btn btn-link" class="close">X</a>
-       </div>
 -              <div class="error hidden">
 -                      <span></span> <a href="#" class='close'>X</a>
 -              </div>
++        <div class="error hidden">
++            <span></span> <button type="button" class="btn btn-link" class="close">X</a>
++        </div>
  
-       <div class="path">
-               {{foreach $path as $p}}<button type="button" class="btn-link" data-folder="{{$p.0}}">{{$p.1}}</button>{{/foreach}}
-       </div>
 -              <div class="path">
 -                      {{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
 -              </div>
++        <div class="path">
++            {{foreach $path as $p}}<button type="button" class="btn-link" data-folder="{{$p.0}}">{{$p.1}}</button>{{/foreach}}
++        </div>
  
-       {{if $folders }}
-       <div class="folders">
-               <ul>
-                       {{foreach $folders as $f}}<li><button type="button" class="btn-link" data-folder="{{$f.0}}">{{$f.1}}</button></li>{{/foreach}}
-               </ul>
-       </div>
-       {{/if}}
 -              {{if $folders }}
 -              <div class="folders">
 -                      <ul>
 -                              {{foreach $folders as $f}}<li><a href="#" data-folder="{{$f.0}}">{{$f.1}}</a></li>{{/foreach}}
 -                      </ul>
 -              </div>
 -              {{/if}}
++        {{if $folders }}
++        <div class="folders">
++            <ul>
++                {{foreach $folders as $f}}<li><button type="button" class="btn-link" data-folder="{{$f.0}}">{{$f.1}}</button></li>{{/foreach}}
++            </ul>
++        </div>
++        {{/if}}
  
-       <div class="list">
-               {{foreach $files as $f}}
-               <div class="photo-album-image-wrapper">
-                       <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>
 -              <div class="list">
 -                      {{foreach $files as $f}}
 -                      <div class="photo-album-image-wrapper">
 -                              <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
 -                                      <img src="{{$f.2}}">
 -                                      <p>{{$f.1}}</p>
 -                              </a>
++        <div class="list">
++            {{foreach $files as $f}}
++            <div class="photo-album-image-wrapper">
++                <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>
+                       </div>
+                       {{/foreach}}
                </div>
-               {{/foreach}}
-       </div>
  
-       <div class="upload">
-               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
+               <div class="upload">
+                       <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
+               </div>
+       </div>
+       <div class="profile-rotator-wrapper" style="display: none;">
+               <i class="fa fa-circle-o-notch fa-spin"></i>
        </div>
  </div>