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

Merge pull request #416 from cvogeley/master

Browse Source 
Bootstrapify item tools …
This commit is contained in:
RedMatrix 2014-04-20 12:00:23 +10:00
commit 4b17f74300
2 changed files with 67 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
view/css/conversation.css
View File

@ -217,11 +217,18 @@
padding: 5px 10px; padding: 5px 10px;
margin-left: 60px; margin-left: 60px;
} }
.wall-item-tools-bs {
clear: both;
padding: 5px 10px;
margin-left: 40px;
}
.comment .wall-item-tools { .comment .wall-item-tools {
margin-left: 0; margin-left: 0;
} }
.comment .wall-item-tools-bs {
padding: 0px 0px;
margin-left: 30px;
}
.item-tool { .item-tool {
float: left; float: left;
margin-right: 8px; margin-right: 8px;

57
view/tpl/conv_item.tpl
View File

@ -58,7 +58,8 @@
{{/if}} {{/if}}
</div> </div>
</div> </div>
<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
<!-- <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
{{if $item.like}} {{if $item.like}}
<i class="icon-thumbs-up-alt item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></i> <i class="icon-thumbs-up-alt item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></i>
{{/if}} {{/if}}
@ -86,8 +87,58 @@
{{if $item.bookmark}} {{if $item.bookmark}}
<i id="bookmarker-{{$item.id}}" onclick="itemBookmark({{$item.id}}); return false;" class="bookmark-item icon-bookmark item-tool" title="{{$item.bookmark}}"></i> <i id="bookmarker-{{$item.id}}" onclick="itemBookmark({{$item.id}}); return false;" class="bookmark-item icon-bookmark item-tool" title="{{$item.bookmark}}"></i>
{{/if}} {{/if}}
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div> -->
<div class="wall-item-tools-bs btn-group">
{{if $item.like}}
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false">
<i class="icon-thumbs-up-alt" title="{{$item.like.0}}"></i>
</button>{{/if}}
{{if $item.dislike}}<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false">
<i class="icon-thumbs-down-alt" title="{{$item.dislike.0}}"></i>
</button>{{/if}}
<!-- {{if $item.drop.dropping}}<button type="button" class="btn btn-default btn-sm" onclick="return confirmDelete();" type="submit"><a href="item/drop/{{$item.id}}" title="{{$item.drop.delete}}" ><i class="icon-remove drop-icons"></i></a></button>{{/if}}
{{if $item.star}}
<button type="button" class="btn btn-default btn-sm">
<i id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>
</button>{{/if}}
-->
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<i class="icon-caret-down"></i>
</button>
<ul class="dropdown-menu">
<li> {{if $item.share}}
<a href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a>
{{/if}}</li>
<li> {{if $item.plink}}
<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a>
{{/if}}</li>
<li> {{if $item.edpost}}
<a href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a>
{{/if}}</li>
<li> {{if $item.tagger}}
<a href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a>
{{/if}}</li>
<li> {{if $item.filer}}
<a href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a>
{{/if}}</li>
<li> {{if $item.bookmark}}
<a href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a>
{{/if}} </li>
<li> {{if $item.star}}
<a href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a>
{{/if}}
</li>
</ul>
</div>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" > <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}} {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}}
</div> </div>
@ -96,7 +147,7 @@
<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div> <div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div>
<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div> <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div>
</div>
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>