diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-12-05 20:16:19 -0500 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-12-05 20:16:19 -0500 |
commit | 8ba5cbc2b99ffed424d085b6365cbc07309ad573 (patch) | |
tree | 865cdc545673e1f5781a2ec42dbb6015ac251cf2 /view | |
parent | 3b3da24823defd89f4ed256b7c45df8b71cb0627 (diff) | |
parent | fbf13dde213dcecfdc6c6e5d95b165bb46eda85a (diff) | |
download | volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.tar.gz volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.tar.bz2 volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.zip |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'view')
-rw-r--r-- | view/css/mod_wiki.css | 8 | ||||
-rw-r--r-- | view/tpl/wikilist.tpl | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index b29957090..30cbe0896 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -29,13 +29,13 @@ padding: 7px 3px 7px 10px; } -#wikis-index th:nth-child(2), -#wikis-index td:nth-child(2){ +#wikis-index th:nth-child(3), +#wikis-index td:nth-child(3){ padding: 7px 10px 7px 7px; } -#wikis-index th:nth-child(3), -#wikis-index td:nth-child(3){ +#wikis-index th:nth-child(4), +#wikis-index td:nth-child(4){ padding: 7px 10px 7px 7px; } diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 68aa41e7c..1fb7dbec1 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -27,7 +27,8 @@ <div class="section-content-wrapper-np"> <table id="wikis-index"> <tr> - <th width="98%">{{$name}}</th> + <th width="97%">{{$name}}</th> + <th width="1%">{{$type}}</th> <th width="1%" class="wikis-index-tool"></th> {{if $owner}} <th width="1%"></th> @@ -36,6 +37,7 @@ {{foreach $wikis as $wiki}} <tr class="wikis-index-row"> <td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td> + <td>{{$wiki.mimeType}}</td> <td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td> {{if $owner}} <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td> |