diff options
| author | marijus <mario@mariovavti.com> | 2015-02-13 12:37:05 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2015-02-13 12:37:05 +0100 |
| commit | 7c45f23f8f517253f0de7da29e485b9ca417ee7c (patch) | |
| tree | 4fdb75abe6b41f2978b91dc0fea26325da2acb1c | |
| parent | b340fd50953089cb835d91c8c6adeee95875a02c (diff) | |
| download | volse-hubzilla-7c45f23f8f517253f0de7da29e485b9ca417ee7c.tar.gz volse-hubzilla-7c45f23f8f517253f0de7da29e485b9ca417ee7c.tar.bz2 volse-hubzilla-7c45f23f8f517253f0de7da29e485b9ca417ee7c.zip | |
some shifting to make button groups render properly
| -rwxr-xr-x | view/tpl/conv_item.tpl | 38 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 61 |
2 files changed, 51 insertions, 48 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 01833068b..a575df554 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -140,31 +140,29 @@ {{else}} <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> {{/if}} + {{if $response.list_part}} + <div class="modal" id="{{$verb}}Modal-{{$item.id}}"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title">{{$response.title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} </div> {{/if}} - - {{if $response.list_part}} - <div class="modal" id="{{$verb}}Modal-{{$item.id}}"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title">{{$response.title}}</h4> - </div> - <div class="modal-body"> - <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> - </div> - <div class="modal-footer clear"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> - </div><!-- /.modal --> - {{/if}} {{/foreach}} </div> {{/if}} - </div> <div class="clear"></div> </div> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 1231b4d79..818517c46 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -130,14 +130,21 @@ </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}"> + <div class="wall-item-list-comments btn-group"> + <button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;"> + {{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}} + </button> + </div> + {{if $item.unseen_comments}} + <div class="unseen-wall-indicator-{{$item.id}} btn-group"> + <button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"> + <i class="icon-check"></i> + </button> + </div> + {{/if}} - - <div class="wall-item-list-comments btn-group"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;">{{$item.comment_count_txt}}{{if $item.unseen_comments}} -<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}{{/if}}</span></button></div>{{if $item.unseen_comments}}<div class="unseen-wall-indicator-{{$item.id}} btn-group"><button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"><i class="icon-check"></i></div>{{/if}} - - {{if $item.responses }} - <div class="wall-item-tools-left{{if $item.responses.count > 1}} btn-group{{/if}}"> - {{foreach $item.responses as $verb=>$response}} + {{if $item.responses }} + {{foreach $item.responses as $verb=>$response}} {{if $response.count}} <div class="btn-group"> <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> @@ -146,31 +153,29 @@ {{else}} <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> {{/if}} + {{if $response.list_part}} + <div class="modal" id="{{$verb}}Modal-{{$item.id}}"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title">{{$response.title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} </div> {{/if}} - - {{if $response.list_part}} - <div class="modal" id="{{$verb}}Modal-{{$item.id}}"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title">{{$response.title}}</h4> - </div> - <div class="modal-body"> - <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> - </div> - <div class="modal-footer clear"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> - </div><!-- /.modal --> + {{/foreach}} {{/if}} - {{/foreach}} </div> - {{/if}} - </div> </div> <div class="clear"></div> </div> |