diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-15 00:50:31 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-11-15 00:50:31 -0800 |
| commit | e0a702df764036ae0303a49f08b2ada90ed0a842 (patch) | |
| tree | 9a10631db191b0cc29c562879cb5aff3ceba6bb1 /view | |
| parent | e990a35a91014e5874ca21dfb057b2435c9bada6 (diff) | |
| download | volse-hubzilla-e0a702df764036ae0303a49f08b2ada90ed0a842.tar.gz volse-hubzilla-e0a702df764036ae0303a49f08b2ada90ed0a842.tar.bz2 volse-hubzilla-e0a702df764036ae0303a49f08b2ada90ed0a842.zip | |
wiki: permissions issues, untranslated strings in templates and some minor changes to provide a consistent UI with the rest of the app.
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/widgets.css | 4 | ||||
| -rw-r--r-- | view/tpl/wiki_page_list.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/wikilist.tpl | 22 |
3 files changed, 19 insertions, 15 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index 2a7c57f53..10c66c213 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -151,3 +151,7 @@ li:hover .group-edit-icon { .cover-photo-subtitle { font-size: 20px; } + +a.wikilist { + z-index: 1; +} diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index c5f3ec9a0..c020f2520 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -1,12 +1,14 @@ {{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}} <div id="wiki_page_list" class="widget" > - <h3>{{$header}} - <i id="new-page-button" class="pull-right generic-icons fakelink fa fa-plus" title="New page" onclick="wiki_show_new_page_form();"></i> - </h3> + <h3>{{$header}}</h3> + <ul class="nav nav-pills nav-stacked"> + {{if $pages}} {{foreach $pages as $page}} <li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a></li> {{/foreach}} + {{/if}} + {{if $canadd}}<li><a href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i> {{$addnew}}</a></li>{{/if}} </ul> </div> {{if $not_refresh}}</div>{{/if}} diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 42452eb12..da4c4b615 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -1,17 +1,15 @@ <div id="wiki_list" class="widget"> - - <h3>{{$header}} - <i id="new-wiki-button" class="pull-right generic-icons fakelink fa fa-plus" title="New wiki" onclick="wiki_show_new_wiki_form();"></i> - </h3> - - <div> + <h3>{{$header}}</h3> + <ul class="nav nav-pills nav-stacked"> + {{if $wikis}} {{foreach $wikis as $wiki}} - <div class="form-group" id="wiki-{{$wiki.resource_id}}"> - <a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View {{$wiki.title}}"><b>{{$wiki.title}}</b></a> - <i id="edit-wiki-button" class="pull-right generic-icons fakelink fa fa-edit" onclick="wiki_show_edit_wiki_form('{{$wiki.title}}', '{{$wiki.resource_id}}');" title="Edit {{$wiki.title}}"></i> - <i class="pull-right generic-icons fakelink fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download {{$wiki.title}}"></i> - </div> + <li>{{if $owner}}<a href="#" onclick="wiki_show_edit_wiki_form('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i id="edit-wiki-button" class="fa fa-edit"></i></a>{{/if}} + <a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="{{$download}}" class="pull-right wikilist"><i class="fa fa-download"></i></a> + <a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a> + </li> {{/foreach}} - </div> + {{/if}} + {{if $owner}}<li><a href="#" class="fakelink" onclick="wiki_show_new_wiki_form(); return false;"><i id="new-wiki-button" class="fa fa-plus-circle"></i> {{$addnew}}</a></li>{{/if}} + </ul> </div> |