diff --git a/lib/ajax.php b/lib/ajax.php index 1615cf7a..6815926b 100644 --- a/lib/ajax.php +++ b/lib/ajax.php @@ -40,7 +40,7 @@ if ($action == "newsfeed") { $link = (string)$item->link; $content = preg_replace("/[\r\n]+/", "", strip_tags($item->description)); - echo "
" . $title . "" . $content . "
"; + echo "
" . $title . "
" . $content . "
"; } } else { echo ""; diff --git a/lng/english.lng.php b/lng/english.lng.php index c4b6edd4..9a9c5f94 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1976,3 +1976,4 @@ $lng['panel']['available'] = "available"; $lng['customer']['services'] = "Services"; $lng['serversettings']['phpfpm_settings']['ipcdir']['title'] = 'FastCGI IPC directory'; $lng['serversettings']['phpfpm_settings']['ipcdir']['description'] = 'The directory where the php-fpm sockets will be stored by the webserver.
This directory has to be readable for the webserver'; +$lng['panel']['news'] = "News"; \ No newline at end of file diff --git a/lng/german.lng.php b/lng/german.lng.php index 1b2925a2..892e5875 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1702,3 +1702,4 @@ $lng['panel']['available'] = "verfügbar"; $lng['customer']['services'] = "Dienste"; $lng['serversettings']['phpfpm_settings']['ipcdir']['title'] = 'FastCGI IPC Verzeichnis'; $lng['serversettings']['phpfpm_settings']['ipcdir']['description'] = 'In dieses Verzeichnis werden die php-fpm Sockets vom Webserver abgelegt.
Das Verzeichnis muss für den Webserver lesbar sein.'; +$lng['panel']['news'] = "Neuigkeiten"; \ No newline at end of file diff --git a/templates/Froxlor/admin/index/index.tpl.orig b/templates/Froxlor/admin/index/index.tpl.orig new file mode 100644 index 00000000..a75ce883 --- /dev/null +++ b/templates/Froxlor/admin/index/index.tpl.orig @@ -0,0 +1,162 @@ +$header +
+ + +
+
+
{$lng['admin']['warning']}
+

{$awaitingtickets_text}
+
+
+ + +
+ +
+

{$lng['admin']['ressourcedetails']}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lng['admin']['customers']} ({$lng['admin']['usedmax']}):{$overview['number_customers']} ({$userinfo['customers']})
{$lng['customer']['domains']} ({$lng['admin']['usedmax']}):{$overview['number_domains']} ({$userinfo['domains']})
{$lng['customer']['subdomains']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['subdomains_used']} ({$userinfo['subdomains_used']}/{$userinfo['subdomains']})
{$lng['customer']['diskspace']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['diskspace_used']} ({$userinfo['diskspace_used']}/{$userinfo['diskspace']})
{$lng['customer']['traffic']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['traffic_used']} ({$userinfo['traffic_used']}/{$userinfo['traffic']})
{$lng['customer']['mysqls']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['mysqls_used']} ({$userinfo['mysqls_used']}/{$userinfo['mysqls']})
{$lng['customer']['emails']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['emails_used']} ({$userinfo['emails_used']}/{$userinfo['emails']})
{$lng['customer']['accounts']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['email_accounts_used']} ({$userinfo['email_accounts_used']}/{$userinfo['email_accounts']})
{$lng['customer']['forwarders']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['email_forwarders_used']} ({$userinfo['email_forwarders_used']}/{$userinfo['email_forwarders']})
{$lng['customer']['email_quota']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['email_quota_used']} ({$userinfo['email_quota_used']}/{$userinfo['email_quota']})
{$lng['customer']['autoresponder']} ({$lng['admin']['usedmax']}):{$userinfo['email_autoresponder_used']} ({$userinfo['email_autoresponder']})
{$lng['aps']['numberofapspackages']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['aps_packages_used']} ({$userinfo['aps_packages_used']}/{$userinfo['aps_packages']})
{$lng['customer']['ftps']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['ftps_used']} ({$userinfo['ftps_used']}/{$userinfo['ftps']})
{$lng['customer']['tickets']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):{$overview['tickets_used']} ({$userinfo['tickets_used']}/{$userinfo['tickets']})
+
+
+

{$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']['froxlordetails']}

+ + {$outstanding_tasks} + {$cron_last_runs} + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lng['admin']['installedversion']}:{$version}{$branding}
{$lng['admin']['latestversion']}:$lookfornewversion_lable$lookfornewversion_lable
{$lng['admin']['newerversionavailable']}
$lookfornewversion_addinfo
+
+ +
+$footer + diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index 1886f487..36e0e4ff 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -4,10 +4,7 @@ $header {$lng['panel']['dashboard']} - -
-
-
+

@@ -196,15 +193,25 @@ $header
-
- + + + + +
- + @@ -212,7 +219,7 @@ $header - + diff --git a/templates/Sparkle/admin/index/index.tpl.orig b/templates/Sparkle/admin/index/index.tpl.orig new file mode 100644 index 00000000..0c9ae55d --- /dev/null +++ b/templates/Sparkle/admin/index/index.tpl.orig @@ -0,0 +1,282 @@ +$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']['autoresponder']}
+ + {$overview['email_autoresponder_used']} {$lng['panel']['used']}
+ {$userinfo['email_autoresponder_used']} {$lng['panel']['assigned']}
+ + {$userinfo['email_autoresponder']} {$lng['panel']['available']} + + +
+ + + +
+ +
+ {$lng['aps']['numberofapspackages']}
+ + {$overview['aps_packages_used']} {$lng['panel']['used']}
+ {$userinfo['aps_packages_used']} {$lng['panel']['assigned']}
+ + {$userinfo['aps_packages']} {$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']['systemdetails']}
{$lng['admin']['serversoftware']}:{$lng['admin']['serversoftware']}: {$_SERVER['SERVER_SOFTWARE']}
$phpversion
{$lng['admin']['mysqlserverversion']}:{$lng['admin']['mysqlserverversion']}: $mysqlserverversion
+ + + +
{$lng['panel']['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
+
+
+ + + + + {$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
+
+
+ + +$footer + diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 4fd8180f..7e2d4776 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -920,12 +920,16 @@ label.nobr { background: url(../img/top.png) no-repeat; } +.nowrap { + white-space: nowrap; +} + /* CANVAS STUFF */ .canvasitems { position:relative; overflow:hidden; width:100%; - margin-top:10px; + margin-top:0px; margin-bottom:10px; padding: 0 0 0 10px; } @@ -939,15 +943,16 @@ label.nobr { } .canvasbox canvas { width: 120px; + margin-bottom: 5px; } /* NEWSFEED */ .newsitem { border-bottom: 1px solid #f1f2f3; - padding: 6px 10px 8px 10px; - height: 16px; + padding: 6px 5px 8px 5px; + height: 36px; line-height: 20px; - margin: 0 10px; + margin: 0 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js index cf9a7307..f9767dfa 100644 --- a/templates/Sparkle/assets/js/main.js +++ b/templates/Sparkle/assets/js/main.js @@ -34,8 +34,8 @@ $(document).ready(function() { // Load Newsfeed var ajax_load = "
Loading newsfeed...
"; - $("#newsfeed").html(ajax_load).load("lib/ajax.php?action=newsfeed", function() { - if ($("#newsfeed").html() != "") { + $("#newsfeeditems").html(ajax_load).load("lib/ajax.php?action=newsfeed", function() { + if ($("#newsfeeditems").html() != "") { $("#newsfeed").slideDown(); } });