aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-20 13:39:10 -0700
committerredmatrix <git@macgirvin.com>2016-07-20 13:39:10 -0700
commitdf0cd4dbc7fbd4d31a953144e0af75ab27447969 (patch)
tree0d028db4f797eda31bc471ae505a1da3b7000bbf /view
parenta3e5307b93ea524781abd885e26a5d6c8f5c4c54 (diff)
parentd54ad9880252cf8c6d2c61a01680279741735a36 (diff)
downloadvolse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.tar.gz
volse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.tar.bz2
volse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.zip
Merge branch 'dev' into perms
Diffstat (limited to 'view')
-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) {