From 60248dabe98c1d3e5616f5f8f82fc7329b83d5c5 Mon Sep 17 00:00:00 2001
From: MinSoo Kim <misol.kr@gmail.com>
Date: Fri, 3 Mar 2017 23:07:39 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=83=89=EC=83=81=20=EB=B3=80=EC=88=98=20=ED=99=95=EC=9D=B8=20?=
 =?UTF-8?q?=EA=B0=95=ED=99=94,=20=EB=A7=81=ED=81=AC=20=ED=85=8D=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=83=89=EC=83=81=20=EC=84=A0=EB=AA=85=EB=8F=84=20?=
 =?UTF-8?q?=EC=A6=9D=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skins/simple_world/common_header.html     | 41 ++++++++++--------
 .../member/skins/simple_world/css/css.less    |  2 +-
 .../skins/simple_world/common_header.html     | 42 ++++++++++--------
 .../skins/simple_rectangle/content.html       | 43 +++++++++++--------
 4 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/modules/member/skins/simple_world/common_header.html b/modules/member/skins/simple_world/common_header.html
index 6092d1867..3c692a32c 100644
--- a/modules/member/skins/simple_world/common_header.html
+++ b/modules/member/skins/simple_world/common_header.html
@@ -1,5 +1,18 @@
 <load target="js/member.js" />
 <!--// Check layout. If it is Simple World, select layout primary colors as a primary color of this skin -->
+<block cond="$layout_info->extra_var->primary_color->type === 'select' || $layout_info->extra_var->customized_primary_color->type === 'colorpicker'">
+	{@
+		if(!$layout_info->primary_color)
+			$layout_info->primary_color = 'red';
+		if(!$layout_info->primary_color && $layout_info->customized_primary_color)
+			$layout_info->primary_color = 'customized';
+		if(!$layout_info->customized_primary_color)
+			$layout_info->customized_primary_color = '#f44336';
+	}
+</block>
+<block cond="$layout_info->extra_var->primary_color->type !== 'select' && $layout_info->extra_var->customized_primary_color->type !== 'colorpicker'">
+	{@$layout_info->primary_color = 'red';}
+</block>
 {@
 	$material_colors = array(
 		'red'	=>	'#f44336',
@@ -28,24 +41,21 @@
 		'customized'	=>	$layout_info->customized_primary_color,
 	);
 }
-<block cond="$layout_info->extra_var->primary_color->type === 'select' || $layout_info->extra_var->customized_primary_color->type === 'colorpicker'">
-	{@
-		if(!$layout_info->primary_color && $layout_info->customized_primary_color)
-			$layout_info->primary_color = 'customized';
-		if(!$layout_info->primary_color)
-			$layout_info->primary_color = 'red';
-		if(!$layout_info->customized_primary_color)
-			$layout_info->customized_primary_color = '#f44336';
-	}
-</block>
-<block cond="$layout_info->extra_var->primary_color->type !== 'select' && $layout_info->extra_var->customized_primary_color->type !== 'colorpicker'">
-	{@$layout_info->primary_color = 'blue';}
-</block>
 <!--// Load styles -->
 {@$colorset = $material_colors[$member_config->colorset];}
 {@$skin_color = $material_colors[$layout_info->primary_color];}
+<block cond="$colorset">
+	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", trim($colorset)) && in_array(strlen(trim($colorset)), array(4, 7)))-->
+		{@$skin_color = trim($colorset)}
+		<!--@if(strlen(trim($colorset)) === 4)-->
+			{@$skin_color = trim($colorset)[1].trim($colorset)[1].trim($colorset)[2].trim($colorset)[2].trim($colorset)[3].trim($colorset)[3]}
+		<!--@endif-->
+	<!--@else-->
+		{@$skin_color = '#f44336'}
+	<!--@endif-->
+</block>
 <block cond="!$skin_color">
-	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", $layout_info->primary_color))-->
+	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", $layout_info->primary_color) && in_array(strlen(trim($colorset)), array(4, 7)))-->
 		{@$skin_color = $layout_info->primary_color}
 		<!--@if(strlen($layout_info->primary_color) === 4)-->
 			{@$skin_color = $layout_info->primary_color[1].$layout_info->primary_color[1].$layout_info->primary_color[2].$layout_info->primary_color[2].$layout_info->primary_color[3].$layout_info->primary_color[3]}
@@ -54,9 +64,6 @@
 		{@$skin_color = '#f44336'}
 	<!--@endif-->
 </block>
-<block cond="$colorset">
-	{@$skin_color = $colorset}
-</block>
 {@Context::set('simple_less_value', array('red' => hexdec(substr($skin_color, 1, 2)), 'green' => hexdec(substr($skin_color, 3, 2)), 'blue' => hexdec(substr($skin_color, 5, 2)) ))}
 <load target="css/css.less" vars="$simple_less_value" />
 <section class="rx_simple_member">
diff --git a/modules/member/skins/simple_world/css/css.less b/modules/member/skins/simple_world/css/css.less
index 43156161b..57534b821 100644
--- a/modules/member/skins/simple_world/css/css.less
+++ b/modules/member/skins/simple_world/css/css.less
@@ -68,7 +68,7 @@ script, style
 
 .rx_simple_member a
 {
-	color: @color;
+	.text-contrast(#fff; darken(@color,5%); lighten(@color,5%));
 	text-decoration: none;
 }
 /* Horizontal align */
diff --git a/modules/message/skins/simple_world/common_header.html b/modules/message/skins/simple_world/common_header.html
index 3f5be653b..a8853ec30 100644
--- a/modules/message/skins/simple_world/common_header.html
+++ b/modules/message/skins/simple_world/common_header.html
@@ -1,7 +1,19 @@
 <!--// responsible layout -->
 {@Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")}
-
 <!--// Check layout. If it is Simple World, select layout primary colors as a primary color of this skin -->
+<block cond="$layout_info->extra_var->primary_color->type === 'select' || $layout_info->extra_var->customized_primary_color->type === 'colorpicker'">
+	{@
+		if(!$layout_info->primary_color)
+			$layout_info->primary_color = 'red';
+		if(!$layout_info->primary_color && $layout_info->customized_primary_color)
+			$layout_info->primary_color = 'customized';
+		if(!$layout_info->customized_primary_color)
+			$layout_info->customized_primary_color = '#f44336';
+	}
+</block>
+<block cond="$layout_info->extra_var->primary_color->type !== 'select' && $layout_info->extra_var->customized_primary_color->type !== 'colorpicker'">
+	{@$layout_info->primary_color = 'red';}
+</block>
 {@
 	$material_colors = array(
 		'red'	=>	'#f44336',
@@ -30,25 +42,21 @@
 		'customized'	=>	$layout_info->customized_primary_color,
 	);
 }
-<block cond="$layout_info->extra_var->primary_color->type === 'select' || $layout_info->extra_var->customized_primary_color->type === 'colorpicker'">
-	{@
-		if(!$layout_info->primary_color && $layout_info->customized_primary_color)
-			$layout_info->primary_color = 'customized';
-		if(!$layout_info->primary_color)
-			$layout_info->primary_color = 'red';
-		if(!$layout_info->customized_primary_color)
-			$layout_info->customized_primary_color = '#f44336';
-	}
-
-</block>
-<block cond="$layout_info->extra_var->primary_color->type !== 'select' && $layout_info->extra_var->customized_primary_color->type !== 'colorpicker'">
-	{@$layout_info->primary_color = 'blue';}
-</block>
-
 <!--// Load styles -->
+{@$colorset = $material_colors[$member_config->colorset];}
 {@$skin_color = $material_colors[$layout_info->primary_color];}
+<block cond="$colorset">
+	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", trim($colorset)) && in_array(strlen(trim($colorset)), array(4, 7)))-->
+		{@$skin_color = trim($colorset)}
+		<!--@if(strlen(trim($colorset)) === 4)-->
+			{@$skin_color = trim($colorset)[1].trim($colorset)[1].trim($colorset)[2].trim($colorset)[2].trim($colorset)[3].trim($colorset)[3]}
+		<!--@endif-->
+	<!--@else-->
+		{@$skin_color = '#f44336'}
+	<!--@endif-->
+</block>
 <block cond="!$skin_color">
-	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", $layout_info->primary_color))-->
+	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", $layout_info->primary_color) && in_array(strlen(trim($colorset)), array(4, 7)))-->
 		{@$skin_color = $layout_info->primary_color}
 		<!--@if(strlen($layout_info->primary_color) === 4)-->
 			{@$skin_color = $layout_info->primary_color[1].$layout_info->primary_color[1].$layout_info->primary_color[2].$layout_info->primary_color[2].$layout_info->primary_color[3].$layout_info->primary_color[3]}
diff --git a/widgets/content/skins/simple_rectangle/content.html b/widgets/content/skins/simple_rectangle/content.html
index 1b8cf0bff..8c0ed9561 100644
--- a/widgets/content/skins/simple_rectangle/content.html
+++ b/widgets/content/skins/simple_rectangle/content.html
@@ -1,6 +1,19 @@
 <load target="./js/content_widget.js" cond="$widget_info->page_count || count($widget_info->tab)" />
 <!--// Check layout. If it is Simple World, select layout primary colors as a primary color of this skin -->
 {@$layout_info = Context::get('layout_info')}
+<block cond="$layout_info->extra_var->primary_color->type === 'select' || $layout_info->extra_var->customized_primary_color->type === 'colorpicker'">
+	{@
+		if(!$layout_info->primary_color)
+			$layout_info->primary_color = 'red';
+		if(!$layout_info->primary_color && $layout_info->customized_primary_color)
+			$layout_info->primary_color = 'customized';
+		if(!$layout_info->customized_primary_color)
+			$layout_info->customized_primary_color = '#f44336';
+	}
+</block>
+<block cond="$layout_info->extra_var->primary_color->type !== 'select' && $layout_info->extra_var->customized_primary_color->type !== 'colorpicker'">
+	{@$layout_info->primary_color = 'red';}
+</block>
 {@
 	$material_colors = array(
 		'red'	=>	'#f44336',
@@ -29,24 +42,21 @@
 		'customized'	=>	$layout_info->customized_primary_color,
 	);
 }
-<block cond="$layout_info->extra_var->primary_color->type === 'select' || $layout_info->extra_var->customized_primary_color->type === 'colorpicker'">
-	{@
-		if(!$layout_info->primary_color && $layout_info->customized_primary_color)
-			$layout_info->primary_color = 'customized';
-		if(!$layout_info->primary_color)
-			$layout_info->primary_color = 'red';
-		if(!$layout_info->customized_primary_color)
-			$layout_info->customized_primary_color = '#f44336';
-	}
-</block>
-<block cond="$layout_info->extra_var->primary_color->type !== 'select' && $layout_info->extra_var->customized_primary_color->type !== 'colorpicker'">
-	{@$layout_info->primary_color = 'blue';}
-</block>
 <!--// Load styles -->
-{@$colorset = $material_colors[$colorset];}
+{@$colorset = $material_colors[$member_config->colorset];}
 {@$skin_color = $material_colors[$layout_info->primary_color];}
+<block cond="$colorset">
+	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", trim($colorset)) && in_array(strlen(trim($colorset)), array(4, 7)))-->
+		{@$skin_color = trim($colorset)}
+		<!--@if(strlen(trim($colorset)) === 4)-->
+			{@$skin_color = trim($colorset)[1].trim($colorset)[1].trim($colorset)[2].trim($colorset)[2].trim($colorset)[3].trim($colorset)[3]}
+		<!--@endif-->
+	<!--@else-->
+		{@$skin_color = '#f44336'}
+	<!--@endif-->
+</block>
 <block cond="!$skin_color">
-	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", $layout_info->primary_color))-->
+	<!--@if(preg_match("/#([a-f0-9]{3}){1,2}/i", $layout_info->primary_color) && in_array(strlen(trim($colorset)), array(4, 7)))-->
 		{@$skin_color = $layout_info->primary_color}
 		<!--@if(strlen($layout_info->primary_color) === 4)-->
 			{@$skin_color = $layout_info->primary_color[1].$layout_info->primary_color[1].$layout_info->primary_color[2].$layout_info->primary_color[2].$layout_info->primary_color[3].$layout_info->primary_color[3]}
@@ -55,9 +65,6 @@
 		{@$skin_color = '#f44336'}
 	<!--@endif-->
 </block>
-<block cond="$colorset">
-	{@$skin_color = $colorset}
-</block>
 {@Context::set('less_color', array('red' => hexdec(substr($skin_color, 1, 2)), 'green' => hexdec(substr($skin_color, 3, 2)), 'blue' => hexdec(substr($skin_color, 5, 2)), 'thumbnail_height' => intval($widget_info->thumbnail_height), 'thumbnail_width' => intval($widget_info->thumbnail_width)))}
 <load target="css/css.less" vars="$less_color" />