aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-20 17:57:42 -0700
committerredmatrix <git@macgirvin.com>2016-07-20 17:57:42 -0700
commit542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20 (patch)
tree59aa36f7dfcc89cf4b79340b909cf7dd77f1a234 /view
parentbc8c74eb422387a5537eb923c90a34c1196ce568 (diff)
parent1d90c4ea999fd3a440f2c55a90793ac452876ca2 (diff)
downloadvolse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.tar.gz
volse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.tar.bz2
volse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.zip
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
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) {