diff options
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/app.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/myapps.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/show_thing.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/thing_edit.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/thing_input.tpl | 9 |
6 files changed, 27 insertions, 7 deletions
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index cebc17d45..727be5eba 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,4 +1,5 @@ <div class="app-container"> +<div class="app-detail"> <a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" /> <div class="app-name" style="text-align:center;">{{$app.name}}</div> </a> @@ -6,7 +7,9 @@ {{if $purchase}} <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a> {{/if}} +</div> {{if $install || $update || $delete }} +<div class="app-tools"> <form action="{{$hosturl}}appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}} @@ -16,4 +19,5 @@ {{/if}} {{/if}} </div> +</div> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index 1a591f9f8..ccb995849 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -1,9 +1,7 @@ <h3>{{$title}}</h3> {{foreach $apps as $ap}} -<div class="app-container"> {{$ap}} -</div> {{/foreach}} <div class="clear"></div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 1f99bf1ad..a4413e536 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -204,7 +204,7 @@ <b>{{$profile.fullname.1}} {{$key}}</b> <ul class="profile-thing-list"> {{foreach $items as $item}} - <li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}} + <li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" /></a>{{/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}}" > diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index 9aacc8958..c98003ea2 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -1,13 +1,13 @@ <h2>{{$header}}</h2> {{if $thing}} <div class="thing-show"> -{{if $thing.imgurl}}<img src="{{$thing.imgurl}}" width="175" height="175" alt="{{$thing.term}}" />{{/if}} -<a href="{{$thing.url}}" >{{$thing.term}}</a> +{{if $thing.obj_imgurl}}<a href="{{$thing.obj_url}}" ><img src="{{$thing.obj_imgurl}}" width="175" height="175" alt="{{$thing.obj_term}}" /></a>{{/if}} +<a href="{{$thing.obj_url}}" >{{$thing.obj_term}}</a> </div> {{if $canedit}} <div class="thing-edit-links"> -<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-trash drop-icons"></i></a> +<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-default" ><i class="icon-pencil thing-edit-icon"></i></a> +<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default" ><i class="icon-trash drop-icons"></i></a> </div> <div class="thing-edit-links-end"></div> {{/if}} diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl index b170f152c..d513d2855 100644 --- a/view/tpl/thing_edit.tpl +++ b/view/tpl/thing_edit.tpl @@ -29,5 +29,14 @@ <div class="thing-end"></div> +{{$aclselect}} + +{{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> +{{/if}} + + <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl index e93a1aa65..22f8f5cb6 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -29,5 +29,14 @@ <div class="thing-end"></div> +{{$aclselect}} + +{{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> +{{/if}} + + <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> </form> |