Merge pull request #15 from redmatrix/dev

Dev

14 files changed, 130 insertions, 85 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 77a600deb..f7ab3dcdd 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -286,7 +286,6 @@ img.smiley.emoji:hover {
 	height: 32px;
 }
 
-
 .checklist input {
 	margin: 0px;
 	vertical-align: middle;
@@ -296,6 +295,15 @@ img.smiley.emoji:hover {
 	padding: 15px;
 }
 
+.view-summary {
+	margin-bottom: 1rem;
+}
+
+.view-article {
+	margin-top: 1rem;
+}
+
+
 #filer_save {
 	margin-left: 15px;
 }
diff --git a/view/css/mod_profile_photo.css b/view/css/mod_profile_photo.css
index 5540b5fae..1b7e15194 100644
--- a/view/css/mod_profile_photo.css
+++ b/view/css/mod_profile_photo.css
@@ -9,4 +9,12 @@
 
 #profile-photo-submit-wrapper {
 	clear: both;
-}
\ No newline at end of file
+}
+
+#profile-photo-wrapper {
+	height: 300px;
+	width: 300px;
+	max-width: 300px;
+	max-height: 300px;
+	overflow: hidden;
+}
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css
index 4e4c71e1d..e0b02b414 100644
--- a/view/css/mod_wiki.css
+++ b/view/css/mod_wiki.css
@@ -48,3 +48,24 @@ td i {
 	padding-right: 10px;
 }
 
+pre code {
+	background: #F5F5F5;
+	font-family: Courier, monospace;
+	font-size: 1em;
+	padding: 1em 1.5em;
+	display: block;
+	white-space: pre-wrap;
+}
+
+code {
+	background: #F5F5F5;
+	font-family: Courier, monospace;
+	font-size: 1em;
+	display: inline;
+	padding: 0.2em 0.2em;
+	white-space: pre-wrap;
+}
+
+#wiki-content-container code {
+	background: #F5F5F5;
+}
\ No newline at end of file
diff --git a/view/de-de/hmessages.po b/view/de-de/hmessages.po
index e7c962bbd..f68a96c22 100644
--- a/view/de-de/hmessages.po
+++ b/view/de-de/hmessages.po
@@ -12377,27 +12377,27 @@ msgstr "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlasse
 
 #: ../../include/js_strings.php:27
 msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+msgstr "vor"
 
 #: ../../include/js_strings.php:28
 msgid "timeago.prefixFromNow"
-msgstr " "
+msgstr "in"
 
 #: ../../include/js_strings.php:29
-msgid "ago"
-msgstr "her"
+msgid "timeago.suffixAgo"
+msgstr "NONE"
 
 #: ../../include/js_strings.php:30
-msgid "from now"
-msgstr "von jetzt"
+msgid "timeago.suffixFromNow"
+msgstr "NONE"
 
 #: ../../include/js_strings.php:31
 msgid "less than a minute"
-msgstr "weniger als eine Minute"
+msgstr "weniger als einer Minute"
 
 #: ../../include/js_strings.php:32
 msgid "about a minute"
-msgstr "ungefähr eine Minute"
+msgstr "ungefähr einer Minute"
 
 #: ../../include/js_strings.php:33
 #, php-format
@@ -12406,7 +12406,7 @@ msgstr "%d Minuten"
 
 #: ../../include/js_strings.php:34
 msgid "about an hour"
-msgstr "ungefähr eine Stunde"
+msgstr "ungefähr einer Stunde"
 
 #: ../../include/js_strings.php:35
 #, php-format
@@ -12415,30 +12415,30 @@ msgstr "ungefähr %d Stunden"
 
 #: ../../include/js_strings.php:36
 msgid "a day"
-msgstr "ein Tag"
+msgstr "einem Tag"
 
 #: ../../include/js_strings.php:37
 #, php-format
 msgid "%d days"
-msgstr "%d Tage"
+msgstr "%d Tagen"
 
 #: ../../include/js_strings.php:38
 msgid "about a month"
-msgstr "ungefähr einen Monat"
+msgstr "ungefähr einem Monat"
 
 #: ../../include/js_strings.php:39
 #, php-format
 msgid "%d months"
-msgstr "%d Monate"
+msgstr "%d Monaten"
 
 #: ../../include/js_strings.php:40
 msgid "about a year"
-msgstr "ungefähr ein Jahr"
+msgstr "ungefähr einem Jahr"
 
 #: ../../include/js_strings.php:41
 #, php-format
 msgid "%d years"
-msgstr "%d Jahre"
+msgstr "%d Jahren"
 
 #: ../../include/js_strings.php:42
 msgid " "
diff --git a/view/de-de/hstrings.php b/view/de-de/hstrings.php
index 61db3fb5d..e87f660f0 100644
--- a/view/de-de/hstrings.php
+++ b/view/de-de/hstrings.php
@@ -1,7 +1,7 @@
 <?php
 
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
+if(! function_exists("string_plural_select_de_de")) {
+function string_plural_select_de_de($n){
 	return ($n != 1);;
 }}
 App::$rtl = 0;
@@ -2790,21 +2790,21 @@ App::$strings["Rate This Channel (this is public)"] = "Diesen Kanal bewerten (ö
 App::$strings["Describe (optional)"] = "Beschreibung (optional)";
 App::$strings["Please enter a link URL"] = "Gib eine URL ein:";
 App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?";
-App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
-App::$strings["timeago.prefixFromNow"] = " ";
-App::$strings["ago"] = "her";
-App::$strings["from now"] = "von jetzt";
-App::$strings["less than a minute"] = "weniger als eine Minute";
-App::$strings["about a minute"] = "ungefähr eine Minute";
+App::$strings["timeago.prefixAgo"] = "vor";
+App::$strings["timeago.prefixFromNow"] = "in";
+App::$strings["timeago.suffixAgo"] = "NONE";
+App::$strings["timeago.suffixFromNow"] = "NONE";
+App::$strings["less than a minute"] = "weniger als einer Minute";
+App::$strings["about a minute"] = "ungefähr einer Minute";
 App::$strings["%d minutes"] = "%d Minuten";
-App::$strings["about an hour"] = "ungefähr eine Stunde";
+App::$strings["about an hour"] = "ungefähr einer Stunde";
 App::$strings["about %d hours"] = "ungefähr %d Stunden";
-App::$strings["a day"] = "ein Tag";
-App::$strings["%d days"] = "%d Tage";
-App::$strings["about a month"] = "ungefähr einen Monat";
-App::$strings["%d months"] = "%d Monate";
-App::$strings["about a year"] = "ungefähr ein Jahr";
-App::$strings["%d years"] = "%d Jahre";
+App::$strings["a day"] = "einem Tag";
+App::$strings["%d days"] = "%d Tagen";
+App::$strings["about a month"] = "ungefähr einem Monat";
+App::$strings["%d months"] = "%d Monaten";
+App::$strings["about a year"] = "ungefähr einem Jahr";
+App::$strings["%d years"] = "%d Jahren";
 App::$strings[" "] = " ";
 App::$strings["timeago.numbers"] = "timeago.numbers";
 App::$strings["__ctx:long__ May"] = "Mai";
diff --git a/view/js/main.js b/view/js/main.js
index 02b0f125c..f6fe475d8 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -357,6 +357,9 @@ function closeMenu(theID) {
 function markRead(notifType) {
 	$.get('ping?f=&markRead='+notifType);
 	$('.' + notifType + '-button').hide();
+	$('#nav-' + notifType + '-sub').removeClass('show');
+	sessionStorage.removeItem(notifType + '_notifications_cache');
+	sessionStorage.removeItem('notification_open');
 	if(timer) clearTimeout(timer);
 	timer = setTimeout(updateInit,2000);
 }
@@ -436,6 +439,7 @@ function handleNotifications(data) {
 
 		if(item == 0) {
 			$('.' + index + '-button').fadeOut();
+			sessionStorage.removeItem(index + '_notifications_cache');
 		} else {
 			$('.' + index + '-button').fadeIn();
 			$('.' + index + '-update').html(item);
diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js
index e670e1a35..7ae59032a 100644
--- a/view/js/mod_new_channel.js
+++ b/view/js/mod_new_channel.js
@@ -1,5 +1,7 @@
 	$(document).ready(function() {
-//		$("#id_permissions_role").sSelect();
+
+		$("#newchannel-submit-button").attr('disabled','disabled');
+
 		$("#id_name").blur(function() {
 			$("#name-spinner").show();
 			var zreg_name = $("#id_name").val();
@@ -13,17 +15,26 @@
 			});
 		});
 
-		$("#id_nickname").blur(function() {
-			$("#nick-spinner").show();
-			var zreg_nick = $("#id_nickname").val();
-			$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
-				$("#id_nickname").val(data);
-				if(data.error) {
-					$("#help_nickname").html("");
-					zFormError("#help_nickname",data.error);
-				}
-				$("#nick-spinner").hide();
-			});
+		$("#id_nickname").click(function() {
+			$("#newchannel-submit-button").attr('disabled','disabled');
 		});
 
 	});
+
+
+	function validate_channel() {
+		$("#nick-spinner").show();
+		var zreg_nick = $("#id_nickname").val();
+		$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
+			$("#id_nickname").val(data);
+			if(data.error) {
+				$("#help_nickname").html("");
+				zFormError("#help_nickname",data.error);
+			}
+			else {
+				$("#newchannel-submit-button").removeAttr('disabled');
+			}
+			$("#nick-spinner").hide();
+		});
+
+	}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b0a109c92..1611cda60 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -381,14 +381,9 @@ footer {
 	margin: 15px 0px;
 }
 
-#cropimage-wrapper, #cropimage-preview-wrapper {
-	float: left;
-	padding: 30px;
-}
-
-#crop-image-form {
-	margin-top: 30px;
-	clear: both;
+#cropimage-wrapper,
+#cropimage-preview-wrapper {
+	margin-bottom: 10px;
 }
 
 .fn {
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}}