aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-12-06 14:29:36 -0800
committerzotlabs <mike@macgirvin.com>2017-12-06 14:29:36 -0800
commite5653945d35e00ae1821fa93e502cc4555519735 (patch)
tree05c1a273a378ccf02bc19cfb32c8f5be7391abff /view
parent0a55d6d51143acbf1084104d1626c7a4b88e6c15 (diff)
parenta604236d89a843a10af1a87f5e9a5cdac153b3ab (diff)
downloadvolse-hubzilla-e5653945d35e00ae1821fa93e502cc4555519735.tar.gz
volse-hubzilla-e5653945d35e00ae1821fa93e502cc4555519735.tar.bz2
volse-hubzilla-e5653945d35e00ae1821fa93e502cc4555519735.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css17
-rwxr-xr-xview/tpl/build_query.tpl2
-rw-r--r--view/tpl/wiki_page_not_found.tpl34
3 files changed, 44 insertions, 9 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 33536dee4..5728d7948 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1728,32 +1728,33 @@ dl.bb-dl > dd > li {
.cloud-container {
float: left;
- width: 80px;
- height: 80px;
+ width: 100px;
+ height: 110px;
margin: 5px;
}
.cloud-icon-container {
- width: 48px;
- height: 48px;
+ width: 64px;
+ height: 64px;
border: 1px solid #eee;
border-radius: $radius;
}
.cloud-icon i {
- font-size: 32px;
+ font-size: 42px;
color: #888;
margin-top: 8px;
+ margin-left: 6px;
}
.cloud-icon img {
- width: 48px;
- height: 48px;
+ max-width: 64px;
+ max-height: 64px;
border-radius: $radius;
}
.cloud-title {
- width: 78px;
+ width: 98px;
height: 36px;
overflow: hidden;
}
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index bfe5c8a08..1d938d395 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -1,6 +1,6 @@
<script>
- var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
+ var bParam_cmd = "{{$baseurl}}/update/{{$pgtype}}";
var bParam_uid = {{$uid}};
diff --git a/view/tpl/wiki_page_not_found.tpl b/view/tpl/wiki_page_not_found.tpl
new file mode 100644
index 000000000..de98efdf8
--- /dev/null
+++ b/view/tpl/wiki_page_not_found.tpl
@@ -0,0 +1,34 @@
+ <h3>Page does not exist</h3>
+ <br /><br /><br />
+ {{if $canadd}}
+ <form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
+ <input type="hidden" name="resource_id" value="{{$resource_id}}">
+ {{include file="field_input.tpl" field=$pageName}}
+ {{if $typelock}}
+ <input id="id_mimetype" type="hidden" name="mimetype" value="{{$lockedtype}}">
+ {{else}}
+ <div id="wiki_missing_page_options" style="display: none">
+ {{$mimetype}}
+ </div>
+ <div class="float-right fakelink" onClick="openClose('wiki_missing_page_options')">
+ {{$options}}
+ </div>
+ {{/if}}
+ <button id="create-missing-page-submit" class="btn btn-primary" type="submit" name="submit" >{{$submit}}</button>
+ </form>
+
+<script>
+ $('#create-missing-page-submit').click(function (ev) {
+ $.post("wiki/{{$channel_address}}/create/page", {pageName: $('#id_missingPageName').val(), resource_id: window.wiki_resource_id, mimetype: $('#id_mimetype').val() },
+ function(data) {
+ if(data.success) {
+ window.location = data.url;
+ } else {
+ window.console.log('Error creating page. ('+data.message+')');
+ }
+ }, 'json');
+ ev.preventDefault();
+ });
+
+</script>
+{{/if}}