Merge pull request #175 from BNoiZe/master

fixed scrolling in phpinfo(), various layoutfixes

templates/Sparkle/admin/settings/phpinfo.tpl

@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="dboarditemfull bradius">
+		<section class="dboarditemfull bradius" style="overflow: scroll;">
 			<table width="100%">
 				{$phpinfo}
 			</table>

templates/Sparkle/admin/templates/templates.tpl

@@ -31,6 +31,8 @@ $header
 
 	</article>
 	<br />
+	<br />
+	<br />
 	<article>
 		<header>
 			<h2>

templates/Sparkle/admin/templates/templates_add_1.tpl

@@ -10,18 +10,23 @@ $header
 		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'templates'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
-				<p>
-					<label for="language">{$lng['login']['language']}:</label>&nbsp;
-					<select id="language" name="language">$language_options</select>
-				</p>
-				<p class="submit">
+					<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="action" value="$action" />
 					<input type="hidden" name="prepare" value="prepare" />
-					<input type="submit" value="{$lng['panel']['next']}" />
-				</p>
+						
+					<table class="formtable tinyform">
+						<tr>
+							<td><label for="language">{$lng['login']['language']}:</label></td>
+							<td><select id="language" name="language">$language_options</select></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center"><input type="submit" value="{$lng['panel']['next']}" /></td>
+							</tr>
+						</tfoot>
+					</table>
 				</fieldset>
 			</form>
 		</section>

templates/Sparkle/assets/js/main.js

@@ -38,7 +38,7 @@ $(document).ready(function() {
 	var snheight = $('#sidenavigation').height();
 	var mainheight = $('#maincontent').height();
 	if (snheight > mainheight) {
-		$('#maincontent').height(snheight - 60);
+		$('#maincontent').height(snheight);
 	}
 
 	// this is necessary for the special setting feature (ref #1010)