diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/widgets.css | 7 | ||||
| -rw-r--r-- | view/js/main.js | 1 | ||||
| -rwxr-xr-x | view/tpl/group_side.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/photo_item.tpl | 41 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 4 |
5 files changed, 32 insertions, 31 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index 1992aa0fd..593e051da 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -81,13 +81,8 @@ /* group */ -input.group-edit-checkbox { - margin: unset; - height: 1em; - width: 1em; -} -a.group-edit-link { +a.group-edit-tool { z-index: 1; } diff --git a/view/js/main.js b/view/js/main.js index f58d3756b..32db7ccb7 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -986,6 +986,7 @@ function updateConvItems(mode,data) { $('body').css('cursor', 'wait'); $.get('contactgroup/' + gid + '/' + cid, function(data) { $('body').css('cursor', 'auto'); + $('#group-' + gid).toggleClass('icon-check icon-check-empty'); }); } diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 6c5edba27..4afe1286f 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -5,16 +5,12 @@ {{foreach $groups as $group}} <li> {{if $group.cid}} - <a class="pull-right group-edit-link"> - <input type="checkbox" - class="{{if $group.selected}}ticked{{else}}unticked {{/if}} group-edit-checkbox" - onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;" - {{if $group.ismember}}checked="checked"{{/if}} - /> + <a class="pull-right group-edit-tool fakelink" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"/> + <i id="group-{{$group.id}}" class="{{if $group.ismember}}icon-check{{else}}icon-check-empty{{/if}}"></i> </a> {{/if}} {{if $group.edit}} - <a class="pull-right group-edit-link" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="group-edit-icon icon-pencil"></i></a> + <a class="pull-right group-edit-tool" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="group-edit-icon icon-pencil"></i></a> {{/if}} <a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a> </li> diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index e7d25fd55..16f9a76c2 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -1,22 +1,27 @@ -<div class="wall-item-outside-wrapper{{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > - <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> - <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> - </div> +<div class="wall-item-outside-wrapper {{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > + <div class="wall-item-content-wrapper {{$indent}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;"> + <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > + <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> + <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> + </div> + </div> + <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > + <div class="wall-item-author"> + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> + </div> + <div class="wall-item-content" id="wall-item-content-{{$id}}" > + <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> + <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> + </div> + {{$drop}} + <div class="wall-item-wrapper-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > - <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> - <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> - </div> - <div class="wall-item-content" id="wall-item-content-{{$id}}" > - <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> - <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> - </div> - {{$drop}} - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-comment-separator"></div> - {{$comment}} + {{$comment}} -<div class="wall-item-outside-wrapper-end{{$indent}}" ></div> + <div class="wall-item-outside-wrapper-end{{$indent}}" ></div> + </div> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index f895b3129..4a9c0dfe8 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -92,6 +92,10 @@ {{$comments}} +<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > + {{$commentbox}} +</div> + </div> {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} |