[frio] Add link to Compose page in jot

diff --git a/include/conversation.php b/include/conversation.php
index 8c09fa98b34379aebee0facb95623db1bd4e36cd..8999873820d167ba7bd22f4e9bea4359befabe6a 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1295,6 +1295,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
                //jot nav tab (used in some themes)
                '$message' => DI::l10n()->t('Message'),
                '$browser' => DI::l10n()->t('Browser'),
+
+               '$compose_link_title' => DI::l10n()->t('Open Compose page'),
        ]);
 
 

diff --git a/mod/editpost.php b/mod/editpost.php
index aa8930e5d027c422c9746d959a72b6d613c2fa05..7cccfdb2d40e232c2d44cb0a684bffddd98388a1 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -132,6 +132,8 @@ function editpost_content(App $a)
                '$message' => DI::l10n()->t('Message'),
                '$browser' => DI::l10n()->t('Browser'),
                '$shortpermset' => DI::l10n()->t('permissions'),
+
+               '$compose_link_title' => DI::l10n()->t('Open Compose page'),
        ]);
 
        return $o;

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 46a633f17ae05bde3b097f7c24bf0e70673a7196..5e7d452043f2f14da9ce2c423a6c11ee760a0487 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1342,6 +1342,10 @@ section #jotOpen {
 #jot-modal .modal-header {
     border-bottom: none;
 }
+#jot-modal .modal-header .compose-link {
+       float: right;
+       margin-right: 20px;
+}
 #jot-title-wrap, #jot-category-wrap {
     margin-bottom: 5px;
 }

diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 98eba98b238f4e8acde799b36147102b50753328..f719625a284efcff9d7005cbd125458d75dacae7 100644 (file)
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -9,25 +9,41 @@
                        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>
 
+                       <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) *}}
                        <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
                                        the modal. Changing of the activity status is done by js in jot.tpl-header *}}
                                <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>
                                {{if $acl}}
                                <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>
                                {{/if}}
                                {{if $preview}}
                                <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>
                                {{/if}}
                                <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>
                        </ul>