Merge https://github.com/friendica/red into pending_merge

15 files changed, 342 insertions, 235 deletions

diff --git a/include/attach.php b/include/attach.php
index 43b56e4f6..7d0b99c05 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -827,7 +827,7 @@ function attach_delete($channel_id, $resource) {
 		intval($channel_id)
 	);
 
-	file_activity($channel_id, $object, $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', 'update', $no_activity=false);
+	file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', $no_activity=false);
 
 }
 
@@ -974,10 +974,14 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 	if(!$object)
 		return;
 
-	//filter out receivers which do not have permission to view filestorage
+	//turn strings into arrays
 	$arr_allow_cid = expand_acl($allow_cid);
+	$arr_allow_gid = expand_acl($allow_gid);
+	$arr_deny_cid = expand_acl($deny_cid);
+	$arr_deny_gid = expand_acl($deny_gid);
+
+	//filter out receivers which do not have permission to view filestorage
 	$arr_allow_cid = check_list_permissions($channel_id, $arr_allow_cid, 'view_storage');
-	$allow_cid = perms2str($arr_allow_cid);
 
 	$is_dir = (($object['flags'] & ATTACH_FLAG_DIR) ? true : false);
 
@@ -990,15 +994,16 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 
 		$folder_hash = $object['folder'];
 
-		$r_perms = recursive_activity_recipients($allow_cid, $allow_gid, $deny_cid, $deny_gid, $folder_hash);
+		$r_perms = recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash);
 
-		//filter out receivers which do not have permission to view filestorage
-		$r_perms['allow_cid'] = check_list_permissions($channel_id, $r_perms['allow_cid'], 'view_storage');
+		//split up returned perms
+		$arr_allow_cid = $r_perms['allow_cid'];
+		$arr_allow_gid = $r_perms['allow_gid'];
+		$arr_deny_cid = $r_perms['deny_cid'];
+		$arr_deny_gid = $r_perms['deny_gid'];
 
-		$allow_cid = perms2str($r_perms['allow_cid']);
-		$allow_gid = perms2str($r_perms['allow_gid']);
-		$deny_cid = perms2str($r_perms['deny_cid']);
-		$deny_gid = perms2str($r_perms['deny_gid']);
+		//filter out receivers which do not have permission to view filestorage
+		$arr_allow_cid = check_list_permissions($channel_id, $arr_allow_cid, 'view_storage');
 
 	}
 
@@ -1008,7 +1013,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 
 	$item_flags = ITEM_WALL|ITEM_ORIGIN;
 
-	$private = (($allow_cid || $allow_gid || $deny_cid || $deny_gid) ? 1 : 0);
+	$private = (($arr_allow_cid[0] || $arr_allow_gid[0] || $arr_deny_cid[0] || $arr_deny_gid[0]) ? 1 : 0);
 
 	$jsonobject = json_encode($object);
 
@@ -1037,6 +1042,12 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 	if($update && $verb == 'post' ) {
 		//send update activity and create a new one
 
+		//updates should be sent to everybody with recursive perms and all eventual former allowed members ($object['allow_cid'] etc.).
+		$u_arr_allow_cid = array_unique(array_merge($arr_allow_cid, expand_acl($object['allow_cid'])));
+		$u_arr_allow_gid = array_unique(array_merge($arr_allow_gid, expand_acl($object['allow_gid'])));
+		$u_arr_deny_cid = array_unique(array_merge($arr_deny_cid, expand_acl($object['deny_cid'])));
+		$u_arr_deny_gid = array_unique(array_merge($arr_deny_gid, expand_acl($object['deny_gid'])));
+
 		$u_mid = item_message_id();
 
 		$arr = array();
@@ -1050,11 +1061,10 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 		$arr['author_xchan']  = $poster['xchan_hash'];
 		$arr['owner_xchan']   = $poster['xchan_hash'];
 		$arr['title']         = '';
-		//updates should be visible to everybody -> perms may have changed
-		$arr['allow_cid']     = '';
-		$arr['allow_gid']     = '';
-		$arr['deny_cid']      = '';
-		$arr['deny_gid']      = '';
+		$arr['allow_cid']     = perms2str($u_arr_allow_cid);
+		$arr['allow_gid']     = perms2str($u_arr_allow_gid);
+		$arr['deny_cid']      = perms2str($u_arr_deny_cid);
+		$arr['deny_gid']      = perms2str($u_arr_deny_gid);
 		$arr['item_restrict']  = ITEM_HIDDEN;
 		$arr['item_private']  = 0;
 		$arr['verb']          = ACTIVITY_UPDATE;
@@ -1093,10 +1103,10 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 	$arr['author_xchan']  = $poster['xchan_hash'];
 	$arr['owner_xchan']   = $poster['xchan_hash'];
 	$arr['title']         = '';
-	$arr['allow_cid']     = $allow_cid;
-	$arr['allow_gid']     = $allow_gid;
-	$arr['deny_cid']      = $deny_cid;
-	$arr['deny_gid']      = $deny_gid;
+	$arr['allow_cid']     = perms2str($arr_allow_cid);
+	$arr['allow_gid']     = perms2str($arr_allow_gid);
+	$arr['deny_cid']      = perms2str($arr_deny_cid);
+	$arr['deny_gid']      = perms2str($arr_deny_gid);
 	$arr['item_restrict']  = ITEM_HIDDEN;
 	$arr['item_private']  = $private;
 	$arr['verb']          = (($update) ? ACTIVITY_UPDATE : ACTIVITY_POST);
@@ -1123,7 +1133,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 
 function get_file_activity_object($channel_id, $hash, $cloudpath) {
 
-	$x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1",
+	$x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1",
 		intval($channel_id),
 		dbesc($hash)
 	);
@@ -1152,28 +1162,26 @@ function get_file_activity_object($channel_id, $hash, $cloudpath) {
 		'folder'	=> $x[0]['folder'],
 		'flags'		=> $x[0]['flags'],
 		'created'	=> $x[0]['created'],
-		'edited'	=> $x[0]['edited']
+		'edited'	=> $x[0]['edited'],
+		'allow_cid'	=> $x[0]['allow_cid'],
+		'allow_gid'	=> $x[0]['allow_gid'],
+		'deny_cid'	=> $x[0]['deny_cid'],
+		'deny_gid'	=> $x[0]['deny_gid']
 	);
 	return $object;
 
 }
 
-function recursive_activity_recipients($allow_cid, $allow_gid, $deny_cid, $deny_gid, $folder_hash) {
+function recursive_activity_recipients($arr_allow_cid, $arr_llow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash) {
 
 	$poster = get_app()->get_observer();
 
-	$arr_allow_cid = expand_acl($allow_cid);
-	$arr_allow_gid = expand_acl($allow_gid);
-
 	//turn allow_gid into allow_cid's
 	foreach($arr_allow_gid as $gid) {
 		$in_group = in_group($gid);
 		$arr_allow_cid = array_unique(array_merge($arr_allow_cid, $in_group));
 	}
 
-	$arr_deny_cid = expand_acl($deny_cid);
-	$arr_deny_gid = expand_acl($deny_gid);
-
 	$count = 0;
 	while($folder_hash) {
 		$x = q("SELECT allow_cid, allow_gid, deny_cid, deny_gid, folder FROM attach WHERE hash = '%s' LIMIT 1",
diff --git a/include/items.php b/include/items.php
index 2518c0d4f..8e293d761 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4823,4 +4823,4 @@ function comment_local_origin($item) {
 	if(stripos($item['mid'],get_app()->get_hostname()) && ($item['parent'] != $item['id']))
 		return true;
 	return false;		
-}
\ No newline at end of file
+}
diff --git a/mod/filestorage.php b/mod/filestorage.php
index 92474f336..f2c795379 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -32,14 +32,15 @@ function filestorage_post(&$a) {
 	$str_contact_allow = perms2str($_REQUEST['contact_allow']);
 	$str_group_deny    = perms2str($_REQUEST['group_deny']);
 	$str_contact_deny  = perms2str($_REQUEST['contact_deny']);
- 
-	attach_change_permissions($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $recurse);
 
-	//Build directory tree and redirect
 	$channel = $a->get_channel();
 	$cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource);
+
+	//get the object before permissions change so we can catch eventual former allowed members
 	$object = get_file_activity_object($channel_id, $resource, $cloudPath);
 
+	attach_change_permissions($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $recurse);
+
 	file_activity($channel_id, $object, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity);
 
 	goaway($cloudPath);
diff --git a/mod/network.php b/mod/network.php
index 0eeeedbe9..7f8d39044 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -119,13 +119,16 @@ function network_content(&$a, $update = 0, $load = false) {
 	if($cid)
 		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
-
 	if(! $update) {
-		$o .= network_tabs();
+		$tabs = network_tabs();
+		$o .= $tabs;
 
 		// search terms header
-		if($search)
-			$o .= '<h2>' . t('Search Results For:') . ' '  . htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '</h2>';
+		if($search) {
+			$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+				'$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8')
+			));
+		}
 
 		nav_set_selected('network');
 
@@ -136,7 +139,6 @@ function network_content(&$a, $update = 0, $load = false) {
 			'deny_gid'  => $channel['channel_deny_gid']
 		); 
 
-
 		$x = array(
 			'is_owner'         => true,
 			'allow_location'   => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
@@ -149,8 +151,8 @@ function network_content(&$a, $update = 0, $load = false) {
 			'profile_uid'      => local_channel()
 		);
 
-		$o .= status_editor($a,$x);
-
+		$status_editor = status_editor($a,$x);
+		$o .= $status_editor;
 	}
 
 
@@ -186,9 +188,15 @@ function network_content(&$a, $update = 0, $load = false) {
 
 		$x = group_rec_byhash(local_channel(), $group_hash);
 
-		if($x)
-			$o = '<h2>' . t('Collection: ') . $x['name'] . '</h2>' . $o;
+		if($x) {
+			$title = replace_macros(get_markup_template("section_title.tpl"),array(
+				'$title' => t('Collection: ') . $x['name']
+			));
+		}
 
+		$o = $tabs;
+		$o .= $title;
+		$o .= $status_editor;
 
 	}
 
@@ -200,7 +208,12 @@ function network_content(&$a, $update = 0, $load = false) {
 		);
 		if($r) {
 			$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) and item_restrict = 0 ) ";
-			$o = '<h2>' . t('Connection: ') . $r[0]['xchan_name'] . '</h2>' . $o;
+			$title = replace_macros(get_markup_template("section_title.tpl"),array(
+				'$title' => t('Connection: ') . $r[0]['xchan_name']
+			));
+			$o = $tabs;
+			$o .= $title;
+			$o .= $status_editor;
 		}
 		else {
 			notice( t('Invalid connection.') . EOL);
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f1807da83..f72b8a0bb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -106,15 +106,15 @@ textarea {
 input {
 	padding: 5px;
 	line-height: 1.5;
-	border: 1px solid $input_border;
+	border: 1px solid #ccc;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
 }
 
 input[type="submit"] {
-	background-color: $input_bgsubmit;
+	background-color: #F0F0F0;
 	font-weight: bold;
-	color: $input_linksubmit;
+	color: #0080FF;
 	text-decoration: none;
 	padding: 6px 12px;
 }
@@ -524,8 +524,8 @@ footer {
 .pager-prev,
 .pager-next,
 .pager_n { 
-	border: 1px solid $editbuttons_bordercolour;
-	background: $editbuttons_bgcolour;
+	border: 1px solid #ccc;
+	background: transparent;
 	padding: 4px;
 }
 
@@ -1365,10 +1365,6 @@ header {
 	clear: both;
 }
 
-.modal-content {
-    background-color: $acl_bgcolour;
-}
-
 #acl-search {
 	margin-top: 20px;
 	padding: 8px;
@@ -1386,7 +1382,7 @@ header {
 
 #acl-list {
 	display: block;
-	border: 1px solid $acl_bordercolour;
+	border: 1px solid #ccc;
 	overflow: auto;
 	clear: both;
 	min-height: 62px;
@@ -1400,7 +1396,7 @@ header {
 .acl-list-item {
 	width: 48%; /* fallback if browser does not support calc() */
 	width: calc(50% - 10px);
-	border: 1px solid $acl_bordercolour;
+	border: 1px solid #ccc;
 	margin: 0px 0px 10px 10px;
 	padding: 5px;
 	float: left;
@@ -1436,11 +1432,6 @@ header {
 .acl-button-hide {
 	float: right;
 	margin-left: 5px;
-	$aclbutton_linkcolour
-}
-
-#acl-showall {
-	$aclbutton_linkcolour
 }
 
 .contact-block-content {
@@ -1841,7 +1832,7 @@ img.mail-list-sender-photo {
 }
 
 .abook-self {
-	background-color: $abookself_bgcolour;
+	background-color: #ffdddd;
 }
 
 .abook-pending-contact, .abook-permschange {
@@ -2168,22 +2159,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 }
 
 .btn-default {
-    	background-color: $editbuttons_bgcolour;
-    	border-color: $editbuttons_bordercolour;
-	color: $editbuttons_colour;
-    	text-shadow: none;
-    	box-shadow: none;
-}
-
-.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
-	background-color: $editbuttons_bghover;
-	border-color: $editbuttons_bordercolourhover;
-	color: $input_colourhover;
-	text-decoration: $input_decohover;
-}
-
-.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
-    	text-decoration: none;
+	background-color: transparent;
 }
 
 @media screen and (max-width: 767px) {
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 76fad1b18..a1b22f583 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -174,16 +174,6 @@ if(! $a->install) {
 		$notif_itemcolour = "#000";
 	if (! $notif_itemhovercolour)
 		$notif_itemhovercolour = "#000";
-	if (! $editbuttons_bgcolour)
-		$editbuttons_bgcolour = "transparent";
-	if (! $editbuttons_bordercolour)
-		$editbuttons_bordercolour = "#ccc";
-	if (! $editbuttons_bordercolourhover)
-		$editbuttons_bordercolourhover = "#adadad";
-	if (! $editbuttons_colour)
-		$editbuttons_colour = "#333";
-	if (! $editbuttons_bghover)
-		$editbuttons_bghover = "#ebebeb";
 	if (! $dropdown_bgcolour)
 		$dropdown_bgcolour = "#FFF";
 	if (! $dropdown_textcolour)
@@ -226,42 +216,22 @@ if(! $a->install) {
 		$notifyseen_linkhover = "#333";
 	if (! $notify_topmargin)
 		$notify_topmargin = "1px";
-	if (! $input_bgsubmit)
-		$input_bgsubmit = "#F0F0F0";
-	if (! $input_linksubmit)
-		$input_linksubmit = "#0080FF";
-	if (! $input_border)
-		$input_border = "#ccc";
-	if (! $input_colourhover)
-		$input_colourhover = "#333";
-	if (! $input_decohover)
-		$input_decohover = "none";
+
+
 	if (! $radius)
 		$radius = "4";
 	if (! $shadow)
 		$shadow = "0";
 	if(! $active_colour)
 		$active_colour = "#fff";
-	if (! $converse_width) {
+	if (! $converse_width)
 		$converse_width = "1024";
-	}
-	if (! $acl_bgcolour)
-		$acl_bgcolour = "#fff";
-	if (! $acl_bordercolour)
-		$acl_bordercolour = "#ccc";
-	if (! $aclbutton_linkcolour)
-		$aclbutton_linkcolour = "";
-	if (! $abookself_bgcolour)
-		$abookself_bgcolour = "#ffdddd";
 	if(! $top_photo)
 		$top_photo = '48px';
 	if(! $comment_indent)
 		$comment_indent = '0px';
 	if(! $reply_photo)
 		$reply_photo = '32px';
-	if(! $infomess_bgcolour)
-		$infomess_bgcolour = "#F0F0F0";
-
 
 	if($nav_min_opacity === false || $nav_min_opacity === '') {
 		$nav_float_min_opacity = 1.0;
@@ -331,11 +301,6 @@ $options = array (
 '$pre_txtcolour' => $pre_txtcolour,
 '$notif_itemcolour' => $notif_itemcolour,
 '$notif_itemhovercolour' => $notif_itemhovercolour,
-'$editbuttons_bgcolour' => $editbuttons_bgcolour,
-'$editbuttons_bordercolour' => $editbuttons_bordercolour,
-'$editbuttons_bordercolourhover' => $editbuttons_bordercolourhover,
-'$editbuttons_colour' => $editbuttons_colour,
-'$editbuttons_bghover' => $editbuttons_bghover,
 '$dropdown_bgcolour' => $dropdown_bgcolour,
 '$dropdown_textcolour' => $dropdown_textcolour,
 '$dropdown_txtcolhover' => $dropdown_txtcolhover,
@@ -357,24 +322,14 @@ $options = array (
 '$notifyseen_bghover' => $notifyseen_bghover,
 '$notifyseen_linkhover' => $notifyseen_linkhover,
 '$notify_topmargin' => $notify_topmargin,
-'$input_bgsubmit' => $input_bgsubmit,
-'$input_linksubmit' => $input_linksubmit,
-'$input_border' => $input_border,
-'$input_colourhover' => $input_colourhover,
-'$input_decohover' => $input_decohover,
 '$radius' => $radius,
 '$shadow' => $shadow,
 '$active_colour' => $active_colour,
 '$converse_width' => $converse_width,
-'$acl_bgcolour' => $acl_bgcolour,
-'$acl_bordercolour' => $acl_bordercolour,
-'$aclbutton_linkcolour' => $aclbutton_linkcolour,
-'$abookself_bgcolour' => $abookself_bgcolour,
 '$nav_float_min_opacity' => $nav_float_min_opacity,
 '$nav_percent_min_opacity' => $nav_percent_min_opacity,
 '$top_photo' => $top_photo,
 '$reply_photo' => $reply_photo,
-'$infomess_bgcolour' => $infomess_bgcolour,
 '$pmenu_top' => $pmenu_top,
 '$pmenu_reply' => $pmenu_reply,
 '$comment_indent' => $comment_indent,
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index e64add844..7af859db6 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -51,3 +51,67 @@
 	border-color: #444;
 	background-image: linear-gradient(to bottom, #333 0px, #333 100%);
 }
+
+.abook-self {
+	background-color: #251111;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #fff;
+}
+
+#acl-showall {
+	color: #fff;
+}
+
+#acl-list {
+	border: 1px solid #333;
+}
+
+.acl-list-item {
+	border: 1px solid #333;
+}
+
+.modal-content {
+    background-color: #111;
+}
+
+.btn-default {
+	background-color: #1e1e1e;
+	border-color: #222;
+	color: #ccc;
+	text-shadow: none;
+	box-shadow: none;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+	background-color: #222;
+	border-color: #222;
+	color: #fff;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+	text-decoration: none;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n {
+	border: 1px solid #222;
+	background: #1e1e1e;
+}
+
+input {
+	border: 1px solid #222;
+}
+
+input[type="submit"] {
+	background-color: #333;
+	color: #fff;
+}
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index bd213de34..b6cc53504 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -96,12 +96,6 @@
 		$acpopup_tgbl_bgcolour = "#333";
 	if (! $acpopup_hovercolour)
 		$acpopup_hovercolour = "#fff";
-	if (! $editbuttons_bgcolour)
-		$editbuttons_bgcolour = "#1e1e1e";
-	if (! $editbuttons_bordercolour)
-		$editbuttons_bordercolour = "#222";
-	if (! $editbuttons_colour)
-		$editbuttons_colour = "#ccc";
 	if (! $editbuttons_bghover)
 		$editbuttons_bghover = "#222";
 	if (! $dropdown_bgcolour)
@@ -138,23 +132,4 @@
 		$notifyseen_bghover = "#222";
 	if (! $notifyseen_linkhover)
 		$notifyseen_linkhover = "#CCC";
-	if (! $input_bgsubmit)
-		$input_bgsubmit = "#333";
-	if (! $input_linksubmit)
-		$input_linksubmit = "#fff";
-	if (! $input_border)
-		$input_border = "#222";
-	if (! $input_colourhover)
-		$input_colourhover = "#fff";
-	if (! $input_decohover)
-		$input_decohover = "underline";
-	if (! $acl_bgcolour)
-		$acl_bgcolour = "#111";
-	if (! $acl_bordercolour)
-		$acl_bordercolour = "#333";
-	if (! $aclbutton_linkcolour)
-		$aclbutton_linkcolour = "color: #fff;";
-	if (! $abookself_bgcolour)
-		$abookself_bgcolour = "#251111";
-	if(! $infomess_bgcolour)
-		$infomess_bgcolour = "#333";
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index 1a29ed6f2..e23053858 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -51,3 +51,67 @@
 	border-color: #000;
 	background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
 }
+
+.abook-self {
+	background-color: #fff;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #000;
+}
+
+#acl-showall {
+	color: #000;
+}
+
+#acl-list {
+	border: 1px solid #fff;
+}
+
+.acl-list-item {
+	border: 1px solid #fff;
+}
+
+.modal-content {
+    background-color: #fff;
+}
+
+.btn-default {
+    	background-color: #fff;
+    	border-color: #000;
+	color: #111;
+    	text-shadow: none;
+    	box-shadow: none;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+	background-color: #fff;
+	border-color: #000;
+	color: #000;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+    	text-decoration: none;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n { 
+	border: 1px solid #000;
+	background: #fff;
+}
+
+input {
+	border: 1px solid #000;
+}
+
+input[type="submit"] {
+	background-color: #fff;
+	color: #000;
+}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php
index 55e92f9e6..76db1bb1f 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.php
+++ b/view/theme/redbasic/schema/simple_black_on_white.php
@@ -96,14 +96,6 @@
 		$acpopup_tgbl_bgcolour = "#fff";
 	if (! $acpopup_hovercolour)
 		$acpopup_hovercolour = "#000";
-	if (! $editbuttons_bgcolour)
-		$editbuttons_bgcolour = "#fff";
-	if (! $editbuttons_bordercolour)
-		$editbuttons_bordercolour = "#000";
-	if (! $editbuttons_colour)
-		$editbuttons_colour = "#111";
-	if (! $editbuttons_bghover)
-		$editbuttons_bghover = "#fff";
 	if (! $dropdown_bgcolour)
 		$dropdown_bgcolour = "#fff";
 	if (! $dropdown_textcolour)
@@ -138,23 +130,4 @@
 		$notifyseen_bghover = "#fff";
 	if (! $notifyseen_linkhover)
 		$notifyseen_linkhover = "#000";
-	if (! $input_bgsubmit)
-		$input_bgsubmit = "#fff";
-	if (! $input_linksubmit)
-		$input_linksubmit = "#000";
-	if (! $input_border)
-		$input_border = "#000";
-	if (! $input_colourhover)
-		$input_colourhover = "#000";
-	if (! $input_decohover)
-		$input_decohover = "underline";
-	if (! $acl_bgcolour)
-		$acl_bgcolour = "#fff";
-	if (! $acl_bordercolour)
-		$acl_bordercolour = "#fff";
-	if (! $aclbutton_linkcolour)
-		$aclbutton_linkcolour = "color: #000;";
-	if (! $abookself_bgcolour)
-		$abookself_bgcolour = "#fff";
-	if(! $infomess_bgcolour)
-		$infomess_bgcolour = "#fff";
+
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 4828eb249..f9bde2a71 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -52,3 +52,66 @@
 	background-image: linear-gradient(to bottom, #000 0px, #000 100%);
 }
 
+.abook-self {
+	background-color: #000;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #fff;
+}
+
+#acl-showall {
+	color: #fff;
+}
+
+#acl-list {
+	border: 1px solid #000;
+}
+
+.acl-list-item {
+	border: 1px solid #000;
+}
+
+.modal-content {
+    background-color: #000;
+}
+
+.btn-default {
+    	background-color: #000;
+    	border-color: #143D12;
+	color: #32962D;
+    	text-shadow: none;
+    	box-shadow: none;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+	background-color: #000;
+	border-color: #143D12;
+	color: #50f148;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+    	text-decoration: none;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n { 
+	border: 1px solid #143D12;
+	background: #000;
+}
+
+input {
+	border: 1px solid #143D12;
+}
+
+input[type="submit"] {
+	background-color: #000;
+	color: #50f148;
+}
diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php
index 3ec642526..8c8a58619 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
@@ -96,14 +96,6 @@ if (! $navaside_bghover)
 		$acpopup_tgbl_bgcolour = "#000";
 	if (! $acpopup_hovercolour)
 		$acpopup_hovercolour = "#50f148";
-	if (! $editbuttons_bgcolour)
-		$editbuttons_bgcolour = "#000";
-	if (! $editbuttons_bordercolour)
-		$editbuttons_bordercolour = "#143D12";
-	if (! $editbuttons_colour)
-		$editbuttons_colour = "#32962D";
-	if (! $editbuttons_bghover)
-		$editbuttons_bghover = "#000";
 	if (! $dropdown_bgcolour)
 		$dropdown_bgcolour = "#000";
 	if (! $dropdown_textcolour)
@@ -138,23 +130,9 @@ if (! $navaside_bghover)
 		$notifyseen_bghover = "#000";
 	if (! $notifyseen_linkhover)
 		$notifyseen_linkhover = "#50f148";
-	if (! $input_bgsubmit)
-		$input_bgsubmit = "#000";
-	if (! $input_linksubmit)
-		$input_linksubmit = "#50f148";
-	if (! $input_border)
-		$input_border = "#143D12";
-	if (! $input_colourhover)
-		$input_colourhover = "#50f148";
-	if (! $input_decohover)
-		$input_decohover = "underline";
-	if (! $acl_bgcolour)
-		$acl_bgcolour = "#000";
-	if (! $acl_bordercolour)
-		$acl_bordercolour = "#000";
-	if (! $aclbutton_linkcolour)
-		$aclbutton_linkcolour = "color: #fff;";
-	if (! $abookself_bgcolour)
-		$abookself_bgcolour = "#000";
-	if(! $infomess_bgcolour)
-		$infomess_bgcolour = "#000";
+
+
+
+
+
+
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 0367eb5f4..0a6c17f1b 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -52,3 +52,67 @@
 	border-color: #fff;
 	background-image: linear-gradient(to bottom, #000 0px, #000 100%);
 }
+
+.abook-self {
+	background-color: #000;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #fff;
+}
+
+#acl-showall {
+	color: #fff;
+}
+
+#acl-list {
+	border: 1px solid #000;
+}
+
+.acl-list-item {
+	border: 1px solid #000;
+}
+
+.modal-content {
+    background-color: #000;
+}
+
+.btn-default {
+    	background-color: #000;
+    	border-color: #fff;
+	color: #eee;
+    	text-shadow: none;
+    	box-shadow: none;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+	background-color: #000;
+	border-color: #fff;
+	color: #fff;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+    	text-decoration: none;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n { 
+	border: 1px solid #fff;
+	background: #000;
+}
+
+input {
+	border: 1px solid #fff;
+}
+
+input[type="submit"] {
+	background-color: #000;
+	color: #fff;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php
index 5f61326e4..29b176b09 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.php
+++ b/view/theme/redbasic/schema/simple_white_on_black.php
@@ -96,14 +96,6 @@
 		$acpopup_tgbl_bgcolour = "#000";
 	if (! $acpopup_hovercolour)
 		$acpopup_hovercolour = "#fff";
-	if (! $editbuttons_bgcolour)
-		$editbuttons_bgcolour = "#000";
-	if (! $editbuttons_bordercolour)
-		$editbuttons_bordercolour = "#fff";
-	if (! $editbuttons_colour)
-		$editbuttons_colour = "#eee";
-	if (! $editbuttons_bghover)
-		$editbuttons_bghover = "#000";
 	if (! $dropdown_bgcolour)
 		$dropdown_bgcolour = "#000";
 	if (! $dropdown_textcolour)
@@ -138,23 +130,4 @@
 		$notifyseen_bghover = "#000";
 	if (! $notifyseen_linkhover)
 		$notifyseen_linkhover = "#fff";
-	if (! $input_bgsubmit)
-		$input_bgsubmit = "#000";
-	if (! $input_linksubmit)
-		$input_linksubmit = "#fff";
-	if (! $input_border)
-		$input_border = "#fff";
-	if (! $input_colourhover)
-		$input_colourhover = "#fff";
-	if (! $input_decohover)
-		$input_decohover = "underline";
-	if (! $acl_bgcolour)
-		$acl_bgcolour = "#000";
-	if (! $acl_bordercolour)
-		$acl_bordercolour = "#000";
-	if (! $aclbutton_linkcolour)
-		$aclbutton_linkcolour = "color: #fff;";
-	if (! $abookself_bgcolour)
-		$abookself_bgcolour = "#000";
-	if(! $infomess_bgcolour)
-		$infomess_bgcolour = "#000";
+
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index e74afffce..1dfb0cb75 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -187,4 +187,4 @@
 
 {{if $content}}
 <script>initEditor();</script>
-{{/if}}
\ No newline at end of file
+{{/if}}