diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-20 13:39:10 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-20 13:39:10 -0700 |
| commit | df0cd4dbc7fbd4d31a953144e0af75ab27447969 (patch) | |
| tree | 0d028db4f797eda31bc471ae505a1da3b7000bbf | |
| parent | a3e5307b93ea524781abd885e26a5d6c8f5c4c54 (diff) | |
| parent | d54ad9880252cf8c6d2c61a01680279741735a36 (diff) | |
| download | volse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.tar.gz volse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.tar.bz2 volse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.zip | |
Merge branch 'dev' into perms
| -rw-r--r-- | Zotlabs/Module/Acl.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Zot/Finger.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 3 |
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) { |