diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-07-20 22:00:58 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-07-20 22:00:58 +0200 |
| commit | 1d90c4ea999fd3a440f2c55a90793ac452876ca2 (patch) | |
| tree | 1f10bb909890308afea7762fe017cef5128f41ca | |
| parent | 4da005e209624b43610aeefe30d7a9f9fe0ac7c0 (diff) | |
| parent | c3149a8d59ec4d86f6da4bfc4cb60a273aac053b (diff) | |
| download | volse-hubzilla-1d90c4ea999fd3a440f2c55a90793ac452876ca2.tar.gz volse-hubzilla-1d90c4ea999fd3a440f2c55a90793ac452876ca2.tar.bz2 volse-hubzilla-1d90c4ea999fd3a440f2c55a90793ac452876ca2.zip | |
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 3 |
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) { |