strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into rewrites/coding-convention-split2

Browse source
This commit is contained in:
Roland Häder 2017-04-01 22:16:08 +02:00 • committed by GitHub
commit 49527b70d3
93 changed files with 11433 additions and 33261 deletions
Download patch file Download diff file Expand all files Collapse all files

12
view/theme/frio/css/style.css
View file

@ -1272,6 +1272,18 @@ section #jotOpen {
color: #fff;
}
/* Filebrowser */
.fbrowser .profile-rotator-wrapper {
min-height: 200px;
}
.fbrowser .fa-spin {
position: absolute;
left: 45%;
top: 40%;
font-size: 48px;
margin:0px auto;
}
/*
/* Stream
*/

67
view/theme/frio/js/filebrowser.js
View file

@ -88,23 +88,35 @@ 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) {
e.preventDefault();
$(".error").addClass("hidden");
});
$(".folders a, .path a").on("click", function(e) {
// Click on album link
$(".fbrowser").on("click", ".folders a, .path a", 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
$(".photo-album-photo-link").on('click', function(e) {
$(".fbrowser").on('click', ".photo-album-photo-link", function(e) {
e.preventDefault();
var embed = "";
@ -142,39 +154,52 @@ var FileBrowser = {
// update autosize for this textarea
autosize.update($(".text-autosize"));
});
},
if ($("#upload-image").length)
uploadButtons: function() {
if ($("#upload-image").length) {
var image_uploader = new window.AjaxUpload(
'upload-image',
{ action: 'wall_upload/'+FileBrowser.nickname+'?response=json',
{ action: 'wall_upload/'+FileBrowser.nickname+'?response=json',
name: 'userfile',
responseType: 'json',
onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); },
onSubmit: function(file,ext) {
$(".fbrowser-content").hide();
$(".fbrowser .profile-rotator-wrapper").show();
$(".error").addClass('hidden');
},
onComplete: function(file,response) {
if (response['error']!= undefined) {
$(".error span").html(response['error']);
$(".error").removeClass('hidden');
$('#profile-rotator').hide();
$(".fbrowser .profile-rotator-wrapper").hide();
return;
}
$(".profile-rotator-wrapper").hide();
$(".fbrowser_content").show();
// location = baseurl + "/fbrowser/image/?mode=none"+location['hash'];
// location.reload(true);
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
// load new content to fbrowser window
$(".fbrowser").load(url,function() {
$(function() {FileBrowser.init(nickname, type, hash);});
});
$(".fbrowser").load(url);
}
}
);
}
if ($("#upload-file").length)
if ($("#upload-file").length) {
var file_uploader = new window.AjaxUpload(
'upload-file',
{ action: 'wall_attach/'+FileBrowser.nickname+'?response=json',
{ action: 'wall_attach/'+FileBrowser.nickname+'?response=json',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); },
onSubmit: function(file,ext) {
$(".fbrowser-content").hide();
$(".fbrowser .profile-rotator-wrapper").show();
$(".error").addClass('hidden');
},
onComplete: function(file,response) {
if (response['error']!= undefined) {
$(".error span").html(response['error']);
@ -182,17 +207,19 @@ var FileBrowser = {
$('#profile-rotator').hide();
return;
}
$(".profile-rotator-wrapper").hide();
$(".fbrowser_content").show();
// location = baseurl + "/fbrowser/file/?mode=none"+location['hash'];
// location.reload(true);
var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
// load new content to fbrowser window
$(".fbrowser").load(url,function() {
$(function() {FileBrowser.init(nickname, type, hash);});
});
$(".fbrowser").load(url);
}
}
);
},
);
}
}
};

6
view/theme/frio/js/modal.js
View file

@ -8,9 +8,11 @@ $(document).ready(function(){
$(this).removeData('bs.modal');
$("#modal-title").empty();
$('#modal-body').empty();
// remove the file browser from jot (else we would have problems
// with ajaxupload
// Remove the file browser from jot (else we would have problems
// with AjaxUpload
$(".fbrowser").remove();
// Remove the AjaxUpload element
$("[name=userfile]").parent().remove();
});
// Clear bs modal on close

10
view/theme/frio/php/default.php
View file

@ -4,20 +4,17 @@
* @brief The default site template
*/
?>
<!DOCTYPE html >
<?php
<?php
require_once('view/theme/frio/php/frio_boot.php');
// $minimal = is_modal();
?>
<html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?> ">
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
<script>var frio="<?php echo "view/theme/frio"; ?>";</script>
<?php $baseurl = App::get_baseurl(); ?>
@ -31,8 +28,6 @@
if(x($page,'htmlhead')) echo $page['htmlhead'];
}
?>
</head>
<?php
if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login"))
@ -90,7 +85,6 @@ else
";
}
?>
</div><!--row-->
</div><!-- container -->

11
view/theme/frio/php/standard.php
View file

@ -4,21 +4,17 @@
* @brief The default site template
*/
?>
<!DOCTYPE html >
<html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
<meta name="viewport" content="initial-scale=1.0">
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?> ">
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
<script>var frio="<?php echo "view/theme/frio"; ?>";</script>
<?php $baseurl = App::get_baseurl(); ?>
<?php $frio = "view/theme/frio"; ?>
<?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
</head>
<body id=\"top\">";
<?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
@ -54,7 +50,6 @@
</div>
";
?>
</div><!--row-->
</div><!-- container -->
@ -80,7 +75,7 @@
})
})
}
$('textarea').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
$('input').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
</script>
@ -126,7 +121,5 @@ $("nav").bind('nav-update', function(e,data)
</div>
</div>
</div>
</footer>
</body>

69
view/theme/frio/templates/filebrowser.tpl
View file

@ -8,43 +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> <a href="#" class='close'>X</a>
</div>
<div class="path">
{{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
</div>
{{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}}
<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="error hidden">
<span></span> <a href="#" class='close'>X</a>
</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="path">
{{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
</div>
{{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}}
<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>
{{/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>
</div>
<div class="profile-rotator-wrapper" style="display: none;">
<i class="fa fa-circle-o-notch fa-spin"></i>
</div>
</div>
<script>
$(document).ready(function(){
});
</script>

1
view/theme/frost-mobile/templates/admin_site.tpl
View file

@ -52,7 +52,6 @@
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<h3>{{$advanced}}</h3>
{{include file="field_checkbox.tpl" field=$no_utf}}
{{include file="field_checkbox.tpl" field=$verifyssl}}
{{include file="field_input.tpl" field=$proxy}}
{{include file="field_input.tpl" field=$proxyuser}}

1
view/theme/frost/templates/admin_site.tpl
View file

@ -52,7 +52,6 @@
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<h3>{{$advanced}}</h3>
{{include file="field_checkbox.tpl" field=$no_utf}}
{{include file="field_checkbox.tpl" field=$verifyssl}}
{{include file="field_input.tpl" field=$proxy}}
{{include file="field_input.tpl" field=$proxyuser}}