bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8492 from MrPetovan/task/8400-frio-jot-compose-link

Browse source 
[frio] Add link to Compose page in jot
This commit is contained in:
Tobias Diekershoff 2020-04-04 07:49:30 +02:00 committed by GitHub
commit ad68aaae3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/conversation.php
View file

@ -1295,6 +1295,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
//jot nav tab (used in some themes) //jot nav tab (used in some themes)
'$message' => DI::l10n()->t('Message'), '$message' => DI::l10n()->t('Message'),
'$browser' => DI::l10n()->t('Browser'), '$browser' => DI::l10n()->t('Browser'),
'$compose_link_title' => DI::l10n()->t('Open Compose page'),
]); ]);

2
mod/editpost.php
View file

@ -132,6 +132,8 @@ function editpost_content(App $a)
'$message' => DI::l10n()->t('Message'), '$message' => DI::l10n()->t('Message'),
'$browser' => DI::l10n()->t('Browser'), '$browser' => DI::l10n()->t('Browser'),
'$shortpermset' => DI::l10n()->t('permissions'), '$shortpermset' => DI::l10n()->t('permissions'),
'$compose_link_title' => DI::l10n()->t('Open Compose page'),
]); ]);
return $o; return $o;

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

@ -1342,6 +1342,10 @@ section #jotOpen {
#jot-modal .modal-header { #jot-modal .modal-header {
border-bottom: none; border-bottom: none;
} }
#jot-modal .modal-header .compose-link {
float: right;
margin-right: 20px;
}
#jot-title-wrap, #jot-category-wrap { #jot-title-wrap, #jot-category-wrap {
margin-bottom: 5px; margin-bottom: 5px;
} }

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

@ -9,25 +9,41 @@
in with dropdows the close button needs to be inserted after the dropdown. *}} in with dropdows the close button needs to be inserted after the dropdown. *}}
<button type="button" class="close hidden-xs" data-dismiss="modal" aria-label="Close" style="float: right;">&times;</button> <button type="button" class="close hidden-xs" data-dismiss="modal" aria-label="Close" style="float: right;">&times;</button>
<a href="/compose" class="btn compose-link" title="{{$compose_link_title}}" aria-label="{{$compose_link_title}}">
<i class="fa fa-pencil-square-o" aria-hidden="true"></i>
</a>
{{* The Jot navigation menu for desktop user (text input, permissions, preview, filebrowser) *}} {{* The Jot navigation menu for desktop user (text input, permissions, preview, filebrowser) *}}
<ul class="nav nav-tabs hidden-xs jot-nav" role="tablist" data-tabs="tabs"> <ul class="nav nav-tabs hidden-xs jot-nav" role="tablist" data-tabs="tabs">
{{* Mark the first list entry as active because it is the first which is active after opening {{* Mark the first list entry as active because it is the first which is active after opening
the modal. Changing of the activity status is done by js in jot.tpl-header *}} the modal. Changing of the activity status is done by js in jot.tpl-header *}}
<li class="active" role="presentation"> <li class="active" role="presentation">
<a href="#profile-jot-wrapper" class="jot-text-lnk jot-nav-lnk" id="jot-text-lnk" role="tab" aria-controls="profile-jot-wrapper">{{$message}}</a> <a href="#profile-jot-wrapper" class="jot-text-lnk jot-nav-lnk" id="jot-text-lnk" role="tab" aria-controls="profile-jot-wrapper">
<i class="fa fa-file-text-o" aria-hidden="true"></i>
{{$message}}
</a>
</li> </li>
{{if $acl}} {{if $acl}}
<li role="presentation"> <li role="presentation">
<a href="#profile-jot-acl-wrapper" class="jot-perms-lnk jot-nav-lnk" id="jot-perms-lnk" role="tab" aria-controls="profile-jot-acl-wrapper">{{$shortpermset}}</a> <a href="#profile-jot-acl-wrapper" class="jot-perms-lnk jot-nav-lnk" id="jot-perms-lnk" role="tab" aria-controls="profile-jot-acl-wrapper">
<i class="fa fa-shield" aria-hidden="true"></i>
{{$shortpermset}}
</a>
</li> </li>
{{/if}} {{/if}}
{{if $preview}} {{if $preview}}
<li role="presentation"> <li role="presentation">
<a href="#jot-preview-content" class="jot-preview-lnk jot-nav-lnk" id="jot-preview-lnk" role="tab" aria-controls="jot-preview-content">{{$preview}}</a> <a href="#jot-preview-content" class="jot-preview-lnk jot-nav-lnk" id="jot-preview-lnk" role="tab" aria-controls="jot-preview-content">
<i class="fa fa-eye" aria-hidden="true"></i>
{{$preview}}
</a>
</li> </li>
{{/if}} {{/if}}
<li role="presentation"> <li role="presentation">
<a href="#jot-fbrowser-wrapper" class="jot-browser-lnk jot-nav-lnk" id="jot-browser-link" role="tab" aria-controls="jot-fbrowser-wrapper">{{$browser}}</a> <a href="#jot-fbrowser-wrapper" class="jot-browser-lnk jot-nav-lnk" id="jot-browser-link" role="tab" aria-controls="jot-fbrowser-wrapper">
<i class="fa fa-picture-o" aria-hidden="true"></i>
{{$browser}}
</a>
</li> </li>
</ul> </ul>