aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-04 15:12:04 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-04 15:12:04 -0400
commit344c293424716cc53eed2fea9eb3a7512e725516 (patch)
tree8fa8361f1b5a0286c9177c5ce61a069b85fe4d6e /view
parentb5d8443f59d96cece2357b6a791fe8ffe854dd95 (diff)
downloadvolse-hubzilla-344c293424716cc53eed2fea9eb3a7512e725516.tar.gz
volse-hubzilla-344c293424716cc53eed2fea9eb3a7512e725516.tar.bz2
volse-hubzilla-344c293424716cc53eed2fea9eb3a7512e725516.zip
Wiki and page filenames are abstracted from their displayed names. Special characters do not seem to break things.
Diffstat (limited to 'view')
-rw-r--r--view/tpl/wiki.tpl4
-rw-r--r--view/tpl/wiki_page_list.tpl2
-rw-r--r--view/tpl/wikilist.tpl2
3 files changed, 4 insertions, 4 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 86c503bb3..384dc796d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -139,8 +139,8 @@
ev.preventDefault();
});
-function wiki_delete_wiki(wikiName, resource_id) {
- if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiName))) {
+function wiki_delete_wiki(wikiHtmlName, resource_id) {
+ if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiHtmlName))) {
return;
}
$.post("wiki/{{$channel}}/delete/wiki", {resource_id: resource_id}, function (data) {
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index c941e4a08..1c3254465 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -3,7 +3,7 @@
<h3>{{$header}}</h3>
<ul class="nav nav-pills nav-stacked">
{{foreach $pages as $page}}
- <li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page}}">{{$page}}</a></li>
+ <li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a></li>
{{/foreach}}
</ul>
</div>
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 91ac1a7b3..be353ca5e 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -7,7 +7,7 @@
<b>{{$wiki.title}}</b><b class="fa fa-caret-down pull-right"></b>
</a>
<ul class="dropdown-menu pull-right">
- <li><a href="/wiki/{{$channel}}/{{$wiki.title}}/Home.md" title="View {{$wiki.title}}">View</a></li>
+ <li><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View {{$wiki.title}}">View</a></li>
{{if $showControls}}
<li class="divider"></li>
<li><a href="#" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}">Delete wiki</a></li>