diff options
| author | friendica <info@friendica.com> | 2015-01-27 20:00:43 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-27 20:00:43 -0800 |
| commit | a2cdd1499c968c31ae1b95933231f80be5fc639b (patch) | |
| tree | 231780d92f46a0f265e79fa478c3b7e7fc84d085 /view | |
| parent | 0bfbe6d61d3c6250a162a29d2cdb0ec78ad02f1d (diff) | |
| parent | 145b30adfc21b7f29d1431ebd1e2e0f4ebd853bf (diff) | |
| download | volse-hubzilla-a2cdd1499c968c31ae1b95933231f80be5fc639b.tar.gz volse-hubzilla-a2cdd1499c968c31ae1b95933231f80be5fc639b.tar.bz2 volse-hubzilla-a2cdd1499c968c31ae1b95933231f80be5fc639b.zip | |
Merge branch 'master' into tres
Conflicts:
include/socgraph.php
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 4 | ||||
| -rw-r--r-- | view/css/mod_sharedwithme.css | 24 | ||||
| -rw-r--r-- | view/tpl/sharedwithme.tpl | 24 |
3 files changed, 52 insertions, 0 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 7a5ffc2f7..8bc71bb6d 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -195,6 +195,10 @@ a.wall-item-name-link { clear: both; } +.shared_header { + margin-bottom: 20px; +} + /* comment_item */ .comment-edit-text-empty, .comment-edit-text-full { diff --git a/view/css/mod_sharedwithme.css b/view/css/mod_sharedwithme.css new file mode 100644 index 000000000..79fe0d7a9 --- /dev/null +++ b/view/css/mod_sharedwithme.css @@ -0,0 +1,24 @@ +#cloud-index { + width: 100%; +} + +#cloud-index td:nth-child(1){ + padding: 7px 3px 7px 10px; +} + +#cloud-index th:nth-child(4), +#cloud-index td:nth-child(4){ + padding: 7px 3px; + white-space: nowrap; +} + +#cloud-index th:nth-child(5), +#cloud-index td:nth-child(5){ + padding: 7px 10px 7px 7px; + white-space: nowrap; +} + +.cloud-index-tool { + padding: 7px 10px; +} + diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl new file mode 100644 index 000000000..1aeb9d4d7 --- /dev/null +++ b/view/tpl/sharedwithme.tpl @@ -0,0 +1,24 @@ +<div class="section-title-wrapper"> + <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i> {{$dropall}}</a> + <h2>{{$header}}</h2> +</div> +<div class="generic-content-wrapper section-content-wrapper-np"> + <table id="cloud-index"> + <tr> + <th width="1%"></th> + <th width="92%">{{$name}}</th> + <th width="1%"></th> + <th width="1%" class="hidden-xs">{{$size}}</th> + <th width="1%" class="hidden-xs">{{$lastmod}}</th> + </tr> + {{foreach $items as $item}} + <tr id="cloud-index-{{$item.id}}"> + <td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td> + <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a></td> + <td class="cloud-index-tool"><a href="/sharedwithme/{{$item.id}}/drop" title="{{$drop}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td> + <td class="hidden-xs">{{$item.objfilesize}}</td> + <td class="hidden-xs">{{$item.objedited}}</td> + </tr> + {{/foreach}} + </table> +</div> |