diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 8 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 15 | ||||
| -rw-r--r-- | view/tpl/show_thing.tpl | 4 |
4 files changed, 26 insertions, 4 deletions
diff --git a/view/js/main.js b/view/js/main.js index cb492b9de..a7745cbaf 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -615,11 +615,12 @@ function updateConvItems(mode,data) { update_mode = 'append'; page_load = false; scroll_next = false; - in_progress = false; updateConvItems(update_mode,data); $("#page-spinner").spin(false); $("#profile-jot-text-loading").spin(false); + in_progress = false; + // FIXME - the following lines were added so that almost // immediately after we update the posts on the page, we // re-check and update the notification counts. diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 589a48192..4ee8a7477 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1743,6 +1743,14 @@ header { list-style-type: none; } +.profile-thing-list img { + margin-bottom: 5px; +} + +.profile-thing-list li { + margin-bottom: 15px; +} + div.page-list-item { margin: 20px; } diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 0faa54637..73033fe40 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -4,7 +4,7 @@ {{if $profile.canlike || $profile.like_count}} <div id="profile-like-wrapper"> {{if $profile.canlike}} - <button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;"> + <button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" > <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i> </button> {{/if}} @@ -200,6 +200,19 @@ {{foreach $items as $item}} <li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}} <a href="{{$item.url}}" >{{$item.term}}</a> +{{if $profile.canlike}}<br /> +<button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" > +<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> +</button> +{{/if}} +{{if $item.like_count}} +<div class="btn-group"> +<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> +{{if $item.likes}} +<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}">{{$liker.xchan_name}}</a></li>{{/foreach}}</ul> +{{/if}} +</div> +{{/if}} </li> {{/foreach}} </ul> diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index 2a8c06076..c48912918 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -6,8 +6,8 @@ </div> {{if $canedit}} <div class="thing-edit-links"> -<a href="thing/edit/{{$thing.term_hash}}" title="{{$edit}}"><i class="icon-pencil thing-edit-icon"></i></a> -<a href="thing/drop/{{$thing.term_hash}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></a> +<a href="thing/edit/{{$thing.term_hash}}" title="{{$edit}}" class="btn btn-default" ><i class="icon-pencil thing-edit-icon"></i></a> +<a href="thing/drop/{{$thing.term_hash}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default" ><i class="icon-remove drop-icons"></i></a> </div> <div class="thing-edit-links-end"></div> {{/if}} |