Issue #1138 - Layout fix for theme manager.

e107_admin/prefs.php

@@ -814,7 +814,7 @@ $text .= "
 					$text .= "
 					<tr>
 						<td><label for='inputdate'>".PRFLAN_230."</label></td>
-						<td>
+						<td class='form-inline'>
 							".$frm->select('inputdate',$inputdate, e107::getPref('inputdate'));
 							
 					$text .= $frm->select('inputtime',$inputtime, e107::getPref('inputtime'));

e107_admin/theme.php

@@ -27,44 +27,7 @@ $e_sub_cat = 'theme_manage';
 e107::css("inline","
 .block-text h2.caption 		{ text-align: right; margin-bottom: -30px; padding-right: 10px; }
 .hide						{ display: none }
-.admin-theme-thumb			{ height:130px;overflow:hidden;border:1px solid black; margin:0px; margin-bottom:10px; padding:0px;   }
-.admin-theme-thumb:hover	{ opacity:0.4 }
 
-.admin-theme-options		{ transition: opacity .20s ease-in-out;
-							 -moz-transition: opacity .20s ease-in-out;
-							 -webkit-transition: opacity .20s ease-in-out;
-							 opacity:0; 
-							 width:100%;
-							 height:80px;
-							 padding-top:50px;
-							 white-space:nowrap;
-							 background-color:black;
-							 display:block;position:relative; text-align:center; vertical-align:middle; top:-141px;}
-
-.admin-theme-options:hover	{ opacity:0.8; }
-/*
-.admin-theme-options button	{ background: none; color: white; border: none; padding:0px;  margin:3px; }
-.admin-theme-options a {color: inherit; display:inline-block }
-.admin-theme-options a span		{ color: inherit; padding-right: 5px; padding-left:0px; padding-top: 3px; margin-left:3px }
-*/
-
-.admin-theme-options .fa-check	{ color: #FAA732 }
-
-.admin-theme-title			{ line-height: 18px; overflow:hidden; padding-left:5px; white-space:no-wrap; width:200px; position:relative; top:-132px; }
-
-.admin-theme-select			{border:1px dotted silver;background-color:#DDDDDD;float:left }
-
-.admin-theme-select-active	{ background-color:red;float:left }
-
-.admin-theme-cell			{ width:202px; height:160px; padding:10px; -moz-border-radius: 5px; border-radius: 5px; margin:10px 10px 5px 0px}
-
-.admin-theme-cell-default   { border:1px dotted silver; background-color:#DDDDDD }
-
-
-
-.admin-theme-cell-site		{ background-color: #d9edf7;  border: 1px solid #bce8f1; }
-
-.admin-theme-cell-admin	 	{ background-color:#FFFFD5; border: 1px solid #FFCC00; }
 
 
 ");

e107_handlers/theme_handler.php

@@ -1040,11 +1040,11 @@ class themeHandler
 		$author 		= ($theme['email'] ? "<a href='mailto:".$theme['email']."' title='".$theme['email']."'>".$theme['author']."</a>" : $theme['author']);
 		$website 		= ($theme['website'] ? "<a href='".$theme['website']."' rel='external'>".$theme['website']."</a>" : "");
 	//	$preview 		= "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' title='".TPVLAN_12."' alt='' />")."</a>";
-		$main_icon 		= ($pref['sitetheme'] != $theme['path']) ? "<button class='btn btn-default btn-small btn-sm btn-inverse' type='submit'   name='selectmain[".$theme['id']."]' alt=\"".TPVLAN_10."\" title=\"".TPVLAN_10."\" >".$tp->toGlyph('fa-home',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
+		$main_icon 		= ($pref['sitetheme'] != $theme['path']) ? "<button class='btn btn-default btn-small btn-sm btn-inverse' type='submit'   name='selectmain[".$theme['id']."]' alt=\"".TPVLAN_10."\" title=\"".TPVLAN_10."\" >".$tp->toGlyph('fa-home',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-default btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
 	//	$info_icon 		= "<a data-toggle='modal' data-target='".e_SELF."' href='#themeInfo_".$theme['id']."' class='e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' class='icon S32' /></a>";
 		$info_icon 		= "<a class='btn btn-default btn-small btn-sm btn-inverse' data-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".e_SELF."?id=".$theme['path']."' data-target='#uiModal'  title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>";
 //		$preview_icon 	= "<a title='Preview : ".$theme['name']."' rel='external' class='e-dialog' href='".e_BASE."index.php?themepreview.".$theme['id']."'>".E_32_SEARCH."</a>";
-		$admin_icon 	= ($pref['admintheme'] != $theme['path'] ) ? "<button class='btn btn-default btn-small btn-sm btn-inverse' type='submit'   name='selectadmin[".$theme['id']."]' alt=\"".TPVLAN_32."\" title=\"".TPVLAN_32."\" >".$tp->toGlyph('fa-gears',array('size'=>'2x'))."</button>\n" : "<button class='btn btn-small btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
+		$admin_icon 	= ($pref['admintheme'] != $theme['path'] ) ? "<button class='btn btn-default btn-small btn-sm btn-inverse' type='submit'   name='selectadmin[".$theme['id']."]' alt=\"".TPVLAN_32."\" title=\"".TPVLAN_32."\" >".$tp->toGlyph('fa-gears',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-default btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
 		$price 			= '';
 		
 		if(substr($theme['thumbnail'],0,4) == 'http')
@@ -1063,7 +1063,7 @@ class themeHandler
 			$previewPath = e_BASE."index.php?themepreview.".$theme['id'];
 		}
 		
-		$thumbnail = "<img src='".$thumbPath."' style='width:200px; height:130px;'  alt='' />";
+		$thumbnail = "<img src='".$thumbPath."' style='width:100%; height:130px;'  alt='' />";
 		
 
 		if($_GET['mode'] == 'online')
@@ -1096,7 +1096,7 @@ class themeHandler
 		//	$main_icon = "<a data-toggle='modal' data-modal-caption=\"".$caption."\" href='{$downloadUrl}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
 			
 		
-			$main_icon = "<a class='e-modal btn-default btn btn-sm btn-small btn-inverse' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external'  href='{$downloadUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
+			$main_icon = "<a class='e-modal btn-default btn btn-sm btn-small btn-inverse' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external'  href='{$downloadUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a>";
 		
 			
 		
@@ -1164,8 +1164,8 @@ class themeHandler
 			$text = "
 				<div class='f-left block-text admin-theme-cell ".$borderStyle."'>
 					<div class='well admin-theme-thumb'>".$thumbnail."</div>
-					<div id='".$frm->name2id($theme['name'])."' class='btn-group admin-theme-options'>".$main_icon.$admin_icon.$info_icon.$preview_icon."</div>
+					<div id='".$frm->name2id($theme['name'])."' class='admin-theme-options'>".$main_icon.$admin_icon.$info_icon.$preview_icon."</div>
-					<div class='admin-theme-title'><small style='white-space:nowrap;display:inline-block;width:160px;overflow:hidden'>".$theme['name']." ".$theme['version']."</small>
+					<div class='admin-theme-title'><small>".$theme['name']." ".$theme['version']."</small>
 					".$price."
 					</div>	
 				</div>";

e107_themes/bootstrap/admin_style.css

@@ -1037,6 +1037,51 @@ li.rssRow > div {
 .notifications>div{position:relative;z-index:9999;margin:5px 0px;}
 .notifications.center{top:30%;left:0;width:100%;}.notifications.center>div{margin:5px auto;width:20%;text-align:center;}
 
+
+
+/* Theme selection */
+.admin-theme-thumb			{ height:130px;overflow:hidden;border:1px solid black; margin:0px; margin-bottom:10px; padding:0px;   }
+.admin-theme-thumb:hover	{ opacity:0.4 }
+
+.admin-theme-options		{ transition: opacity .20s ease-in-out;
+	-moz-transition: opacity .20s ease-in-out;
+	-webkit-transition: opacity .20s ease-in-out;
+	opacity:0;
+	width:100%;
+	height:80px;
+	padding-top:50px;
+	white-space:nowrap;
+	background-color:black;
+	display:block;position:relative; text-align:center; vertical-align:middle; top:-141px;}
+
+.admin-theme-options:hover	{ opacity:0.8; }
+/*
+.admin-theme-options button	{ background: none; color: white; border: none; padding:0px;  margin:3px; }
+.admin-theme-options a {color: inherit; display:inline-block }
+.admin-theme-options a span		{ color: inherit; padding-right: 5px; padding-left:0px; padding-top: 3px; margin-left:3px }
+*/
+
+.admin-theme-options .fa-check	{ color: #FAA732 }
+
+.admin-theme-title			{ line-height: 18px; overflow:hidden; padding-left:5px; white-space:no-wrap; width:200px; position:relative; top:-132px; }
+
+.admin-theme-select			{border:1px dotted silver;background-color:#DDDDDD;float:left }
+
+.admin-theme-select-active	{ background-color:red;float:left }
+
+.admin-theme-cell			{ width:202px; height:160px; padding:10px; -moz-border-radius: 5px; border-radius: 5px; margin:10px 10px 5px 0px}
+
+.admin-theme-cell-default   { border:1px dotted silver; background-color:#DDDDDD }
+
+
+
+.admin-theme-cell-site		{ background-color: #d9edf7;  border: 1px solid #bce8f1; }
+
+.admin-theme-cell-admin	 	{ background-color:#FFFFD5; border: 1px solid #FFCC00; }
+
+
+
+
 /*
 
 body { background-color: rgb(68, 68, 68); }

e107_themes/bootstrap3/admin_style.css

@@ -1124,6 +1124,41 @@ li.rssRow > div {
 .notifications>div{position:relative;z-index:9999;margin:5px 0px;}
 .notifications.center{top:30%;left:0;width:100%;}.notifications.center>div{margin:5px auto;width:20%;text-align:center;}
 
+
+
+
+/* Theme selection */
+.admin-theme-thumb			{ 200px; height:130px;overflow:hidden;border:1px solid black; margin:0px; margin-bottom:10px; padding:0px;   }
+.admin-theme-thumb:hover	{ opacity:0.4 }
+
+.admin-theme-options		{
+	transition: opacity .20s ease-in-out;
+	-moz-transition: opacity .20s ease-in-out;
+	-webkit-transition: opacity .20s ease-in-out;
+	opacity:0;
+	width:100%;
+	height:130px;
+	text-align: center;
+	padding-top:50px;
+	white-space:nowrap;
+	background-color:black;
+	display:block;position:relative; text-align:center; vertical-align:middle; top:-141px;}
+
+.admin-theme-options:hover	{ opacity:0.85; }
+.admin-theme-options .fa-check	{ color: #FAA732 }
+
+.admin-theme-title			    { line-height: 18px; overflow:hidden; padding-left:5px; white-space:nowrap; width:200px; position:relative; top:-135px; }
+.admin-theme-title span.label   { margin-top: -20px; margin-right: 15px; }
+.admin-theme-title small { white-space:nowrap;display:inline-block;width:140px;overflow:hidden }
+
+.admin-theme-select			    {border:1px dotted silver;background-color:#DDDDDD;float:left }
+.admin-theme-select-active	{ background-color:red;float:left }
+.admin-theme-cell			 { width:207px; height:170px; padding:10px; -moz-border-radius: 5px; border-radius: 5px; margin:10px 10px 5px 0px}
+.admin-theme-cell-default   { border:1px dotted silver; background-color:#DDDDDD }
+.admin-theme-cell-site		 { background-color: #d9edf7;  border: 1px solid #bce8f1; }
+.admin-theme-cell-admin	 	 { background-color:#FFFFD5; border: 1px solid #FFCC00; }
+
+
 /*
 
 body { background-color: rgb(68, 68, 68); }

e107_themes/bootstrap3/admin_theme.php

@@ -21,7 +21,7 @@ e107::js('core', 	'bootstrap3-editable/js/bootstrap-editable.min.js', 'jquery',
 // e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cosmo/bootstrap.min.css");
 // e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/darkly/bootstrap.min.css");
 
-e107::css('theme','css/bootstrap_dark.css');
+e107::css('theme','css/bootstrap-dark.min.css');
 e107::css('theme','admin_style.css');
 e107::css('theme','admin_dark.css');
 e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");