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

Various design fixes

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2014-01-24 15:14:57 +01:00
parent d2a51b4bca
commit 397c6e9c50
4 changed files with 160 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
templates/Sparkle/admin/index/index.tpl vendored
View File

@@ -167,7 +167,7 @@ $header
<if Settings::Get('admin.show_news_feed') == '1'> <if Settings::Get('admin.show_news_feed') == '1'>
<section class="dboarditem bradius" id="newsfeed"> <section class="dboarditem dboarditemnews bradius" id="newsfeed">
<table> <table>
<tr> <tr>
<th>News</th> <th>News</th>
@@ -177,76 +177,81 @@ $header
</section> </section>
</if> </if>
<section class="dboarditem bradius"> <table class="dboarditem bradius">
<table> <thead>
<tr> <tr>
<th colspan="2">{$lng['admin']['systemdetails']}</th> <th colspan="2">{$lng['admin']['systemdetails']}</th>
</tr> </tr>
<tr> </thead>
<td>{$lng['admin']['serversoftware']}:</td> <tbody>
<td>{$_SERVER['SERVER_SOFTWARE']}</td> <tr>
</tr> <td>{$lng['admin']['serversoftware']}:</td>
<tr> <td>{$_SERVER['SERVER_SOFTWARE']}</td>
<td>{$lng['admin']['phpversion']}:</td> </tr>
<td><a href="{$linker->getLink(array('section' => 'settings', 'page' => 'phpinfo'))}">$phpversion</a></td> <tr>
</tr> <td>{$lng['admin']['phpversion']}:</td>
<tr> <td><a href="{$linker->getLink(array('section' => 'settings', 'page' => 'phpinfo'))}">$phpversion</a></td>
<td class="nowrap">{$lng['admin']['mysqlserverversion']}:</td> </tr>
<td>$mysqlserverversion</td> <tr>
</tr> <td class="nowrap">{$lng['admin']['mysqlserverversion']}:</td>
<tr> <td>$mysqlserverversion</td>
<td>{$lng['admin']['webserverinterface']}:</td> </tr>
<td>$webserverinterface</td> <tr>
</tr> <td>{$lng['admin']['webserverinterface']}:</td>
<tr> <td>$webserverinterface</td>
<td>{$lng['admin']['sysload']}:</td> </tr>
<td>$load</td> <tr>
</tr> <td>{$lng['admin']['sysload']}:</td>
<if $showkernel == 1> <td>$load</td>
<tr> </tr>
<td>Kernel:</td> <if $showkernel == 1>
<td>$kernel</td> <tr>
</tr> <td>Kernel:</td>
</if> <td>$kernel</td>
<if $uptime != ''> </tr>
<tr> </if>
<td>Uptime:</td> <if $uptime != ''>
<td>$uptime</td> <tr>
</tr> <td>Uptime:</td>
</if> <td>$uptime</td>
</tr>
</if>
</tbody>
</table> </table>
</section>
<section class="dboarditem bradius"> <table class="dboarditem bradius">
<table> <thead>
<tr> <tr>
<th colspan="2">{$lng['admin']['froxlordetails']}</th> <th colspan="2">{$lng['admin']['froxlordetails']}</th>
</tr> </tr>
{$outstanding_tasks} </thead>
{$cron_last_runs} <tbody>
<tr width="50%"> {$outstanding_tasks}
<td>{$lng['admin']['installedversion']}:</td> {$cron_last_runs}
<td>{$version}{$branding}</td> <tr>
</tr> <td>{$lng['admin']['installedversion']}:</td>
<tr> <td>{$version}{$branding}</td>
<td>{$lng['admin']['latestversion']}:</td> </tr>
<if $isnewerversion != 0 > <tr>
<td><a href="$lookfornewversion_link"><strong>$lookfornewversion_lable</strong></a></td> <td>{$lng['admin']['latestversion']}:</td>
<else> <if $isnewerversion != 0 >
<td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td> <td><a href="$lookfornewversion_link"><strong>$lookfornewversion_lable</strong></a></td>
</if> <else>
</tr> <td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
<if $isnewerversion == 1 > </if>
<tr> </tr>
<td colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td> <if $isnewerversion == 1 >
</tr> <tr>
<if $lookfornewversion_addinfo != ''> <td colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td>
<tr> </tr>
<td colspan="2">$lookfornewversion_addinfo</td> <if $lookfornewversion_addinfo != ''>
</tr> <tr>
</if> <td colspan="2">$lookfornewversion_addinfo</td>
</if> </tr>
</if>
</if>
</tbody>
</table> </table>
</section>
<section class="clear"></section> <section class="clear"></section>
</article> </article>

24
templates/Sparkle/admin/message/message.tpl vendored
View File

@@ -7,34 +7,31 @@ $header
</h2> </h2>
</header> </header>
<section class="midform bradius"> <if 0 < $success >
<div class="successcontainer bradius">
<if 0 < $success > <div class="successtitle">{$lng['success']['success']}</div>
<div class="successcontainer bradius"> <div class="success">{$successmessage}</div>
<div class="successtitle">{$lng['success']['success']}</div> </div>
<div class="success">{$successmessage}</div> </if>
</div>
</if>
<section class="fullform bradius">
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded"> <form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
<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="send" value="send"/> <input type="hidden" name="send" value="send"/>
<fieldset>
<legend>Froxlor&nbsp;-&nbsp;{$lng['admin']['message']}</legend>
<table class="formtable"> <table class="formtable">
<tr> <tr>
<td><label for="receipient">{$lng['admin']['receipient']}</label></td> <td><b><label for="receipient">{$lng['admin']['receipient']}</label></b></td>
<td><select name="receipient" id="receipient">$receipients</select></td> <td><select name="receipient" id="receipient">$receipients</select></td>
</tr> </tr>
<tr> <tr>
<td><label for="subject">{$lng['admin']['subject']}</label></td> <td><b><label for="subject">{$lng['admin']['subject']}</label></b></td>
<td><input type="text" name="subject" id="subject" value="{$lng['admin']['nosubject']}"/></td> <td><input type="text" name="subject" id="subject" value="{$lng['admin']['nosubject']}"/></td>
</tr> </tr>
<tr> <tr>
<td><label for="message">{$lng['admin']['text']}</label></td> <td><b><label for="message">{$lng['admin']['text']}</label></b></td>
<td><textarea rows="12" name="message" id="message"></textarea></td> <td><textarea rows="12" name="message" id="message"></textarea></td>
</tr> </tr>
<tfoot> <tfoot>
@@ -45,7 +42,6 @@ $header
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</fieldset>
</form> </form>
</section> </section>

22
templates/Sparkle/assets/css/main.css vendored
View File

@@ -13,7 +13,7 @@ html,body {
font:12px/18px 'Lucida Grande','Lucida Sans Unicode',Helvetica,Arial,Verdana,sans-serif; font:12px/18px 'Lucida Grande','Lucida Sans Unicode',Helvetica,Arial,Verdana,sans-serif;
background-color: #f5f5f5; background-color: #f5f5f5;
color:#333; color:#333;
-webkit-font-smoothing:antialiased; -webkit-font-smoothing: subpixel-antialiased;
} }
body { body {
@@ -91,7 +91,6 @@ td a {
.bradius { .bradius {
border-radius: 3px; border-radius: 3px;
box-shadow:rgba(0,0,0,0.34902) 0 1px 3px 0;
} }
.topheader { .topheader {
@@ -204,6 +203,7 @@ footer img {
margin-right:auto; margin-right:auto;
margin-bottom:12px; margin-bottom:12px;
width:500px; width:500px;
box-shadow:rgba(0,0,0,0.34902) 0 1px 3px 0;
} }
.login div.warningcontainer, .login div.errorcontainer, .login div.successcontainer { .login div.warningcontainer, .login div.errorcontainer, .login div.successcontainer {
@@ -217,7 +217,6 @@ footer img {
.fullform,.midform,.tinyform { .fullform,.midform,.tinyform {
background-color:#fff; background-color:#fff;
border:1px solid #d1d5d8; border:1px solid #d1d5d8;
box-shadow:0 0 0 #000!important;
} }
.fullform p { .fullform p {
@@ -538,8 +537,9 @@ table {
width:100%; width:100%;
border-spacing:0; border-spacing:0;
border:1px solid #d1d5d8; border:1px solid #d1d5d8;
border-bottom: 0px;
border-collapse:separate; border-collapse:separate;
box-shadow:0 0 0 #000!important; box-shadow:0 0 0 #000 !important;
} }
table.bradius tbody tr:hover { table.bradius tbody tr:hover {
@@ -600,7 +600,7 @@ table tbody td {
} }
table tbody tr:last-child td { table tbody tr:last-child td {
border-bottom:0; border-bottom: 1px solid #d1d5d8;
} }
.formtable { .formtable {
@@ -680,12 +680,13 @@ textarea {
color: #333; color: #333;
padding:4px 4px 2px 24px; padding:4px 4px 2px 24px;
border:1px solid #d9d9d9; border:1px solid #d9d9d9;
margin-bottom:5px; margin: 5px 0 5px 0;
border-radius:3px; border-radius:3px;
} }
input[type="text"],input[type="password"] { input[type="text"],input[type="password"] {
width:400px; width:400px;
margin-top: 5px;
} }
input[type="password"] { input[type="password"] {
@@ -764,7 +765,7 @@ select {
color: #333; color: #333;
height:28px; height:28px;
border:1px solid #d9d9d9; border:1px solid #d9d9d9;
margin:0 5px 5px 0!important; margin:5px 5px 5px 0!important;
border-radius:3px; border-radius:3px;
background:url(../img/icons/down.png) no-repeat 9px; background:url(../img/icons/down.png) no-repeat 9px;
-webkit-appearance:none; -webkit-appearance:none;
@@ -792,7 +793,9 @@ select[multiple="multiple"] {
margin-bottom:15px; margin-bottom:15px;
margin-left:15px; margin-left:15px;
padding:0; padding:0;
box-shadow:0 0 0 #000; }
.dboarditemnews {
border:1px solid #d1d5d8; border:1px solid #d1d5d8;
} }
@@ -803,8 +806,6 @@ select[multiple="multiple"] {
margin-right:0; margin-right:0;
margin-bottom:15px; margin-bottom:15px;
margin-left:15px; margin-left:15px;
padding:0;
box-shadow:0 0 0 #000;
} }
.dboarditemfull { .dboarditemfull {
@@ -814,7 +815,6 @@ select[multiple="multiple"] {
margin-top:10px; margin-top:10px;
margin-bottom:10px; margin-bottom:10px;
padding:0; padding:0;
box-shadow:0 0 0 #000;
border:1px solid #d1d5d8; border:1px solid #d1d5d8;
} }

127
templates/Sparkle/customer/index/index.tpl vendored
View File

@@ -147,70 +147,73 @@ $header
</if> </if>
</section> </section>
<section class="dboarditem bradius"> <table class="dboarditem bradius">
<table> <thead>
<tr>
<th colspan="2">{$lng['index']['accountdetails']}</th>
</tr>
<tr>
<td>{$lng['login']['username']}:</td>
<td>{$userinfo['loginname']}</td>
</tr>
<tr>
<td>{$lng['customer']['domains']}:</td>
<td>$domains</td>
</tr>
<if $stdsubdomain != ''>
<tr> <tr>
<td>{$lng['admin']['stdsubdomain']}:</td> <th colspan="2">{$lng['index']['accountdetails']}</th>
<td>$stdsubdomain</td>
</tr> </tr>
</if> </thead>
<tr> <tbody>
<td>{$lng['customer']['services']}:</td> <tr>
<td>$services_enabled</td> <td>{$lng['login']['username']}:</td>
</tr> <td>{$userinfo['loginname']}</td>
<tr> </tr>
<th colspan="2">{$lng['index']['customerdetails']}</th> <tr>
</tr> <td>{$lng['customer']['domains']}:</td>
<if $userinfo['customernumber'] > <td>$domains</td>
<tr> </tr>
<td>{$lng['customer']['customernumber']}:</td> <if $stdsubdomain != ''>
<td>{$userinfo['customernumber']}</td> <tr>
</tr> <td>{$lng['admin']['stdsubdomain']}:</td>
</if> <td>$stdsubdomain</td>
<if $userinfo['company'] > </tr>
<tr> </if>
<td>{$lng['customer']['company']}:</td> <tr>
<td>{$userinfo['company']}</td> <td>{$lng['customer']['services']}:</td>
</tr> <td>$services_enabled</td>
</if> </tr>
<if $userinfo['name'] > <tr>
<tr> <th colspan="2">{$lng['index']['customerdetails']}</th>
<td>{$lng['customer']['name']}:</td> </tr>
<td>{$userinfo['firstname']} {$userinfo['name']}</td> <if $userinfo['customernumber'] >
</tr> <tr>
</if> <td>{$lng['customer']['customernumber']}:</td>
<if $userinfo['street'] > <td>{$userinfo['customernumber']}</td>
<tr> </tr>
<td>{$lng['customer']['street']}:</td> </if>
<td>{$userinfo['street']}</td> <if $userinfo['company'] >
</tr> <tr>
</if> <td>{$lng['customer']['company']}:</td>
<if $userinfo['city'] > <td>{$userinfo['company']}</td>
<tr> </tr>
<td>{$lng['customer']['zipcode']}/{$lng['customer']['city']}:</td> </if>
<td>{$userinfo['zipcode']} {$userinfo['city']}</td> <if $userinfo['name'] >
</tr> <tr>
</if> <td>{$lng['customer']['name']}:</td>
<if $userinfo['email'] > <td>{$userinfo['firstname']} {$userinfo['name']}</td>
<tr> </tr>
<td>{$lng['customer']['email']}:</td> </if>
<td>{$userinfo['email']}</td> <if $userinfo['street'] >
</tr> <tr>
</if> <td>{$lng['customer']['street']}:</td>
</table> <td>{$userinfo['street']}</td>
</section> </tr>
</if>
<if $userinfo['city'] >
<tr>
<td>{$lng['customer']['zipcode']}/{$lng['customer']['city']}:</td>
<td>{$userinfo['zipcode']} {$userinfo['city']}</td>
</tr>
</if>
<if $userinfo['email'] >
<tr>
<td>{$lng['customer']['email']}:</td>
<td>{$userinfo['email']}</td>
</tr>
</if>
</tbody>
</table>
<section class="clear"></section> <section class="clear"></section>
</article> </article>