Merge branch 'master' into trinidad

mod/filestorage.php

@@ -147,7 +147,9 @@ function filestorage_content(&$a) {
 			'$isadir' => $is_a_dir,
 			'$cpdesc' => t('Copy/paste this code to attach file to a post'),
 			'$cpldesc' => t('Copy/paste this URL to link file from a web page'),
-			'$submit' => t('Submit')
+			'$submit' => t('Submit'),
+			'$attach_btn_title' => t('Attach this file to a new post'),
+			'$link_btn_title' => t('Show URL to this file'),
 		));
 
 		echo $o;

version.inc

@@ -1 +1 @@
-2015-01-02.907
+2015-01-04.909

view/theme/redbasic/css/style.css

@@ -1978,7 +1978,7 @@ img.mail-list-sender-photo {
 
 .chat-item-text {
 	border-radius: $radiuspx;
-	background-color: #eee;
+	background-color: $chat_txtbgcol;
 }
 
 /* nav bootstrap */

view/theme/redbasic/php/style.php

@@ -272,6 +272,8 @@ if(! $a->install) {
       $advperm_gradientcol = "#E8E8E8";
    if(! $cal_bgcolour)
 		$cal_bgcolour = "#FCF8E3";
+   if(! $chat_txtbgcol)
+		$chat_txtbgcol = "#EEE";
    if(! $fancybox_bgcolour)
       $fancybox_bgcolour = "#FFF";
 	if (!$comment_padding)
@@ -409,6 +411,7 @@ $options = array (
 '$advperm_bordercol' => $advperm_bordercol,
 '$advperm_gradientcol' => $advperm_gradientcol,
 '$cal_bgcolour' => $cal_bgcolour,
+'$chat_txtbgcol' => $chat_txtbgcol,
 '$fancybox_bgcolour' => $fancybox_bgcolour,
 '$pmenu_top' => $pmenu_top,
 '$pmenu_reply' => $pmenu_reply,

view/theme/redbasic/schema/dark.php

@@ -176,6 +176,8 @@
       $advperm_gradientcol = "#1E1E1E";
    if(! $cal_bgcolour)
       $cal_bgcolour = "#333";
+   if(! $chat_txtbgcol)
+      $chat_txtbgcol = "#222";
    if(! $fancybox_bgcolour)
       $fancybox_bgcolour = "#1E1E1E";
 	if (!$admintable_hoverbgcol)

view/theme/redbasic/schema/simple_black_on_white.php

@@ -176,6 +176,8 @@
       $advperm_gradientcol = "#fff";
    if(! $cal_bgcolour)
       $cal_bgcolour = "#fff";
+   if(! $chat_txtbgcol)
+      $chat_txtbgcol = "#fff";
    if(! $fancybox_bgcolour)
       $fancybox_bgcolour = "#fff";
 	if (!$admintable_hoverbgcol)

view/theme/redbasic/schema/simple_green_on_black.php

@@ -176,6 +176,8 @@ if (! $navaside_bghover)
       $advperm_gradientcol = "#000";
    if(! $cal_bgcolour)
       $cal_bgcolour = "#000";
+   if(! $chat_txtbgcol)
+      $chat_txtbgcol = "#000";
    if(! $fancybox_bgcolour)
       $fancybox_bgcolour = "#000";
 	if (!$admintable_hoverbgcol)

view/theme/redbasic/schema/simple_white_on_black.php

@@ -176,6 +176,8 @@
       $advperm_gradientcol = "#000";
    if(! $cal_bgcolour)
       $cal_bgcolour = "#000";
+   if(! $chat_txtbgcol)
+      $chat_txtbgcol = "#000";
    if(! $fancybox_bgcolour)
       $fancybox_bgcolour = "#000";
 	if (!$admintable_hoverbgcol)

view/tpl/attach_edit.tpl

@@ -6,11 +6,11 @@
 
 	<div id="attach-edit-tools-share" class="btn-group form-group">
 		{{if !$isadir}}
-		<a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs">
+		<a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}">
 			<i class="icon-paperclip jot-icons"></i>
 		</a>
 		{{/if}}
-		<button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');">
+		<button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
 			<i class="icon-share jot-icons"></i>
 		</button>
 	</div>

view/tpl/event_head.tpl

@@ -26,7 +26,7 @@
 			},
 			loading: function(isLoading, view) {
 				if(!isLoading) {
-					$('td.fc-day').dblclick(function() { window.location.href='https://caterva.eu/events/new?start='+$(this).data('date'); });
+					$('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); });
 				}
 			},