diff options
| -rw-r--r-- | Zotlabs/Module/Editblock.php | 17 | ||||
| -rw-r--r-- | Zotlabs/Module/Editwebpage.php | 15 | ||||
| -rw-r--r-- | view/css/conversation.css | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 33 |
4 files changed, 30 insertions, 37 deletions
diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php index 90016952e..2821b3fe0 100644 --- a/Zotlabs/Module/Editblock.php +++ b/Zotlabs/Module/Editblock.php @@ -143,16 +143,11 @@ class Editblock extends \Zotlabs\Web\Controller { '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), - '$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'), - '$upload' => t('Upload photo'), + '$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false), '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), - '$youtube' => t('Insert YouTube video'), - '$video' => t('Insert Vorbis [.ogg] video'), - '$audio' => t('Insert Vorbis [.ogg] audio'), - '$setloc' => t('Set your location'), - '$noloc' => t('Clear browser location'), - '$wait' => t('Please wait'), + '$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false), + '$setloc' => false, + '$noloc' => false, '$permset' => t('Permission settings'), '$ptyp' => $itm[0]['type'], '$mimeselect' => $mimeselect, @@ -160,7 +155,7 @@ class Editblock extends \Zotlabs\Web\Controller { '$post_id' => $post_id, '$baseurl' => z_root(), '$defloc' => $channel['channel_location'], - '$visitor' => false, + '$visitor' => true, '$public' => t('Public post'), '$jotnets' => $jotnets, '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), @@ -177,8 +172,6 @@ class Editblock extends \Zotlabs\Web\Controller { '$jotplugins' => $jotplugins, '$sourceapp' => $itm[0]['app'], '$defexpire' => '', - '$feature_expire' => false, - '$expires' => t('Set expiration date'), '$bbcode' => (($mimetype == 'text/bbcode') ? true : false) )); diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index 01d9e8aad..d3b031db2 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -176,7 +176,7 @@ class Editwebpage extends \Zotlabs\Web\Controller { '$webpage' => ITEM_TYPE_WEBPAGE, '$placeholdpagetitle' => t('Page link title'), '$pagetitle' => $page_title, - '$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'), + '$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false), '$action' => 'item', '$share' => t('Edit'), '$bold' => t('Bold'), @@ -184,15 +184,10 @@ class Editwebpage extends \Zotlabs\Web\Controller { '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), - '$upload' => t('Upload photo'), '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), - '$youtube' => t('Insert YouTube video'), - '$video' => t('Insert Vorbis [.ogg] video'), - '$audio' => t('Insert Vorbis [.ogg] audio'), - '$setloc' => t('Set your location'), - '$noloc' => ((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''), - '$wait' => t('Please wait'), + '$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false), + '$setloc' => false, //t('Set your location'), + '$noloc' => false, //((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''), '$permset' => t('Permission settings'), '$ptyp' => $itm[0]['type'], '$content' => undo_post_tagging($itm[0]['body']), @@ -218,8 +213,6 @@ class Editwebpage extends \Zotlabs\Web\Controller { '$jotplugins' => $jotplugins, '$sourceapp' => \App::$sourcename, '$defexpire' => '', - '$feature_expire' => false, - '$expires' => t('Set expiration date'), '$bbcode' => (($mimetype == 'text/bbcode') ? true : false) )); diff --git a/view/css/conversation.css b/view/css/conversation.css index 0ecec039f..e5eb575bf 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -77,7 +77,7 @@ code { } #profile-rotator { - margin: 16px; + padding: 15px 0px 0px 15px; } .profile-jot-net { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 44e010e77..9c5ddc620 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -68,27 +68,31 @@ </div> {{/if}} {{if $visitor}} - <div class="btn-group hidden-xs"> + <div class="btn-group hidden-xs hidden-sm"> {{if $writefiles}} <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" > <i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i> </button> {{/if}} + {{if $weblink}} <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> <i id="profile-link" class="icon-link jot-icons"></i> </button> + {{/if}} </div> <div class="btn-group hidden-xs hidden-sm"> + {{if $setloc}} <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> <i id="profile-location" class="icon-globe jot-icons"></i> </button> + {{/if}} {{if $noloc}} <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i> </button> {{/if}} {{else}} - <div class="btn-group hidden-xs"> + <div class="btn-group hidden-xs hidden-sm"> {{/if}} {{if $feature_expire}} <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> @@ -111,42 +115,45 @@ </button> {{/if}} </div> + {{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}} <div class="btn-group visible-xs visible-sm"> <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="icon-caret-down jot-icons"></i> </button> <ul class="dropdown-menu dropdown-menu" role="menu"> - <li class="visible-xs"><a href="#" onclick="preview_post();return false;"><i class="icon-eye-open"></i> {{$preview}}</a></li> {{if $visitor}} - <li class="divider visible-xs"></li> {{if $writefiles}} - <li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li> + <li><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li> + {{/if}} + {{if $weblink}} + <li><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> + {{/if}} +i {{if $setloc}} + <li><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> {{/if}} - <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> - <li class="divider visible-xs"></li> - <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> {{if $noloc}} - <li class="visible-xs visible-sm"><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$noloc}}</a></li> + <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$noloc}}</a></li> {{/if}} {{/if}} {{if $feature_expire}} - <li class="visible-xs visible-sm"><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i> {{$expires}}</a></li> + <li><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i> {{$expires}}</a></li> {{/if}} {{if $feature_encrypt}} - <li class="visible-xs visible-sm"><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i> {{$encrypt}}</a></li> + <li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i> {{$encrypt}}</a></li> {{/if}} {{if $feature_voting}} - <li class="visible-xs visible-sm"><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i> {{$voting}}</a></li> + <li><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i> {{$voting}}</a></li> {{/if}} </ul> </div> + {{/if}} </div> <div id="profile-rotator-wrapper"> <div id="profile-rotator"></div> </div> <div id="profile-jot-submit-right" class="btn-group pull-right"> {{if $preview}} - <button class="btn btn-default btn-sm hidden-xs" onclick="preview_post();return false;" title="{{$preview}}"> + <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} |