Installation now displays a thumbnail during theme selection. Voux now installs default sitelogo and welcome message.

e107_themes/voux/install/install.xml

@@ -8,6 +8,7 @@
 
 		<core name="newsposts">3</core>
 		<core name="shortdate">%d %b %Y</core>
+		<core name="sitelogo">{e_THEME}voux/install/logo2B252832529.png</core>
 		<core name="signup_option_class">1</core>
 		<core name="sitetheme_custompages"><![CDATA[array (
   'jumbotron_full' => 
@@ -1081,6 +1082,17 @@
 			<field name="news_sticky">0</field>
 		</item>
 	</dbTable>
+	<dbTable name="generic">
+		<item>
+			<field name="gen_id">1</field>
+			<field name="gen_type">wmessage</field>
+			<field name="gen_datestamp">1145848343</field>
+			<field name="gen_user_id">1</field>
+			<field name="gen_ip">Hello World!</field>
+			<field name="gen_intdata">0</field>
+			<field name="gen_chardata"><![CDATA[[html]This is the voux template for a simple blog/website. The text you are reading is the &quot;Welcome Message&quot; and the items below are &quot;News Items&quot;. Visit the admin-area to modify.<br><br><a class=&quot;btn btn-primary btn-large &quot; href=&quot;e107_admin/admin.php&quot;>Go to Admin area</a><br>[/html]]]></field>
+		</item>
+	</dbTable>
 	<dbTable name="news_category">
 		<item>
 			<field name="category_id">1</field>

install.php

@@ -1112,20 +1112,15 @@ class e_install
 				<tr>
 					<td><label>".LANINS_109."</label></td>
 					<td style='padding-right:0'>
-						<table class='table table-striped' >
+
-							<thead>
+							";
-								<tr>
-									<th>".LANINS_115."</th>
-									<th>".LANINS_116."</th>
-								</tr>
-							</thead>
-							<tbody>";
 
 				$themes = $this->get_themes();
 
 				foreach($themes as $val)
 				{
-					if($val == 'bootstrap')
+
+					if($val != 'bootstrap3' && $val != 'voux')
 					{
 						continue; 
 					}
@@ -1133,21 +1128,30 @@ class e_install
 					$themeInfo 	= $this->get_theme_xml($val);
 					$title 		= vartrue($themeInfo['@attributes']['name']);
 					$category 	= vartrue($themeInfo['category']);
+					$preview    = e_THEME.$val."/".$themeInfo['thumbnail'];
+
+					if(!is_readable($preview))
+					{
+						continue;
+					}
+
+					$thumbnail = "<img class='img-responsive thumbnail'  src='".$preview ."' alt='".$val."' />";
+
 
 					$selected = ($val == 'bootstrap3') ? " checked" : "";
 
 					$output .= "
-								<tr>
+									<div class='col-md-6 theme-cell' >
-									<td>
+										<label class='theme-selection'><input type='radio' name='sitetheme' value='{$val}' required='required' $selected />
-										<label class='radio-inline'><input type='radio' name='sitetheme' value='{$val}' required='required' $selected />{$title}</label>
+										<div>".$thumbnail."
-									</td>
+										<h5>".$title." <small>(".$category.")</small><span class='glyphicon glyphicon-ok text-success'></span></h5>
-									<td>{$category}</td>
+										</div>
-								</tr>";
+										</label>
+									</div>";
 				}
 
 				$output .= "
-							</tbody>
+
-						</table>
 					</td>
 
 				</tr>
@@ -2094,6 +2098,18 @@ function template_data()
 		#version				{ position:relative; left:50px; top:-20px; }
 		.well					{ border-radius: 12px }
 
+		.theme-cell             { margin-bottom:15px; padding-left:0; padding-right:5px }
+		.theme-cell .thumbnail  { margin-bottom:5px; height:170px; width:auto }
+		.theme-cell h5          { padding-left:8px; margin-top:0; font-weight:bold }
+
+		label.theme-selection > input { visibility: hidden;  position: absolute; 	}
+		label.theme-selection > input + div{  cursor:pointer;  border:2px solid transparent; border-radius:6px }
+		label.theme-selection > input:checked + div {    border:2px solid #337ab7; 	}
+		label.theme-selection > input + div span { visibility: hidden; float:right; margin-right:10px; color:#337ab7	}
+		label.theme-selection > input:checked + div span { visibility: initial;	}
+
+
+
 		</style>
 		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 		<!--[if lt IE 9]>