auto-format all files; add table-definitions to test-bootstrap file

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

templates/Sparkle/2fa/overview.tpl

@@ -2,38 +2,41 @@ $header
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/lock_big.png"
-				alt="" />&nbsp; {$lng['login']['2fa']}
+			<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
+			{$lng['login']['2fa']}
 		</h2>
 	</header>
 
 	<section>
-		<if $userinfo['type_2fa'] == '0'>
+		<if $userinfo['type_2fa']=='0'>
 		<form method="post"
 			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'add'))}">
-			<p>{$lng['2fa']['2fa_overview_desc']}</p><br>
-			<select id="type_2fa" name="type_2fa" class="small">{$type_select}
-			</select>&nbsp;<input type="submit" class="submit" value="{$lng['2fa']['2fa_add']}" name="add" />
+			<p>{$lng['2fa']['2fa_overview_desc']}</p>
+			<br> <select id="type_2fa" name="type_2fa" class="small">{$type_select}
+			</select>&nbsp;<input type="submit" class="submit"
+				value="{$lng['2fa']['2fa_add']}" name="add" />
 		</form>
 		</if>
 
-		<if $userinfo['type_2fa'] == '1'>
+		<if $userinfo['type_2fa']=='1'>
 		<form method="post"
 			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'delete'))}">
-			<p>{$lng['2fa']['2fa_email_desc']}</p><br>
-			<input type="submit" class="cancel" value="{$lng['2fa']['2fa_delete']}" name="delete" />
+			<p>{$lng['2fa']['2fa_email_desc']}</p>
+			<br> <input type="submit" class="cancel"
+				value="{$lng['2fa']['2fa_delete']}" name="delete" />
 		</form>
 		</if>
 
-		<if $userinfo['type_2fa'] == '2'>
+		<if $userinfo['type_2fa']=='2'>
 		<form method="post"
 			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'delete'))}">
-			<p>{$lng['2fa']['2fa_ga_desc']}</p><br>
-			<img src="{$ga_qrcode}" alt="QRCode" /><br><br>
-			<input type="submit" class="cancel" value="{$lng['2fa']['2fa_delete']}" name="delete" />
+			<p>{$lng['2fa']['2fa_ga_desc']}</p>
+			<br> <img src="{$ga_qrcode}" alt="QRCode" /><br>
+			<br> <input type="submit" class="cancel"
+				value="{$lng['2fa']['2fa_delete']}" name="delete" />
 		</form>
 		</if>
-				
+
 	</section>
 
 </article>

templates/Sparkle/admin/phpconfig/overview.tpl

@@ -1,38 +1,37 @@
 $header
-	<article>
-		<header>
-			<h2>
-				<img src="templates/{$theme}/assets/img/icons/phpsettings_big.png" alt="" />&nbsp;
-				{$lng['menue']['phpsettings']['maintitle']}
-			</h2>
-		</header>
+<article>
+	<header>
+		<h2>
+			<img src="templates/{$theme}/assets/img/icons/phpsettings_big.png"
+				alt="" />&nbsp; {$lng['menue']['phpsettings']['maintitle']}
+		</h2>
+	</header>
 
-		<section>
+	<section>
 
-			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
-				<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
-			</div>
+		<div class="overviewadd">
+			<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+			<a
+				href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
+		</div>
 
-			<table class="full hl">
-				<thead>
-					<tr>
-						<th>{$lng['admin']['phpsettings']['description']}</th>
-						<th>{$lng['admin']['phpsettings']['activedomains']}</th>
-						<if \Froxlor\Settings::Get('phpfpm.enabled') == '1'>
-							<th>{$lng['admin']['phpsettings']['fpmdesc']}</th>
-						<else>
-							<th>{$lng['admin']['phpsettings']['binary']}</th>
-						</if>
-						<th>{$lng['admin']['phpsettings']['file_extensions']}</th>
-						<th>{$lng['panel']['options']}</th>
-				</thead>
-				<tbody>
-					$tablecontent
-				</tbody>
-			</table>
-			
-			<if 15 < $count>
+		<table class="full hl">
+			<thead>
+				<tr>
+					<th>{$lng['admin']['phpsettings']['description']}</th>
+					<th>{$lng['admin']['phpsettings']['activedomains']}</th>
+					<if \Froxlor\Settings::Get('phpfpm.enabled')=='1'>
+					<th>{$lng['admin']['phpsettings']['fpmdesc']}</th>
+					<else>
+					<th>{$lng['admin']['phpsettings']['binary']}</th></if>
+					<th>{$lng['admin']['phpsettings']['file_extensions']}</th>
+					<th>{$lng['panel']['options']}</th>
+			</thead>
+			<tbody>$tablecontent
+			</tbody>
+		</table>
+
+		<if15 < $count>
 				<div class="overviewadd">
 					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
@@ -41,5 +40,5 @@ $header
 
 		</section>
 
-	</article>
+</article>
 $footer

templates/Sparkle/assets/css/dark.css

@@ -1,34 +1,41 @@
 .content, nav {
 	background-color: #11171c;
 }
+
 nav div:first-child {
-	display:inherit;
+	display: inherit;
 }
+
 nav a {
 	color: #424a51;
 }
+
 nav a:hover {
 	color: #fff;
 }
+
 nav .active {
 	color: #fff;
 }
+
 .menuelement {
 	border: none;
 	color: #424a51;
 	margin: 15px 0 25px 10px;
 	padding: 0;
 }
+
 .menuelement h4 {
 	background: none;
 	color: #088ecc;
 	font-weight: 900;
 	text-transform: uppercase;
 }
+
 .menuelement h4 a {
 	color: #088ecc;
 }
 
 .topheader {
-	background:#f0f2f4;
-}
+	background: #f0f2f4;
+}

templates/Sparkle/assets/css/froxlor.css

@@ -1,92 +1,96 @@
 @charset "UTF-8";
 
 /* TYPE */
-html,body {
-	font-family:Numans, Verdana, Geneva, sans-serif;
-	background-color:#eeeeee;
-	font-size:12px;
+html, body {
+	font-family: Numans, Verdana, Geneva, sans-serif;
+	background-color: #eeeeee;
+	font-size: 12px;
 }
 
 .content {
-	background-color:#eeeeee;
-	min-width:100%;
-	margin-top:100px;
-	border-bottom:0;
+	background-color: #eeeeee;
+	min-width: 100%;
+	margin-top: 100px;
+	border-bottom: 0;
 }
 
 /*
  * main container
  */
 .main {
-	margin-left:240px;
-	margin-right:10px;
-	border:1px solid #666!important;
-	background:-webkit-gradient(linear, left top, right top, color-stop(0.16, rgb(220,220,220)), color-stop(1, rgb(255,255,255)));
-	background:-moz-linear-gradient(left center, rgb(220,220,220) 16%, rgb(255,255,255) 100%);
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#dcdcdc, endColorStr=#ffffff, GradientType=1);
-	-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#dcdcdc, endColorstr=#ffffff, GradientType=1)";
-	webkit-border-top-right-radius:20px;
-	-webkit-border-bottom-left-radius:20px;
-	-moz-border-radius-topright:20px;
-	-moz-border-radius-bottomleft:20px;
-	border-top-right-radius:20px;
-	border-bottom-left-radius:20px;
+	margin-left: 240px;
+	margin-right: 10px;
+	border: 1px solid #666 !important;
+	background: -webkit-gradient(linear, left top, right top, color-stop(0.16, rgb(220,
+		220, 220)), color-stop(1, rgb(255, 255, 255)));
+	background: -moz-linear-gradient(left center, rgb(220, 220, 220) 16%,
+		rgb(255, 255, 255) 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorStr=#dcdcdc,
+		endColorStr=#ffffff, GradientType=1);
+	-ms-filter:
+		"progid:DXImageTransform.Microsoft.gradient(startColorstr=#dcdcdc, endColorstr=#ffffff, GradientType=1)";
+	webkit-border-top-right-radius: 20px;
+	-webkit-border-bottom-left-radius: 20px;
+	-moz-border-radius-topright: 20px;
+	-moz-border-radius-bottomleft: 20px;
+	border-top-right-radius: 20px;
+	border-bottom-left-radius: 20px;
 }
 
 header img {
-	height:70px !important;
+	height: 70px !important;
 }
 
 h2 img {
-	width:32px!important;
-	height:32px!important;
+	width: 32px !important;
+	height: 32px !important;
 }
 
 .topheader {
-	background:#cccccc url('../img/header_g_froxlor.png') 0 bottom repeat-x;
-	margin-bottom:12px;
-	border-bottom:0;
+	background: #cccccc url('../img/header_g_froxlor.png') 0 bottom repeat-x;
+	margin-bottom: 12px;
+	border-bottom: 0;
 }
 
 .topheader_navigation {
-	display:none;
+	display: none;
 }
 
 .topheadernav img {
-	height:24px!important;
-	width:24px;
+	height: 24px !important;
+	width: 24px;
 }
 
 /* navigation */
 nav {
-	background-color:#eeeeee;
-	margin:0;
+	background-color: #eeeeee;
+	margin: 0;
 }
 
 nav div:first-child {
-	display:block;
-	margin-top:0;
+	display: block;
+	margin-top: 0;
 }
 
 nav div:nth-child(2) {
-	border-top:1px solid #666!important;
+	border-top: 1px solid #666 !important;
 }
 
 nav div:last-child {
-	border-bottom:1px solid #666!important;
+	border-bottom: 1px solid #666 !important;
 }
 
 .menuelement {
-	-webkit-border-top-right-radius:20px;
-	-webkit-border-bottom-left-radius:20px;
-	-moz-border-radius-topright:20px;
-	-moz-border-radius-bottomleft:20px;
-	border-top-right-radius:20px;
-	border-bottom-left-radius:20px;
+	-webkit-border-top-right-radius: 20px;
+	-webkit-border-bottom-left-radius: 20px;
+	-moz-border-radius-topright: 20px;
+	-moz-border-radius-bottomleft: 20px;
+	border-top-right-radius: 20px;
+	border-bottom-left-radius: 20px;
 	margin: 4px 0 8px 12px;
-	padding:4px 0 0 8px;
-	border:1px solid #666;
-	background-color:#fff;
+	padding: 4px 0 0 8px;
+	border: 1px solid #666;
+	background-color: #fff;
 }
 
 .menuelement ul li {
@@ -94,22 +98,22 @@ nav div:last-child {
 }
 
 .menuelement h4 {
-	color:#000;
+	color: #000;
 }
 
 .menuelement h4 a {
-	color:#000;
+	color: #000;
 }
 
 /* TABLES */
 table {
 	border: 1px solid #666;
-	-webkit-border-top-right-radius:20px;
-	-webkit-border-bottom-left-radius:20px;
-	-moz-border-radius-topright:20px;
-	-moz-border-radius-bottomleft:20px;
-	border-top-right-radius:20px;
-	border-bottom-left-radius:20px;
+	-webkit-border-top-right-radius: 20px;
+	-webkit-border-bottom-left-radius: 20px;
+	-moz-border-radius-topright: 20px;
+	-moz-border-radius-bottomleft: 20px;
+	border-top-right-radius: 20px;
+	border-bottom-left-radius: 20px;
 	background-color: #fff;
 }
 
@@ -121,9 +125,9 @@ table thead th, table th {
 }
 
 table thead th:last-child {
-	-webkit-border-top-right-radius:20px;
-	-moz-border-radius-topright:20px;
-	border-top-right-radius:20px;
+	-webkit-border-top-right-radius: 20px;
+	-moz-border-radius-topright: 20px;
+	border-top-right-radius: 20px;
 }
 
 table tfoot tr td {
@@ -145,78 +149,87 @@ table.hl tbody tr:hover:last-child td:first-child {
 }
 
 input {
-	color:#000;
-	background-color:#dae7ee!important;
-	border:1px solid #666666;
+	color: #000;
+	background-color: #dae7ee !important;
+	border: 1px solid #666666;
 }
 
 /*
  *  BUTTONS
  */
-input[type="button"],input[type="submit"],input[type="reset"],input[type="file"] {
-	padding:4px 10px;
-	margin:0 30px 0 0;
-	height:30px;
-	border:1px solid #999999;
-	-moz-border-radius:5px;
-	-khtml-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+input[type="button"], input[type="submit"], input[type="reset"], input[type="file"]
+	{
+	padding: 4px 10px;
+	margin: 0 30px 0 0;
+	height: 30px;
+	border: 1px solid #999999;
+	-moz-border-radius: 5px;
+	-khtml-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
 	background-color: #ccc;
 }
 
-.loginsec input[type="button"],.loginsec input[type="submit"],.loginsec input[type="reset"] {
-	margin:0 1px;
+.loginsec input[type="button"], .loginsec input[type="submit"],
+	.loginsec input[type="reset"] {
+	margin: 0 1px;
 }
 
-input[type="submit"],input[class="yesbutton"],input[type="submit"]:hover,input[class="yesbutton"]:hover,input[type="submit"]:active,input[class="yesbutton"]:active {
-	color:green!important;
-	background:#ccc url('../img/icons/button_ok.png') no-repeat 4px 8px!important;
-	padding-left:25px;
+input[type="submit"], input[class="yesbutton"], input[type="submit"]:hover,
+	input[class="yesbutton"]:hover, input[type="submit"]:active, input[class="yesbutton"]:active
+	{
+	color: green !important;
+	background: #ccc url('../img/icons/button_ok.png') no-repeat 4px 8px
+		!important;
+	padding-left: 25px;
 }
 
-input[class="nobutton"],input[type="reset"],input[class="nobutton"]:hover,input[type="reset"]:hover,input[class="nobutton"]:active,input[type="reset"]:active {
-	color:red!important;
-	background:#ccc url('../img/icons/cancel.png') no-repeat 4px 8px!important;
-	padding-left:25px;
+input[class="nobutton"], input[type="reset"], input[class="nobutton"]:hover,
+	input[type="reset"]:hover, input[class="nobutton"]:active, input[type="reset"]:active
+	{
+	color: red !important;
+	background: #ccc url('../img/icons/cancel.png') no-repeat 4px 8px
+		!important;
+	padding-left: 25px;
 }
 
 input[type="file"] {
-	color:blue!important;
-	background:#ccc url('../img/icons/button_ok.png') no-repeat 4px 8px!important;
-	padding-left:25px;
+	color: blue !important;
+	background: #ccc url('../img/icons/button_ok.png') no-repeat 4px 8px
+		!important;
+	padding-left: 25px;
 }
 
 select {
-	color:#000;
-	background-color:#dae7ee;
-	border:1px solid #666;
+	color: #000;
+	background-color: #dae7ee;
+	border: 1px solid #666;
 }
 
 .dboarditem {
 	margin: 4px 0 18px 12px;
 	border: 1px solid #666;
-	-webkit-border-top-right-radius:20px;
-	-webkit-border-bottom-left-radius:20px;
-	-moz-border-radius-topright:20px;
-	-moz-border-radius-bottomleft:20px;
-	border-top-right-radius:20px;
-	border-bottom-left-radius:20px;
-	padding:0;
+	-webkit-border-top-right-radius: 20px;
+	-webkit-border-bottom-left-radius: 20px;
+	-moz-border-radius-topright: 20px;
+	-moz-border-radius-bottomleft: 20px;
+	border-top-right-radius: 20px;
+	border-bottom-left-radius: 20px;
+	padding: 0;
 }
 
-.dboarditem td,.dboarditemfull td {
-	padding-left:20px;
+.dboarditem td, .dboarditemfull td {
+	padding-left: 20px;
 }
 
 .dboarditem table tbody tr:first-child th {
-	-webkit-border-top-right-radius:20px;
-	-moz-border-radius-topright:20px;
-	border-top-right-radius:20px;	
+	-webkit-border-top-right-radius: 20px;
+	-moz-border-radius-topright: 20px;
+	border-top-right-radius: 20px;
 }
 
 .dboarditem table tbody tr:last-child td:first-child {
-	-webkit-border-bottom-left-radius:20px;
-	-moz-border-radius-bottomleft:20px;
-	border-bottom-left-radius:20px;	
+	-webkit-border-bottom-left-radius: 20px;
+	-moz-border-radius-bottomleft: 20px;
+	border-bottom-left-radius: 20px;
 }

templates/Sparkle/assets/css/main.css

@@ -662,14 +662,14 @@ input[type="button"], input[type="submit"], input[type="reset"], input[type="fil
 	margin: 0 1px;
 }
 
-input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover, .btnlink:hover
-	{
+input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover,
+	.btnlink:hover {
 	color: #333;
 	background-color: #dcdcdc;
 }
 
-input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, .btnlink:active
-	{
+input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active,
+	.btnlink:active {
 	-webkit-box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
 	-moz-box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
 	box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
@@ -681,12 +681,14 @@ input[type="submit"], input[class="yesbutton"], .btnlink {
 	background-color: #35aa47;
 }
 
-input[type="submit"]:hover, input[class="yesbutton"]:hover, .btnlink:hover {
+input[type="submit"]:hover, input[class="yesbutton"]:hover, .btnlink:hover
+	{
 	color: #fff;
 	background-color: #1d943b;
 }
 
-input[class="submit"]:active, input[class="yesbutton"]:active, .btnlink:active {
+input[class="submit"]:active, input[class="yesbutton"]:active, .btnlink:active
+	{
 	background-color: #35aa47;
 }
 
@@ -1735,4 +1737,4 @@ td.size-50 {
 	font-weight: 700;
 	padding: 5px 10px;
 	color: #ffe !important;
-}
+}

templates/Sparkle/assets/css/main_ie.css

@@ -5,10 +5,10 @@ input {
 	padding: 4px 4px 0 24px;
 }
 
-input[type="submit"],input[class="nobutton"],input[type="reset"] {
+input[type="submit"], input[class="nobutton"], input[type="reset"] {
 	padding-left: 24px;
 }
 
 table thead th {
 	border-right: 1px solid #333;
-}
+}

templates/Sparkle/config.json

@@ -1 +1,26 @@
-{"variants":{"default":{"css":["main.css"],"js":["main.js", "apikey.js"],"description":"Default"},"froxlor":{"css":["main.css","froxlor.css"],"js":["main.js", "apikey.js"],"description":"Froxlor"}},"author":"Roman Schmerold"}
+{
+	"variants": {
+		"default": {
+			"css": [
+				"main.css"
+			],
+			"js": [
+				"main.js",
+				"apikey.js"
+			],
+			"description": "Default"
+		},
+		"froxlor": {
+			"css": [
+				"main.css",
+				"froxlor.css"
+			],
+			"js": [
+				"main.js",
+				"apikey.js"
+			],
+			"description": "Froxlor"
+		}
+	},
+	"author": "Roman Schmerold"
+}