aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Acl.php3
-rw-r--r--Zotlabs/Zot/Finger.php2
-rw-r--r--view/theme/redbasic/css/style.css4
-rw-r--r--view/tpl/wiki.tpl3
4 files changed, 10 insertions, 2 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 4e746e218..03dc6c5d3 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -237,8 +237,9 @@ class Acl extends \Zotlabs\Web\Controller {
}
}
elseif($type == 'm') {
+
$r = array();
- $z = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
+ $z = q("SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d
and xchan_deleted = 0
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php
index 9d373b2e6..e7603442f 100644
--- a/Zotlabs/Zot/Finger.php
+++ b/Zotlabs/Zot/Finger.php
@@ -127,4 +127,4 @@ class Finger {
return $x;
}
-} \ No newline at end of file
+}
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) {