Merge https://github.com/redmatrix/hubzilla into pending_merge

9 files changed, 38 insertions, 26 deletions

diff --git a/doc/credits.bb b/doc/credits.bb
index 200f1fc85..5219d7bf5 100644
--- a/doc/credits.bb
+++ b/doc/credits.bb
@@ -14,7 +14,7 @@ tommy tomson
 Simon
 zottel
 Christian Vogeley
-jeroenpraat
+Jeroen van Riet Paap (jeroenpraat)
 Michael Vogel
 erik
 Zach Prezkuta
diff --git a/include/widgets.php b/include/widgets.php
index 3e6fdb04c..0f61a04a0 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -642,7 +642,7 @@ function widget_conversations($arr) {
 				'subject'      => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
 				'delete'       => t('Delete conversation'),
 				'body'         => $rr['body'],
-				'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')),
+				'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
 				'seen'         => $rr['seen'],
 				'selected'     => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
 			);
diff --git a/mod/mail.php b/mod/mail.php
index 884c41565..536149a28 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -335,7 +335,7 @@ function mail_content(&$a) {
 			'recall' => t('Recall message'),
 			'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false),
 			'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''),
-			'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
+			'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'),
 		);
 				
 		$seen = $message['seen'];
diff --git a/view/js/main.js b/view/js/main.js
index 527e6716a..8bd4357cc 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1166,7 +1166,6 @@ $(document).ready(function() {
 		numbers       : aStr['t17'],
 	};
 
-	$(".autotime").timeago();
 	$("#toc").toc();
 });
 
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 36b22138f..561df7229 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -2,4 +2,5 @@ $(document).ready(function() {
 	$("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
 		$("#recip-complete").val(data.xid);
 	});
+	$(".autotime").timeago()
 }); 
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 89a0670ec..3c6739909 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-30 00:03-0700\n"
-"PO-Revision-Date: 2015-10-31 20:03+0000\n"
+"PO-Revision-Date: 2015-11-03 20:14+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -569,11 +569,11 @@ msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde g
 
 #: ../../include/features.php:61
 msgid "Enable Voting Tools"
-msgstr "Stemmen inschakelen"
+msgstr "Peilingen inschakelen"
 
 #: ../../include/features.php:61
 msgid "Provide a class of post which others can vote on"
-msgstr "Creëert een berichtenoptie zodat anderen op jouw vraag kunnen stemmen."
+msgstr "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen."
 
 #: ../../include/features.php:62
 msgid "Delayed Posting"
@@ -3476,7 +3476,7 @@ msgstr "locatie instellen"
 
 #: ../../include/conversation.php:1207 ../../mod/editpost.php:126
 msgid "Toggle voting"
-msgstr "Stemmen in- of uitschakelen"
+msgstr "Peiling in- of uitschakelen"
 
 #: ../../include/conversation.php:1210 ../../mod/editblock.php:149
 #: ../../mod/editpost.php:125 ../../mod/editlayout.php:147
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index f48043c76..366167657 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -121,8 +121,8 @@ $a->strings["Channel Sources"] = "Kanaalbronnen";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren.";
 $a->strings["Even More Encryption"] = "Extra encryptie";
 $a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel.";
-$a->strings["Enable Voting Tools"] = "Stemmen inschakelen";
-$a->strings["Provide a class of post which others can vote on"] = "Creëert een berichtenoptie zodat anderen op jouw vraag kunnen stemmen.";
+$a->strings["Enable Voting Tools"] = "Peilingen inschakelen";
+$a->strings["Provide a class of post which others can vote on"] = "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen.";
 $a->strings["Delayed Posting"] = "Berichten uitstellen";
 $a->strings["Allow posts to be published at a later date"] = "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden.";
 $a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter";
@@ -807,7 +807,7 @@ $a->strings["Insert audio link"] = "Audiolink invoegen";
 $a->strings["audio link"] = "audiolink";
 $a->strings["Set your location"] = "Locatie instellen";
 $a->strings["set location"] = "locatie instellen";
-$a->strings["Toggle voting"] = "Stemmen in- of uitschakelen";
+$a->strings["Toggle voting"] = "Peiling in- of uitschakelen";
 $a->strings["Clear browser location"] = "Locatie van webbrowser wissen";
 $a->strings["clear location"] = "locatie wissen";
 $a->strings["Title (optional)"] = "Titel (optioneel)";
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 7020309fc..9574df182 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -119,26 +119,38 @@
 }
 
 .btn-success {
-    color: #FFF;
-    background-color: #5CB85C;
-    border-color: #4CAE4C;
+    color: #FFF !important;
+    background-color: #5CB85C !important;
+    border-color: #4CAE4C !important;
 }
 
 .btn-success:hover, .btn-success:focus {
-    color: #FFF;
-    background-color: #449D44;
-    border-color: #398439;
+    color: #FFF !important;
+    background-color: #449D44 !important;
+    border-color: #398439 !important;
+}
+
+.btn-warning {
+    color: #FFF !important;
+    background-color: #F0AD4E !important;
+    border-color: #EEA236 !important;
+}
+
+.btn-warning:hover, .btn-warning:focus {
+	color: #FFF !important;
+	background-color: #EC971F !important;
+	border-color: #D58512 !important;
 }
 
-.btn-danger {
-    background-color: #D9534F;
-    border-color: #D43F3A;
-	color: #FFF;
+.btn-danger, form#chat-destroy > input {
+    background-color: #D9534F !important;
+    border-color: #D43F3A !important;
+	color: #FFF !important;
 }
-.btn-danger:hover, .btn-danger:focus {
-	color: #FFF;
-    background-color: #C9302C;
-    border-color: #AC2925;
+.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
+	color: #FFF !important;
+    background-color: #C9302C !important;		
+    border-color: #AC2925 !important;
 }
 
 .pager_first,
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b0ea8b753..20f5df39a 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -31,7 +31,7 @@
 
 				<div class="form-group">
 					<label for="prvmail-text">{{$yourmessage}}</label>
-					<textarea class="form-control" id="prvmail-text" name="body"">{{$text}}</textarea>
+					<textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea>
 				</div>
 
 				<div id="prvmail-submit-wrapper" class="form-group">