aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/pdl/mod_webpages.pdl1
-rw-r--r--view/theme/redbasic/css/style.css4
-rw-r--r--view/tpl/website_import_tools.tpl27
-rw-r--r--view/tpl/wiki.tpl3
4 files changed, 34 insertions, 1 deletions
diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl
index cef69f194..b62ec6e7c 100644
--- a/view/pdl/mod_webpages.pdl
+++ b/view/pdl/mod_webpages.pdl
@@ -1,3 +1,4 @@
[region=aside]
[widget=design_tools][/widget]
+[widget=website_import_tools][/widget]
[/region] \ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index eeaf021c1..426e8e2ee 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2037,6 +2037,8 @@ dl.bb-dl > dd > li {
border-width: 5px;
}
+#wiki-preview img {
+ max-width: 100%;
.atoken-list {
margin-right: 5px;
list-style-type: none;
@@ -2052,4 +2054,4 @@ dl.bb-dl > dd > li {
}
.zat-example {
color: red;
-} \ No newline at end of file
+}
diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl
new file mode 100644
index 000000000..dc9ba6c08
--- /dev/null
+++ b/view/tpl/website_import_tools.tpl
@@ -0,0 +1,27 @@
+<div id="website-import-tools" class="widget">
+ <h3>{{$title}}</h3>
+ <ul class="nav nav-pills nav-stacked">
+ <li>
+ <a href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+ </li>
+ <form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
+
+ <p class="descriptive-text">{{$file_import_text}}</p>
+ <div class="form-group">
+ <div class="input-group">
+ <input class="widget-input" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
+ <div class="input-group-btn">
+ <button class="btn btn-default btn-sm" type="submit" name="cloudsubmit" value="{{$select}}"><i class="fa fa-folder-open generic-icons"></i></button>
+ </div>
+ </div>
+ </div>
+
+ <!-- Or upload a zipped file containing the website -->
+ <p class="descriptive-text">{{$file_upload_text}}</p>
+ <div class="form-group">
+ <input id="website-upload-choose" type="file" name="zip_file" />
+ </div>
+ <button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Upload</button>
+ </form>
+ </ul>
+</div>
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) {