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

Merge pull request #735 from pafcu/jotbtnspacing2

Browse Source 
Put some spacing between share types and other buttons in jot
This commit is contained in:
git-marijus 2014-12-09 11:56:36 +01:00
commit 42fc104272
2 changed files with 68 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
view/tpl/comment_item.tpl
View File

@ -21,7 +21,8 @@
{{/if}} {{/if}}
<div class="clear"></div> <div class="clear"></div>
<div id="comment-tools-{{$id}}" class="comment-tools"> <div id="comment-tools-{{$id}}" class="comment-tools">
<div id="comment-edit-bb-{{$id}}" class="btn-group pull-left"> <div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
<div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> <button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
<i class="icon-bold comment-icon"></i> <i class="icon-bold comment-icon"></i>
</button> </button>
@ -37,6 +38,8 @@
<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> <button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
<i class="icon-terminal comment-icon"></i> <i class="icon-terminal comment-icon"></i>
</button> </button>
</div>
<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>
@ -46,10 +49,13 @@
<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>
{{if $feature_encrypt}} {{if $feature_encrypt}}
<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>
</div>
{{/if}} {{/if}}
</div> </div>
<div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}"> <div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}">

8
view/tpl/jot.tpl
View File

@ -36,8 +36,9 @@
<textarea class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea> <textarea class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea>
</div> </div>
<div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-wrapper" class="jothidden">
<div id="profile-jot-submit-left" class="btn-group pull-left"> <div id="profile-jot-submit-left" class="btn-toolbar pull-left">
{{if $visitor}} {{if $visitor}}
<div class='btn-group'>
<button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" > <button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" >
<i class="icon-camera jot-icons"></i> <i class="icon-camera jot-icons"></i>
</button> </button>
@ -53,12 +54,16 @@
<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 class='btn-group'>
<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;"> <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i> <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
</button> </button>
<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>
{{else}}
<div class='btn-group'>
{{/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;">
@ -71,6 +76,7 @@
</button> </button>
{{/if}} {{/if}}
</div> </div>
</div>
<div id="profile-rotator-wrapper"> <div id="profile-rotator-wrapper">
<div id="profile-rotator"></div> <div id="profile-rotator"></div>
</div> </div>