Merge remote branch 'upstream/master'

8 files changed, 32 insertions, 140 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1d5fcaa1a..57e24e746 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -118,15 +118,11 @@ pre code {
 }
 
 code {
-	font-family: Courier, monospace;
 	font-size: 1em;
-	display: block;
-	overflow: auto;
+	padding: 5px;
 	border: 1px solid $code_borderc;
 	background: $code_bgcolour;
 	color: $code_txtcolour;
-	padding: 10px;
-	margin-top: 20px; 
 }
 
 pre {
@@ -894,18 +890,6 @@ footer {
 	font-family: FontAwesome;
 }
 
-#search-text {
-	border: 1px solid #ccc;
-	font-size: 1em;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-
-#netsearch-box .btn-sm {
-	padding: 2.78px 10px;
-}
-
-
 .profile-clear {
 	clear: both;
 }
@@ -1243,21 +1227,6 @@ footer {
 	text-decoration: underline;
 }
 
-#lang-select-icon {
-	cursor: pointer;
-	position: absolute;
-	left: 4px;
-/*because of the shape, if this is lined up properly it looks like it's lined up wrong...
-lining it up too high is the only way to make it look correctly aligned.  The human
-brain is weird like that */
-	top: 2px;
-}
-
-#lang-select-icon:hover {
-	opacity: 1;
-	filter:alpha(opacity=100);
-}
-
 .notif-image {
 	height: 80px;
 	width: 80px;
@@ -1347,38 +1316,6 @@ brain is weird like that */
 
 .field.radio .field_help { margin-left: 0px; }
 
-
-
-/*
- * UPDATE
- */
-.popup { 	
-	width: 100%; height: 100%;
-	top:0px; left:0px;
-	position: absolute;
-	display: none;
-}
-
-.popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%; height: 100%;
-	position: absolute;
-	top:0px; left:0px;
-}
-.popup .panel {
-	top:25%;left:25%;width:50%;height:50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
-}
-.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } 
-.popup .panel .panel_in { width: 100%; height: 100%;	position: relative; }
-.popup .panel .panel_actions {  width: 100%; bottom: 4px; left: 0px; position: absolute; }
-.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
-.panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;}
-
 /**
  * OAuth
  */
@@ -1406,63 +1343,6 @@ brain is weird like that */
 	float: left;
 }
 
-/**
- * ICONS
- */
-.iconspacer {
-	display: block; width: 16px; height: 16px;
-/*	visibility: hidden; */
-}
-
-.iconspacer:hover {
-/*	visibility: visible; */
-}
-
-.icon {
-	display: block; width: 16px; height: 16px;
-	background-image: url('../../../../images/icons.png');
-}
-.article { background-position: 0px 0px;}
-.audio { background-position: -16px 0px;}
-.block { background-position: -32px 0px;}
-.drop { background-position: -48px 0px;}
-.drophide { background-position: -64px 0px;}
-.delete { background-position: -64px 0px;}
-.edit { background-position: -80px 0px;}
-.camera { background-position: -96px 0px;}
-.dislike { background-position: -112px 0px;}
-.like { background-position: -128px 0px;}
-.link { background-position: -144px 0px;}
-
-.globe { background-position: 0px -16px;}
-.noglobe { background-position: -16px -16px;}
-.no { background-position: -32px -16px;}
-.pause { background-position: -48px -16px;}
-.play { background-position: -64px -16px;}
-.pencil { background-position: -80px -16px;}
-.small-pencil { background-position: -96px -16px;}
-.recycle { background-position: -112px -16px;}
-.remote-link { background-position: -128px -16px;}
-.share { background-position: -144px -16px;}
-
-.tools { background-position: 0px -32px;}
-.lock { background-position: -16px -32px;}
-.unlock { background-position: -32px -32px; }
-.video { background-position: -48px -32px;}
-.youtube { background-position: -64px -32px;}
-.attach { background-position: -80px -32px; }
-.language { background-position: -96px -32px; }
-.prev { background-position: -112px -32px; }
-.next { background-position: -128px -32px; }
-.on { background-position: -144px -32px; }
-
-.off { background-position: 0px -48px; }
-.tagged { background-position: -48px -48px; }
-.yellow { background-position: -64px -48px; }
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-
-
 
 .body-attach {
 	margin-top: 10px;
@@ -1538,6 +1418,7 @@ div.jGrowl div.jGrowl-notification {
 	margin-left: $radiuspx;
 	border: 1px solid #ccc;
 	border-top: none;
+	width: calc(197px - $radiuspx * 2) !important;
 }
 
 #recip-ac .autocomplete,
@@ -1597,14 +1478,6 @@ a.rconnect:hover {
 	color: #0080FF;
 }
 
-#profiles-menu li a {
-	color: #ffffff;
-}
-
-#profiles-menu li a:hover {
-	color: #000000;
-}
-
 
 /* header */
 header {
@@ -1991,13 +1864,16 @@ img.mail-list-sender-photo {
 .wall-item-content-wrapper {
 	background-color: $item_colour;
 	padding: 10px;
-}
-
-.wall-item-content-wrapper {
 	border-top-right-radius: $radiuspx;
 	border-top-left-radius: $radiuspx;
 }
 
+.generic-content-wrapper {
+	background-color: $genericcontent_bgcolour;
+	padding: 10px;
+	border-radius: $radiuspx;
+}
+
 .comment .wall-item-body {
 	padding-left: $comment_padding;
 }
@@ -2288,12 +2164,12 @@ blockquote {
 }
 
 aside .nav > li > a:hover, aside .nav > li > a:focus {
-	 text-decoration: $navtabs_decohover;
-    background-color: $navaside_bghover;
+	text-decoration: $navtabs_decohover;
+	background-color: $navaside_bghover;
 }
 
 aside .nav-pills > li > a {
-    padding: 6px 10px;
+	padding: 6px 10px;
 }
 
 .dropdown-menu img {
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index bfef8216c..4c889008a 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -25,6 +25,7 @@ function theme_content(&$a) {
 	$arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' );
 	$arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour');
 	$arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour');
+	$arr['genericcontent_bgcolour'] = get_pconfig(local_user(),'redbasic', 'genericcontent_bgcolour' );
 	$arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' );
 	$arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' );
 	$arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' );
@@ -63,6 +64,7 @@ function theme_post(&$a) {
 		set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']);
 		set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
 		set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
+		set_pconfig(local_user(), 'redbasic', 'genericcontent_bgcolour', $_POST['redbasic_genericcontent_bgcolour']);		
 		set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
 		set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
 		set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
@@ -120,6 +122,7 @@ if(feature_enabled(local_user(),'expert'))
 		'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
 		'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']),
 		'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']),
+		'$genericcontent_bgcolour' => array('redbasic_genericcontent_bgcolour',t('Set the background color of other content'),$arr['genericcontent_bgcolour']),
 		'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']),
 		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
 		'$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 01ca5a7b9..104d9d51e 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -24,6 +24,7 @@ if(! $a->install) {
 		$background_image = get_pconfig($uid, "redbasic", "background_image");	
 		$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
 		$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
+		$genericcontent_bgcolour = get_pconfig($uid, "redbasic", "genericcontent_bgcolour");
 		$item_colour = get_pconfig($uid, "redbasic", "item_colour");
 		$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
 		$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
@@ -121,6 +122,8 @@ if(! $a->install) {
 		$bgcolour = "#fdfdfd";
 	if (! $background_image)
 		$background_image ='';
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour ='rgba(247,247,247,0.8)';
 	if (! $item_colour)
 		$item_colour = "rgba(238,238,238,0.8)";
 	if (! $comment_item_colour)
@@ -152,11 +155,11 @@ if(! $a->install) {
 	if (! $blockquote_bordercolour)
 		$blockquote_bordercolour = "#ccc";
 	if (! $code_borderc)
-		$code_borderc = "#444";
+		$code_borderc = "#ccc";
 	if (! $code_bgcolour)
-		$code_bgcolour = "#EEE";
+		$code_bgcolour = "#ccc";
 	if (! $code_txtcolour)
-		$code_txtcolour = "#444";
+		$code_txtcolour = "#000";
 	if (! $pre_borderc)
 		$pre_borderc = "#ccc";
 	if (! $pre_bgcolour)
@@ -331,6 +334,7 @@ $options = array (
 '$search_background' => $search_background,
 '$bgcolour' => $bgcolour,
 '$background_image' => $background_image,
+'$genericcontent_bgcolour' => $genericcontent_bgcolour,
 '$item_colour' => $item_colour,
 '$comment_item_colour' => $comment_item_colour,
 '$comment_border_colour' => $comment_border_colour,
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 96600f9f6..f4222c07b 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -50,6 +50,8 @@
 		$search_background = "#999";
 	if (! $bgcolour)
 		$bgcolour = "#111";
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour ='rgba(28,28,28,0.8)';
 	if (! $item_colour)
 		$item_colour = "rgba(28,28,28,0.8)";
 	if (! $comment_item_colour)
diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php
index 42a62c5ba..2bf002bca 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.php
+++ b/view/theme/redbasic/schema/simple_black_on_white.php
@@ -34,7 +34,7 @@
 		$navtabs_bgchover = "#fff";
 	if (! $navtabs_decohover)
 		$navtabs_decohover = "underline";
-if (! $navaside_bghover)
+	if (! $navaside_bghover)
 		$navaside_bghover = "#F5F5F5";
 	if (! $link_colour)
 		$link_colour = "#000";
@@ -50,6 +50,8 @@ if (! $navaside_bghover)
 		$search_background = "#F5F5F5";
 	if (! $bgcolour)
 		$bgcolour = "#fff";
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour = 'rgba(255,255,255,0.8)';		
 	if (! $item_colour)
 		$item_colour = "rgba(255,255,255,0.8)";
 	if (! $comment_item_colour)
diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php
index 641a46668..15adcf198 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
@@ -50,6 +50,8 @@ if (! $navaside_bghover)
 		$search_background = "#000";
 	if (! $bgcolour)
 		$bgcolour = "#000";
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour = 'rgba(0,0,0,0.8)';
 	if (! $item_colour)
 		$item_colour = "rgba(0,0,0,0.8)";
 	if (! $comment_item_colour)
diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php
index 50379dfe4..96450d835 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.php
+++ b/view/theme/redbasic/schema/simple_white_on_black.php
@@ -50,6 +50,8 @@
 		$search_background = "#000";
 	if (! $bgcolour)
 		$bgcolour = "#000";
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour ='rgba(0,0,0,0.8)';
 	if (! $item_colour)
 		$item_colour = "rgba(0,0,0,0.8)";
 	if (! $comment_item_colour)
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 70b42b6cd..73e0f3476 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -24,6 +24,7 @@
 {{include file="field_input.tpl" field=$comment_indent}}
 {{include file="field_colorinput.tpl" field=$toolicon_colour}}
 {{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
+{{include file="field_colorinput.tpl" field=$genericcontent_bgcolour}}
 {{include file="field_input.tpl" field=$body_font_size}}
 {{include file="field_input.tpl" field=$font_size}}
 {{include file="field_colorinput.tpl" field=$font_colour}}
@@ -40,7 +41,7 @@
 		$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker();
 		$('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
 		$('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
-		$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
+		$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour,#id_redbasic_genericcontent_bgcolour').colorpicker({format: 'rgba'});
 	});
 </script>