From cb39d9435da54239e8e36d2d53877a19c10bab83 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 4 Dec 2017 15:14:58 -0800
Subject: We only require one Update module. The rest are superfluous.

---
 view/tpl/build_query.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

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}};
-- 
cgit v1.2.3


From 157966eb115606ef1d25fc55e90cb25fec1b6333 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 5 Dec 2017 21:06:41 -0800
Subject: don't force tile photos to be square, as there's no way to sensibly
 auto-crop; increase the tile size slightly to compensate

---
 view/theme/redbasic/css/style.css | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'view')

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;
 }
-- 
cgit v1.2.3


From 44cb68a3561e6079e6185c1000753896b89c5129 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 6 Dec 2017 09:12:28 +0100
Subject: resolve merge conflict

---
 view/tpl/wiki_page_not_found.tpl | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 view/tpl/wiki_page_not_found.tpl

(limited to 'view')

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}}
-- 
cgit v1.2.3