aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2016-07-20 20:50:17 +0200
committerGitHub <noreply@github.com>2016-07-20 20:50:17 +0200
commitfd507ff597b298d4b2891c2dd5ec74a9562c78be (patch)
tree2d74b0167be186bdbc77acc2da0d082dfc9153a4
parent8c2b93da72629d20bff6289ddc8b4c006fe19dd6 (diff)
parente0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272 (diff)
downloadvolse-hubzilla-fd507ff597b298d4b2891c2dd5ec74a9562c78be.tar.gz
volse-hubzilla-fd507ff597b298d4b2891c2dd5ec74a9562c78be.tar.bz2
volse-hubzilla-fd507ff597b298d4b2891c2dd5ec74a9562c78be.zip
Merge pull request #455 from anaqreon/wiki
Wiki delete page confirmation and max image width
-rw-r--r--view/theme/redbasic/css/style.css4
-rw-r--r--view/tpl/wiki.tpl3
2 files changed, 7 insertions, 0 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d61e60dc9..6cc3e2f10 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2037,3 +2037,7 @@ dl.bb-dl > dd > li {
border-style: solid;
border-width: 5px;
}
+
+#wiki-preview img {
+ max-width: 100%;
+} \ No newline at end of file
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 7617808f4..d9a4f8be3 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -311,6 +311,9 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
ev.preventDefault();
return false;
}
+ if(!confirm('Are you sure you want to delete the page: ' + window.wiki_page_name)) {
+ return;
+ }
$.post("wiki/{{$channel}}/delete/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id},
function (data) {
if (data.success) {