Merge branch 'master' of git://github.com/friendica/red into dev_redswede

6 files changed, 13 insertions, 5 deletions

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 40a9cd4c8..3c35df860 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -54,6 +54,7 @@ function contact_format(item) {
 	// Show contact information if not explicitly told to show something else
 	if(typeof item.text === 'undefined') {
 		var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick)
+		if(typeof desc === 'undefined') desc = '';
 		if(desc) desc = ' ('+desc+')';
 		return "<div class='{0}' title='{4}'><img src='{1}'>{2}{3}</div>".format(item.taggable, item.photo, item.name, desc, item.link)
 	}
diff --git a/view/js/main.js b/view/js/main.js
index 0c56c8d41..fac5e1143 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1125,7 +1125,7 @@ $(document).ready(function() {
 
 
 	$(".autotime").timeago();
-	$("#toc").toc({content: "div.page-body", headings: "h1,h2,h3,h4"});
+	$("#toc").toc({content: "body", headings: "h1,h2,h3,h4"});
 	
 
 });
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 842e7063a..c24bee1fd 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1031,6 +1031,7 @@ footer {
 #colorbox {
 	border: 0px solid $fancybox_bgcolour;
 	background-color: $fancybox_bgcolour;
+	z-index: 9;
 }
 
 .settings-block {
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 5d44a9b9d..5bc702d8c 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -275,7 +275,7 @@ if(! $a->install) {
    if(! $chat_txtbgcol)
 		$chat_txtbgcol = "#EEE";
    if(! $fancybox_bgcolour)
-      $fancybox_bgcolour = "#FFF";
+      $fancybox_bgcolour = "#FFFFFF";
 	if (!$comment_padding)
 		$comment_padding="0px";	
 	if (!$comment_border_left)
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 0147d35ba..5a8743919 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -14,7 +14,7 @@
 			<i class="icon-share jot-icons"></i>
 		</button>
 	</div>
-	<div id="attach-edit-tools-perms" class="form-group pull-right{{if $isadir}} btn-group{{/if}}">
+	<div id="attach-edit-tools-perms" class="form-group pull-right btn-group">
 		{{if $isadir}}
 		<div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons">
 			<label class="btn btn-default btn-xs" title="{{$recurse}}">
@@ -22,6 +22,11 @@
 			</label>
 		</div>
 		{{/if}}
+		<div id="attach-edit-activity" class="btn-group" data-toggle="buttons">
+			<label class="btn btn-default btn-xs" title="{{$activity_btn_title}}">
+				<input type="checkbox" autocomplete="off" name="no_activity" value="1"><i class="icon-ban-circle jot-icons"></i>
+			</label>
+		</div>
 		<div id="attach-edit-perms" class="btn-group">
 			<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
 				<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index f5f123edb..403323085 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -1,8 +1,9 @@
 <div class="section-title-wrapper">
 	{{if $actionspanel}}
 	<div class="pull-right">
-		<button id="files-create-btn"class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i>&nbsp;Create</button>		
-		<button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i>&nbsp;Upload</button>		
+		<a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i>&nbsp;{{$shared}}</a>
+		<button id="files-create-btn" class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i>&nbsp;{{$create}}</button>
+		<button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
 	</div>
 	{{/if}}
 	<h2>{{$header}}</h2>