Merge pull request #15 from redmatrix/dev

Dev

6 files changed, 31 insertions, 33 deletions

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 81c182e1b..d72258fa0 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -215,7 +215,7 @@
 					<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
 						{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
 						{{if $vcard.emails.0.address}}<span class="vcard-email-preview d-none d-md-table-cell"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
-						{{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
+						{{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a></span>{{/if}}
 					</span>
 					<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
 				</div>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 0eabe620d..78e3ee245 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -84,6 +84,7 @@
 	{{include file="field_checkbox.tpl" field=$force_publish}}
 	{{include file="field_checkbox.tpl" field=$disable_discover_tab}}
 	{{include file="field_checkbox.tpl" field=$site_firehose}}
+	{{include file="field_checkbox.tpl" field=$open_pubstream}}
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index d35546ec6..a8b8207cb 100755
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
@@ -6,7 +6,7 @@
 <img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
 </div>
 <div id="cropimage-preview-wrapper" >
-<div id="previewWrap" class="crop-preview" style="height: 300px; width: 300px; max-width: 300px; max-height: 300px; overflow: hidden;"></div>
+<div id="previewWrap" class="crop-preview d-lg-none" style="height: 300px; width: 300px; max-width: 300px; max-height: 300px; overflow: hidden;"></div>
 </div>
 
 <script type="text/javascript" language="javascript">
@@ -14,18 +14,17 @@
 
 var image = document.getElementById('croppa');
 var cropper = new Cropper(image, {
-  aspectRatio: 1 / 1,
-  viewMode: 1,
-  preview: '.crop-preview',
-  crop: function(e) {
-		$( 'x1' ).value = e.detail.x;
-		$( 'y1' ).value = e.detail.y;
-		$( 'x2' ).value = e.detail.x + e.detail.width;
-		$( 'y2' ).value = e.detail.y + e.detail.height;
-		$( 'width' ).value = e.detail.scaleX;
-		$( 'height' ).value = e.detail.scaleY;
-
-  }
+	aspectRatio: 1 / 1,
+	viewMode: 1,
+	preview: '#profile-photo-wrapper, .crop-preview',
+	crop: function(e) {
+		$( '#x1' ).val(e.detail.x);
+		$( '#y1' ).val(e.detail.y);
+		$( '#x2' ).val(e.detail.x + e.detail.width);
+		$( '#y2' ).val(e.detail.y + e.detail.height);
+		$( '#width' ).val(e.detail.scaleX);
+		$( '#height' ).val(e.detail.scaleY);
+	}
 });
 
 </script>
diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl
index 8888a967a..ba91a2cce 100755
--- a/view/tpl/cropcover.tpl
+++ b/view/tpl/cropcover.tpl
@@ -13,18 +13,17 @@
 
 var image = document.getElementById('croppa');
 var cropper = new Cropper(image, {
-  aspectRatio: 2.75 / 1,
-  viewMode: 1,
-  preview: '.crop-preview',
-  crop: function(e) {
-	$( 'x1' ).value = e.detail.x;
-	$( 'y1' ).value = e.detail.y;
-	$( 'x2' ).value = e.detail.x + e.detail.width;
-	$( 'y2' ).value = e.detail.y + e.detail.height;
-	$( 'width' ).value = e.detail.scaleX;
-	$( 'height' ).value = e.detail.scaleY;
-
-  }
+	aspectRatio: 2.75 / 1,
+	viewMode: 1,
+	preview: '.crop-preview',
+	  crop: function(e) {
+		$( '#x1' ).val(e.detail.x);
+		$( '#y1' ).val(e.detail.y);
+		$( '#x2' ).val(e.detail.x + e.detail.width);
+		$( '#y2' ).val(e.detail.y + e.detail.height);
+		$( '#width' ).val(e.detail.scaleX);
+		$( '#height' ).val(e.detail.scaleY);
+	}
 });
 
 </script>
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index c4837064f..f415e4e2c 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -24,7 +24,9 @@
 			{{include file="field_input.tpl" field=$nickname}}
 			<div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div>
 
-			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
+			<button class="btn btn-secondary" name="validate" id="newchannel-validate-button" value="{{$validate}}" onclick="validate_channel(); return false;">{{$validate}}</button>
+
+			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" >{{$submit}}</button>
 			<div id="newchannel-submit-end" class="clear"></div>
 
 			<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index d1e6e0609..b0751eb5f 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -6,7 +6,7 @@
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-			{{if $theme || $mobile_theme}}
+			{{if $theme}}
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
 					<h3>
@@ -23,9 +23,6 @@
 						{{if $schema}}
 							{{include file="field_select.tpl" field=$schema}}
 						{{/if}}
-						{{if $mobile_theme}}
-							{{include file="field_themeselect.tpl" field=$mobile_theme}}
-						{{/if}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
@@ -41,7 +38,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="custom-settings-content" class="collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
+				<div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
 					<div class="section-content-tools-wrapper">
 						{{if $theme_config}}
 							{{$theme_config}}
@@ -57,7 +54,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="content-settings-content" class="collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
+				<div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
 					<div class="section-content-wrapper">
 						{{include file="field_input.tpl" field=$ajaxint}}
 						{{include file="field_input.tpl" field=$itemspage}}