diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/widgets.css | 10 | ||||
| -rwxr-xr-x | view/tpl/group_side.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/siteinfo.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/viewcontact_template.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/webpagelist.tpl | 5 |
6 files changed, 27 insertions, 12 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index 5176c6934..1992aa0fd 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -81,10 +81,18 @@ /* group */ +input.group-edit-checkbox { + margin: unset; + height: 1em; + width: 1em; +} + +a.group-edit-link { + z-index: 1; +} .group-edit-icon { opacity: 0; - z-index: 1; } li:hover .group-edit-icon { diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 3701f979e..6c5edba27 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -5,14 +5,16 @@ {{foreach $groups as $group}} <li> {{if $group.cid}} - <input type="checkbox" - class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" - onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;" - {{if $group.ismember}}checked="checked"{{/if}} - /> + <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> {{/if}} {{if $group.edit}} - <a class="pull-right group-edit-icon" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="icon-pencil"></i></a> + <a class="pull-right group-edit-link" 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/msg-header.tpl b/view/tpl/msg-header.tpl index b6cff7c74..503e4c8cc 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -49,7 +49,7 @@ else <script> $(document).ready(function() { var uploader = new window.AjaxUpload( - 'prvmail-upload', + 'prvmail-upload-wrapper', { action: 'wall_upload/{{$nickname}}', name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, @@ -61,7 +61,7 @@ else ); var file_uploader = new window.AjaxUpload( - 'prvmail-attach', + 'prvmail-attach-wrapper', { action: 'wall_attach/{{$nickname}}', name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index d956a7228..a6105227e 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -4,6 +4,9 @@ {{if $version}} <p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p> {{/if}} +{{if $tag}} +<p>Tag: {{$tag}}</p> +{{/if}} <p>{{$web_location}}</p> <p>{{$visit}}</p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl index 18fed6bb4..cde24525c 100755 --- a/view/tpl/viewcontact_template.tpl +++ b/view/tpl/viewcontact_template.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper generic-content-wrapper-styled"> <h3>{{$title}}</h3> {{foreach $contacts as $contact}} @@ -5,5 +6,5 @@ {{/foreach}} <div id="view-contact-end"></div> - {{$paginate}} +</div> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 85c4b723e..8335ebd62 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,6 +1,7 @@ +{{$listtitle}} {{if $pages}} - <div id="pagelist-content-wrapper"> + <div id="pagelist-content-wrapper" class="generic-content-wrapper-styled"> <table class="webpage-list-table"> <tr><td>{{$actions_txt}}</td><td>{{$pagelink_txt}}</td><td>{{$title_txt}}</td><td>{{$created_txt}}</td><td>{{$edited_txt}}</td></tr> {{foreach $pages as $key => $items}} @@ -9,7 +10,7 @@ <td> {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} - {{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}} </td> <td> {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> |