From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 26 Mar 2017 00:27:26 +0000 (-0400)
Subject: Merge branch 'develop' into improvement/frio-action-links-to-buttons
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d7f80bf7e7f90485f6713ae6968311c9748bbb95;p=friendica.git

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

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

d7f80bf7e7f90485f6713ae6968311c9748bbb95
diff --cc view/theme/frio/js/filebrowser.js
index c267de4c5d,a66309865d..d216c40f33
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@@ -88,19 -88,31 +88,30 @@@ var FileBrowser = 
  
  		console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );
  
+ 		// We need to add the AjaxUpload to the button
+ 		FileBrowser.uploadButtons();
+ 
 -		$(".error a.close").on("click", function(e) {
 +		$(".error .close").on("click", function(e) {
  			e.preventDefault();
  			$(".error").addClass("hidden");
  		});
  
- 		$(".folders a, .path a, .folders button, .path button").on("click", function(e) {
+ 		// Click on album link
 -		$(".fbrowser").on("click", ".folders a, .path a", function(e) {
++		$(".fbrowser").on("click", ".folders a, .path a, .folders button, .path button", function(e) {
  			e.preventDefault();
  			var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";
+ 			$(".fbrowser-content").hide();
+ 			$(".fbrowser .profile-rotator-wrapper").show();
  
  			// load new content to fbrowser window
- 			$(".fbrowser").load(url,function() {
- 				$(function() {FileBrowser.init(nickname, type, hash);});
+ 			$(".fbrowser").load(url, function(responseText, textStatus){
+ 				$(".profile-rotator-wrapper").hide();
+ 				if (textStatus === 'success') {
+ 					$(".fbrowser_content").show();
+ 					// We need to add the AjaxUpload to the button
+ 					FileBrowser.uploadButtons();
+ 				}
  			});
 -			
  		});
  
  		//embed on click
diff --cc view/theme/frio/templates/filebrowser.tpl
index 3b0b24b5df,1a1bd9a675..20227f8796
--- a/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>