maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #175 from BNoiZe/master

Browse Source 
fixed scrolling in phpinfo(), various layoutfixes
This commit is contained in:
Florian Aders
2013-12-04 12:47:18 -08:00
parent 84ab0e5daa 50bd0302b6
commit 69ac6c0d73
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/Sparkle/admin/settings/phpinfo.tpl vendored
View File

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

2
templates/Sparkle/admin/templates/templates.tpl vendored
View File

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

21
templates/Sparkle/admin/templates/templates_add_1.tpl vendored
View File

@@ -10,18 +10,23 @@ $header
<section class="tinyform bradius"> <section class="tinyform bradius">
<form method="post" action="{$linker->getLink(array('section' => 'templates'))}" enctype="application/x-www-form-urlencoded"> <form method="post" action="{$linker->getLink(array('section' => 'templates'))}" enctype="application/x-www-form-urlencoded">
<fieldset> <fieldset>
<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend> <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">
<input type="hidden" name="s" value="$s" /> <input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" /> <input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" /> <input type="hidden" name="action" value="$action" />
<input type="hidden" name="prepare" value="prepare" /> <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> </fieldset>
</form> </form>
</section> </section>

2
templates/Sparkle/assets/js/main.js vendored
View File

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