harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some refinements on jot

Browse Source
This commit is contained in:
Mario Vavti 2016-04-27 11:36:02 +02:00
parent 26131ffc91
commit a6baa5a6da
4 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Zotlabs/Module/Editblock.php
View File

@ -143,16 +143,11 @@ class Editblock extends \Zotlabs\Web\Controller {
'$underline' => t('Underline'), '$underline' => t('Underline'),
'$quote' => t('Quote'), '$quote' => t('Quote'),
'$code' => t('Code'), '$code' => t('Code'),
'$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'), '$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
'$upload' => t('Upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'), '$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false),
'$youtube' => t('Insert YouTube video'), '$setloc' => false,
'$video' => t('Insert Vorbis [.ogg] video'), '$noloc' => false,
'$audio' => t('Insert Vorbis [.ogg] audio'),
'$setloc' => t('Set your location'),
'$noloc' => t('Clear browser location'),
'$wait' => t('Please wait'),
'$permset' => t('Permission settings'), '$permset' => t('Permission settings'),
'$ptyp' => $itm[0]['type'], '$ptyp' => $itm[0]['type'],
'$mimeselect' => $mimeselect, '$mimeselect' => $mimeselect,
@ -160,7 +155,7 @@ class Editblock extends \Zotlabs\Web\Controller {
'$post_id' => $post_id, '$post_id' => $post_id,
'$baseurl' => z_root(), '$baseurl' => z_root(),
'$defloc' => $channel['channel_location'], '$defloc' => $channel['channel_location'],
'$visitor' => false, '$visitor' => true,
'$public' => t('Public post'), '$public' => t('Public post'),
'$jotnets' => $jotnets, '$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
@ -177,8 +172,6 @@ class Editblock extends \Zotlabs\Web\Controller {
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => $itm[0]['app'], '$sourceapp' => $itm[0]['app'],
'$defexpire' => '', '$defexpire' => '',
'$feature_expire' => false,
'$expires' => t('Set expiration date'),
'$bbcode' => (($mimetype == 'text/bbcode') ? true : false) '$bbcode' => (($mimetype == 'text/bbcode') ? true : false)
)); ));

15
Zotlabs/Module/Editwebpage.php
View File

@ -176,7 +176,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
'$webpage' => ITEM_TYPE_WEBPAGE, '$webpage' => ITEM_TYPE_WEBPAGE,
'$placeholdpagetitle' => t('Page link title'), '$placeholdpagetitle' => t('Page link title'),
'$pagetitle' => $page_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', '$action' => 'item',
'$share' => t('Edit'), '$share' => t('Edit'),
'$bold' => t('Bold'), '$bold' => t('Bold'),
@ -184,15 +184,10 @@ class Editwebpage extends \Zotlabs\Web\Controller {
'$underline' => t('Underline'), '$underline' => t('Underline'),
'$quote' => t('Quote'), '$quote' => t('Quote'),
'$code' => t('Code'), '$code' => t('Code'),
'$upload' => t('Upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'), '$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false),
'$youtube' => t('Insert YouTube video'), '$setloc' => false, //t('Set your location'),
'$video' => t('Insert Vorbis [.ogg] video'), '$noloc' => false, //((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''),
'$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'),
'$permset' => t('Permission settings'), '$permset' => t('Permission settings'),
'$ptyp' => $itm[0]['type'], '$ptyp' => $itm[0]['type'],
'$content' => undo_post_tagging($itm[0]['body']), '$content' => undo_post_tagging($itm[0]['body']),
@ -218,8 +213,6 @@ class Editwebpage extends \Zotlabs\Web\Controller {
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => \App::$sourcename, '$sourceapp' => \App::$sourcename,
'$defexpire' => '', '$defexpire' => '',
'$feature_expire' => false,
'$expires' => t('Set expiration date'),
'$bbcode' => (($mimetype == 'text/bbcode') ? true : false) '$bbcode' => (($mimetype == 'text/bbcode') ? true : false)
)); ));

2
view/css/conversation.css
View File

@ -77,7 +77,7 @@ code {
} }
#profile-rotator { #profile-rotator {
margin: 16px; padding: 15px 0px 0px 15px;
} }
.profile-jot-net { .profile-jot-net {

33
view/tpl/jot.tpl
View File

@ -68,27 +68,31 @@
</div> </div>
{{/if}} {{/if}}
{{if $visitor}} {{if $visitor}}
<div class="btn-group hidden-xs"> <div class="btn-group hidden-xs hidden-sm">
{{if $writefiles}} {{if $writefiles}}
<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" > <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> <i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i>
</button> </button>
{{/if}} {{/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;"> <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> <i id="profile-link" class="icon-link jot-icons"></i>
</button> </button>
{{/if}}
</div> </div>
<div class="btn-group hidden-xs hidden-sm"> <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;"> <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> <i id="profile-location" class="icon-globe jot-icons"></i>
</button> </button>
{{/if}}
{{if $noloc}} {{if $noloc}}
<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> <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> <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
</button> </button>
{{/if}} {{/if}}
{{else}} {{else}}
<div class="btn-group hidden-xs"> <div class="btn-group hidden-xs hidden-sm">
{{/if}} {{/if}}
{{if $feature_expire}} {{if $feature_expire}}
<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
@ -111,42 +115,45 @@
</button> </button>
{{/if}} {{/if}}
</div> </div>
{{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}}
<div class="btn-group visible-xs visible-sm"> <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"> <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> <i id="more-tools-icon" class="icon-caret-down jot-icons"></i>
</button> </button>
<ul class="dropdown-menu dropdown-menu" role="menu"> <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>&nbsp;{{$preview}}</a></li>
{{if $visitor}} {{if $visitor}}
<li class="divider visible-xs"></li>
{{if $writefiles}} {{if $writefiles}}
<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li> <li><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>
{{/if}}
{{if $weblink}}
<li><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li>
{{/if}}
i {{if $setloc}}
<li><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li>
{{/if}} {{/if}}
<li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$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>&nbsp;{{$setloc}}</a></li>
{{if $noloc}} {{if $noloc}}
<li class="visible-xs visible-sm"><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i>&nbsp;{{$noloc}}</a></li> <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i>&nbsp;{{$noloc}}</a></li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{if $feature_expire}} {{if $feature_expire}}
<li class="visible-xs visible-sm"><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i>&nbsp;{{$expires}}</a></li> <li><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i>&nbsp;{{$expires}}</a></li>
{{/if}} {{/if}}
{{if $feature_encrypt}} {{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>&nbsp;{{$encrypt}}</a></li> <li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
{{/if}} {{/if}}
{{if $feature_voting}} {{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>&nbsp;{{$voting}}</a></li> <li><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i>&nbsp;{{$voting}}</a></li>
{{/if}} {{/if}}
</ul> </ul>
</div> </div>
{{/if}}
</div> </div>
<div id="profile-rotator-wrapper"> <div id="profile-rotator-wrapper">
<div id="profile-rotator"></div> <div id="profile-rotator"></div>
</div> </div>
<div id="profile-jot-submit-right" class="btn-group pull-right"> <div id="profile-jot-submit-right" class="btn-group pull-right">
{{if $preview}} {{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> <i class="icon-eye-open jot-icons" ></i>
</button> </button>
{{/if}} {{/if}}