diff --git a/lib/ajax.php b/lib/ajax.php index eaa6597c..ab8a6816 100644 --- a/lib/ajax.php +++ b/lib/ajax.php @@ -58,9 +58,10 @@ if ($action == "newsfeed") { $title = (string)$item->title; $link = (string)$item->link; $date = date("Y-m-d G:i", strtotime($item->pubDate)); - $content = preg_replace("/[\r\n]+/", "", strip_tags($item->description)); + $content = preg_replace("/[\r\n]+/", " ", strip_tags($item->description)); + $content = substr($content, 0, 150) . "..."; - echo "
" . $date . "
" . $title . "
" . $content . "
"; + echo "" . $date . "
" . $title . "
" . $content . ""; } } else { echo ""; diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index b7611145..872e2edc 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -4,256 +4,257 @@ $header {$lng['panel']['dashboard']} +
+
+
+ +
+ {$lng['admin']['customers']}
+ + {$overview['number_customers']} {$lng['panel']['used']}
+ + {$userinfo['customers']} {$lng['panel']['available']} + + +
+ +
+ +
+ {$lng['customer']['domains']}
+ + {$overview['number_domains']} {$lng['panel']['used']}
+ + {$userinfo['domains']} {$lng['panel']['available']} + + +
+ +
+ +
+ {$lng['customer']['subdomains']}
+ + {$overview['subdomains_used']} {$lng['panel']['used']}
+ {$userinfo['subdomains_used']} {$lng['panel']['assigned']}
+ + {$userinfo['subdomains']} {$lng['panel']['available']} + + +
+ +
+ +
+ {$lng['customer']['diskspace']}
+ + {$overview['diskspace_used']} {$lng['panel']['used']}
+ {$userinfo['diskspace_used']} {$lng['panel']['assigned']}
+ + {$userinfo['diskspace']} {$lng['panel']['available']} + + +
+ +
+ +
+ {$lng['customer']['traffic']}
+ + {$overview['traffic_used']} {$lng['panel']['used']}
+ {$userinfo['traffic_used']} {$lng['panel']['assigned']}
+ + {$userinfo['traffic']} {$lng['panel']['available']} + + +
+ +
+ +
+ {$lng['customer']['mysqls']}
+ + {$overview['mysqls_used']} {$lng['panel']['used']}
+ {$userinfo['mysqls_used']} {$lng['panel']['assigned']}
+ + {$userinfo['mysqls']} {$lng['panel']['available']} + + +
+ +
+ +
+ {$lng['customer']['emails']}
+ + {$overview['emails_used']} {$lng['panel']['used']}
+ {$userinfo['emails_used']} {$lng['panel']['assigned']}
+ + {$userinfo['emails']} {$lng['panel']['available']} + + +
+ +
+ +
+ {$lng['customer']['accounts']}
+ + {$overview['email_accounts_used']} {$lng['panel']['used']}
+ {$userinfo['email_accounts_used']} {$lng['panel']['assigned']}
+ + {$userinfo['email_accounts']} {$lng['panel']['available']} + + +
+ +
+ +
+ {$lng['customer']['forwarders']}
+ + {$overview['email_forwarders_used']} {$lng['panel']['used']}
+ {$userinfo['email_forwarders_used']} {$lng['panel']['assigned']}
+ + {$userinfo['email_forwarders']} {$lng['panel']['available']} + + +
+ + +
+ +
+ {$lng['customer']['email_quota']}
+ + {$overview['email_quota_used']} {$lng['panel']['used']}
+ {$userinfo['email_quota_used']} {$lng['panel']['assigned']}
+ + {$userinfo['email_quota']} {$lng['panel']['available']} + + +
+ + +
+ +
+ {$lng['customer']['ftps']}
+ + {$overview['ftps_used']} {$lng['panel']['used']}
+ {$userinfo['ftps_used']} {$lng['panel']['assigned']}
+ + {$userinfo['ftps']} {$lng['panel']['available']} + + +
+ + +
+ +
+ {$lng['customer']['tickets']}
+ + {$overview['tickets_used']} {$lng['panel']['used']}
+ {$userinfo['tickets_used']} {$lng['panel']['assigned']}
+ + {$userinfo['tickets']} {$lng['panel']['available']} + + +
+ +
+
-
- -
- {$lng['admin']['customers']}
- - {$overview['number_customers']} {$lng['panel']['used']}
- - {$userinfo['customers']} {$lng['panel']['available']} - - -
- -
- -
- {$lng['customer']['domains']}
- - {$overview['number_domains']} {$lng['panel']['used']}
- - {$userinfo['domains']} {$lng['panel']['available']} - - -
- -
- -
- {$lng['customer']['subdomains']}
- - {$overview['subdomains_used']} {$lng['panel']['used']}
- {$userinfo['subdomains_used']} {$lng['panel']['assigned']}
- - {$userinfo['subdomains']} {$lng['panel']['available']} - - -
- -
- -
- {$lng['customer']['diskspace']}
- - {$overview['diskspace_used']} {$lng['panel']['used']}
- {$userinfo['diskspace_used']} {$lng['panel']['assigned']}
- - {$userinfo['diskspace']} {$lng['panel']['available']} - - -
- -
- -
- {$lng['customer']['traffic']}
- - {$overview['traffic_used']} {$lng['panel']['used']}
- {$userinfo['traffic_used']} {$lng['panel']['assigned']}
- - {$userinfo['traffic']} {$lng['panel']['available']} - - -
- -
- -
- {$lng['customer']['mysqls']}
- - {$overview['mysqls_used']} {$lng['panel']['used']}
- {$userinfo['mysqls_used']} {$lng['panel']['assigned']}
- - {$userinfo['mysqls']} {$lng['panel']['available']} - - -
- -
- -
- {$lng['customer']['emails']}
- - {$overview['emails_used']} {$lng['panel']['used']}
- {$userinfo['emails_used']} {$lng['panel']['assigned']}
- - {$userinfo['emails']} {$lng['panel']['available']} - - -
- -
- -
- {$lng['customer']['accounts']}
- - {$overview['email_accounts_used']} {$lng['panel']['used']}
- {$userinfo['email_accounts_used']} {$lng['panel']['assigned']}
- - {$userinfo['email_accounts']} {$lng['panel']['available']} - - -
- -
- -
- {$lng['customer']['forwarders']}
- - {$overview['email_forwarders_used']} {$lng['panel']['used']}
- {$userinfo['email_forwarders_used']} {$lng['panel']['assigned']}
- - {$userinfo['email_forwarders']} {$lng['panel']['available']} - - -
- - -
- -
- {$lng['customer']['email_quota']}
- - {$overview['email_quota_used']} {$lng['panel']['used']}
- {$userinfo['email_quota_used']} {$lng['panel']['assigned']}
- - {$userinfo['email_quota']} {$lng['panel']['available']} - - -
- - -
- -
- {$lng['customer']['ftps']}
- - {$overview['ftps_used']} {$lng['panel']['used']}
- {$userinfo['ftps_used']} {$lng['panel']['assigned']}
- - {$userinfo['ftps']} {$lng['panel']['available']} - - -
- - -
- -
- {$lng['customer']['tickets']}
- - {$overview['tickets_used']} {$lng['panel']['used']}
- {$userinfo['tickets_used']} {$lng['panel']['assigned']}
- - {$userinfo['tickets']} {$lng['panel']['available']} - - -
- - -
- -
- -
- - - - -
News
-
-
- + + + + + + + + + +
News
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lng['admin']['systemdetails']}
{$lng['admin']['serversoftware']}:{$_SERVER['SERVER_SOFTWARE']}
{$lng['admin']['phpversion']}:$phpversion
{$lng['admin']['mysqlserverversion']}:$mysqlserverversion
{$lng['admin']['webserverinterface']}:$webserverinterface
{$lng['admin']['sysload']}:$load
Kernel:$kernel
Uptime:$uptime
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lng['admin']['systemdetails']}
{$lng['admin']['serversoftware']}:{$_SERVER['SERVER_SOFTWARE']}
{$lng['admin']['phpversion']}:$phpversion
{$lng['admin']['mysqlserverversion']}:$mysqlserverversion
{$lng['admin']['webserverinterface']}:$webserverinterface
{$lng['admin']['sysload']}:$load
Kernel:$kernel
Uptime:$uptime
- - - - - - - - {$outstanding_tasks} - {$cron_last_runs} - - - - - - - - - - - - - - - - - - - - - - - -
{$lng['admin']['froxlordetails']}
{$lng['admin']['installedversion']}:{$version}{$branding}
{$lng['admin']['latestversion']}:$lookfornewversion_lable$lookfornewversion_lable
{$lng['admin']['newerversionavailable']}
$lookfornewversion_addinfo
-
+ + + + + + + + {$outstanding_tasks} + {$cron_last_runs} + + + + + + + + + + + + + + + + + + + + + + + +
{$lng['admin']['froxlordetails']}
{$lng['admin']['installedversion']}:{$version}{$branding}
{$lng['admin']['latestversion']}:$lookfornewversion_lable$lookfornewversion_lable
{$lng['admin']['newerversionavailable']}
$lookfornewversion_addinfo
+
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 8f4baa79..37fb86e0 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -687,13 +687,10 @@ select[multiple="multiple"] { } .dboarditem { - width: 100%; - padding:0; margin-bottom: 20px; -} - -.dboarditemnews { border:1px solid #d1d5d8; + border-radius: 3px; + width: 100%; } .dboarditemfull { @@ -869,15 +866,15 @@ label.nobr { #newsfeed { display: none; } + .newsitem { border-bottom:1px solid #f1f2f3; padding:6px 5px 8px; - height:52px; + height:52px !important; line-height:18px; margin:0 5px; overflow:hidden; text-overflow:ellipsis; - white-space:nowrap; } .newsitem:last-child { @@ -897,10 +894,6 @@ label.nobr { text-decoration:underline; } -.newsitem b { - margin-right:15px; -} - .newsitem small { font-size:8px; color:gray; @@ -1024,12 +1017,10 @@ div.right { padding-top: 35px; } -.opera-only :-o-prefocus, -.grid-g { +.opera-only :-o-prefocus, .grid-g { word-spacing: -0.43em; } - .grid-u { display: inline-block; zoom: 1; *display: inline; @@ -1039,7 +1030,6 @@ div.right { text-rendering: auto; } - .grid-u-1,.grid-u-1-2 { display: inline-block; zoom: 1; *display: inline; @@ -1054,7 +1044,7 @@ div.right { } .grid-u-1-2 { - width: 50%; + width: 49%; } .grid-offset-1-2 {