Merge develop into 20170321_-_frio-fbbrowser

[friendica.git] / view / theme / frio / templates / jot.tpl

diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 71fdae7cd3433063db3045bee528a14a3d735d28..0e9a6fdde29596a847b01f1ae55b3bea650e24a5 100644 (file)
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -11,7 +11,7 @@
                        in with dropdows the close button needs to be inserted after the dropdown. *}}
                        <button type="button" class="close hidden-xs" data-dismiss="modal" style="float: right;">&times;</button>
 
-                       {{* The Jot navigation menu (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="menubar" 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 *}}
@@ -33,6 +33,7 @@
                                </li>
                        </ul>
 
+                       {{* The Jot navigation menu for small displays (text input, permissions, preview, filebrowser) *}}
                        <div class="dropdown dropdown-head dropdown-mobile-jot jot-nav hidden-lg hidden-md hidden-sm" role="menubar" data-tabs="tabs" style="float: left;">
                                <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">{{$message}}&nbsp;<span class="caret"></span></button>
                                <ul class="dropdown-menu nav nav-pills">
@@ -88,10 +89,6 @@
                                        </div>
 
                                        <ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
-                                               {{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
-                                               <li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
-                                               *}}
-                                               <li><button type="button" class="btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
                                                <li><button type="button" class="btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
                                                <li><button type="button" class="btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
                                                <li><button type="button" class="btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>