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

remove the now redundant audio/video buttons and label the editor text style buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.

Browse Source
This commit is contained in:
friendica 2015-03-11 18:56:28 -07:00
parent 48f99c9a60
commit b3a9a6c802
8 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ItemObject.php
View File

@ -672,7 +672,7 @@ class Item extends BaseObject {
'$edquote' => t('Quote'), '$edquote' => t('Quote'),
'$edcode' => t('Code'), '$edcode' => t('Code'),
'$edimg' => t('Image'), '$edimg' => t('Image'),
'$edurl' => t('Link'), '$edurl' => t('Insert Link'),
'$edvideo' => t('Video'), '$edvideo' => t('Video'),
'$preview' => t('Preview'), // ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), '$preview' => t('Preview'), // ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''),
'$indent' => $indent, '$indent' => $indent,

5
include/conversation.php
View File

@ -1173,6 +1173,11 @@ function status_editor($a, $x, $popup = false) {
'$id_select' => $id_select, '$id_select' => $id_select,
'$id_seltext' => t('Post as'), '$id_seltext' => t('Post as'),
'$writephoto' => perm_is_allowed($x['profile_uid'], get_observer_hash(), 'post_photos'), '$writephoto' => perm_is_allowed($x['profile_uid'], get_observer_hash(), 'post_photos'),
'$bold' => t('Bold'),
'$italic' => t('Italic'),
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$shortupload' => t('upload photo'), '$shortupload' => t('upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),

5
mod/editblock.php
View File

@ -141,6 +141,11 @@ function editblock_content(&$a) {
'$action' => 'item', '$action' => 'item',
'$webpage' => ITEM_BUILDBLOCK, '$webpage' => ITEM_BUILDBLOCK,
'$share' => t('Edit'), '$share' => t('Edit'),
'$bold' => t('Bold'),
'$italic' => t('Italic'),
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'), '$weblink' => t('Insert web link'),

5
mod/editlayout.php
View File

@ -137,6 +137,11 @@ function editlayout_content(&$a) {
'$action' => 'item', '$action' => 'item',
'$webpage' => ITEM_PDL, '$webpage' => ITEM_PDL,
'$share' => t('Edit'), '$share' => t('Edit'),
'$bold' => t('Bold'),
'$italic' => t('Italic'),
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'), '$weblink' => t('Insert web link'),

5
mod/editpost.php
View File

@ -111,6 +111,11 @@ function editpost_content(&$a) {
'$return_path' => $_SESSION['return_url'], '$return_path' => $_SESSION['return_url'],
'$action' => 'item', '$action' => 'item',
'$share' => t('Edit'), '$share' => t('Edit'),
'$bold' => t('Bold'),
'$italic' => t('Italic'),
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'), '$weblink' => t('Insert web link'),

5
mod/editwebpage.php
View File

@ -172,6 +172,11 @@ function editwebpage_content(&$a) {
'$action' => 'item', '$action' => 'item',
'$share' => t('Edit'), '$share' => t('Edit'),
'$bold' => t('Bold'),
'$italic' => t('Italic'),
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'), '$weblink' => t('Insert web link'),

12
view/tpl/comment_item.tpl
View File

@ -40,18 +40,18 @@
</button> </button>
</div> </div>
<div class='btn-group'> <div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> <!--button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;">
<i class="icon-camera comment-icon"></i> <i class="icon-camera comment-icon"></i>
</button> </button-->
<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;"> <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;">
<i class="icon-link comment-icon"></i> <i class="icon-link comment-icon"></i>
</button> </button>
<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> <!--button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
<i class="icon-facetime-video comment-icon"></i> <i class="icon-facetime-video comment-icon"></i>
</button> </button-->
</div> <!--/div-->
{{if $feature_encrypt}} {{if $feature_encrypt}}
<div class='btn-group'> <!--div class='btn-group'-->
<button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
<i class="icon-key comment-icon"></i> <i class="icon-key comment-icon"></i>
</button> </button>

8
view/tpl/jot.tpl
View File

@ -68,12 +68,12 @@
<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>
<button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;"> <!--button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;">
<i id="profile-video" class="icon-facetime-video jot-icons"></i> <i id="profile-video" class="icon-facetime-video jot-icons"></i>
</button> </button>
<button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;"> <button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;">
<i id="profile-audio" class="icon-volume-up jot-icons"></i> <i id="profile-audio" class="icon-volume-up jot-icons"></i>
</button> </button -->
</div> </div>
<div class="btn-group hidden-xs hidden-sm"> <div class="btn-group hidden-xs hidden-sm">
<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;">
@ -114,8 +114,8 @@
{{if $writephoto}}<li class="visible-xs"><a id="wall-image-upload-sub" href="#" ><i class="icon-camera"></i>&nbsp;{{$upload}}</a></li>{{/if}} {{if $writephoto}}<li class="visible-xs"><a id="wall-image-upload-sub" href="#" ><i class="icon-camera"></i>&nbsp;{{$upload}}</a></li>{{/if}}
<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li> <li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>
<li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li> <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li>
<li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i>&nbsp;{{$video}}</a></li> <!--li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i>&nbsp;{{$video}}</a></li-->
<li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i>&nbsp;{{$audio}}</a></li> <!--li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i>&nbsp;{{$audio}}</a></li-->
{{/if}} {{/if}}
<li class="divider visible-xs"></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> <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li>