diff options
| author | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
| commit | c4221f32738dac51f691d5be1bebd2b50318521e (patch) | |
| tree | e353242b42ca2942d7fe6d29888568c8bfe821ee /view/tpl | |
| parent | 6679734135fb04f4a7beccb81663bf1e9574f062 (diff) | |
| parent | 2376d2140ab6eeb8a44d7582a52978520844e229 (diff) | |
| download | volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.gz volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.bz2 volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.zip | |
Merge branch 'master' into tres
Conflicts:
include/notifier.php
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/blocklist.tpl | 10 | ||||
| -rw-r--r-- | view/tpl/layoutlist.tpl | 62 | ||||
| -rwxr-xr-x | view/tpl/photosajax.tpl | 2 |
3 files changed, 57 insertions, 17 deletions
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index f599aade7..85e4865ea 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -16,7 +16,8 @@ <div id="pagelist-content-wrapper" class="section-content-wrapper-np"> <table id="block-list-table"> <tr> - <th width="97%">{{$name}}</th> + <th width="1%">{{$name}}</th> + <th width="94%">{{$blocktitle}}</th> <th width="1%"></th> <th width="1%"></th> <th width="1%"></th> @@ -28,11 +29,14 @@ <tr id="block-list-item-{{$item.url}}"> <td> {{if $view}} - <a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a> + <a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a> {{else}} - {{$item.title}} + {{$item.name}} {{/if}} </td> + <td> + {{$item.title}} + </td> <td class="webpage-list-tool"> {{if $edit}} <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index cd146377d..ab7408eae 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -15,19 +15,55 @@ {{/if}} {{if $pages}} - <div id="pagelist-content-wrapper" class="generic-content-wrapper"> +<div id="pagelist-content-wrapper" class="section-content-wrapper-np"> + <table id="layout-list-table"> + <tr> + <th width="1%">{{$name}}</th> + <th width="94%">{{$descr}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$created}}</th> + <th width="1%" class="hidden-xs">{{$edited}}</th> + </tr> {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - <div class="page-list-item"> - {{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.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} - {{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons btn btn-default"></i></a> {{/if}} - {{*if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if*}} - {{$item.title}} - </div> - {{/foreach}} + {{foreach $items as $item}} + <tr id="layout-list-item-{{$item.url}}"> + <td> + {{if $view}} + <a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a> + {{else}} + {{$item.title}} + {{/if}} + </td> + <td> + {{$item.descr}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $item.bb_element}} + <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a> + {{/if}} + </td> + <td class="webpage-list-tool"> + {{if $edit}} + <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a> + {{/if}} + </td> + <td class="hidden-xs"> + {{$item.created}} + </td> + <td class="hidden-xs"> + {{$item.edited}} + </td> + </tr> {{/foreach}} - </div> - - <div class="clear"></div> + {{/foreach}} + </table> +</div> +<div class="clear"></div> {{/if}} diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index 632aab2b3..705cb6c75 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,4 +1,4 @@ {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} +{{include file="photo_top.tpl"}} {{/foreach}} <script>justifyPhotosAjax()</script> |