bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

[frio] Merge compose/jot buttons features

Browse source
This commit is contained in:
Hypolite Petovan 2020-02-19 15:11:35 -05:00
parent abe1e37dd9
commit 2791d70655
3 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1301,8 +1301,7 @@ section ul.tabs {
section #jotOpen { section #jotOpen {
display: none; display: none;
} }
#jotOpen, #jotOpen {
#composeOpen {
margin-top: 3px; margin-top: 3px;
float: right; float: right;
} }

26
view/theme/frio/js/theme.js
View file

@ -73,25 +73,17 @@ $(document).ready(function(){
'target': ".flex-target" 'target': ".flex-target"
}); });
// add Jot botton to the scecond navbar // add Jot button to the second navbar
let $jotButton = $("#jotOpen"); let $jotButton = $("#jotOpen");
let $composeButton = $("#composeOpen"); if ($jotButton.length) {
if (compose) { $jotButton.appendTo("#topbar-second > .container > #navbar-button");
$jotButton.hide(); if ($("#jot-popup").is(":hidden")) {
if ($composeButton.length) { $jotButton.hide();
$composeButton.appendTo("#topbar-second > .container > #navbar-button");
if($("#jot-popup").is(":hidden")) {
$composeButton.hide();
}
}
} else {
$composeButton.hide();
if ($jotButton.length) {
$jotButton.appendTo("#topbar-second > .container > #navbar-button");
if($("#jot-popup").is(":hidden")) {
$jotButton.hide();
}
} }
$jotButton.on('click', function (e) {
e.preventDefault();
jotShow();
});
} }
let $body = $('body'); let $body = $('body');

3
view/theme/frio/templates/jot.tpl
View file

@ -1,6 +1,5 @@
{{* The button to open the jot - in This theme we move the button with js to the second nav bar *}} {{* The button to open the jot - in This theme we move the button with js to the second nav bar *}}
<button class="btn btn-sm btn-main pull-right" id="jotOpen" aria-label="{{$new_post}}" title="{{$new_post}}" onclick="jotShow();"><i class="fa fa-pencil-square-o fa-2x"></i></button> <a class="btn btn-sm btn-main pull-right" id="jotOpen" href="compose/{{$posttype}}{{if $content}}?body={{$content}}{{/if}}" aria-label="{{$new_post}}" title="{{$new_post}}"><i class="fa fa-pencil-square-o fa-2x"></i></a>
<a class="btn btn-sm btn-main pull-right" id="composeOpen" href="compose/{{$posttype}}{{if $content}}?body={{$content}}{{/if}}" aria-label="{{$new_post}}" title="{{$new_post}}"><i class="fa fa-pencil-square-o fa-2x"></i></a>
<div id="jot-content"> <div id="jot-content">
<div id="jot-sections"> <div id="jot-sections">