diff --git a/templates/Froxlor/user/index.html.twig b/templates/Froxlor/user/index.html.twig index 5418f7db..aa345ab1 100644 --- a/templates/Froxlor/user/index.html.twig +++ b/templates/Froxlor/user/index.html.twig @@ -18,7 +18,7 @@ {% import "Froxlor/user/dashboard-item.html.twig" as dashboard %} {% if userinfo.adminsession == 1 %} {# admin-resources #} -
+
{{ dashboard.ditem('admin.customers', userinfo.customers, overview.number_customers) }} {{ dashboard.ditem('admin.domains', userinfo.domains, overview.number_domains) }} {{ dashboard.ditem('customer.diskspace', userinfo.diskspace_bytes, overview.diskspace_bytes_used, overview.diskspace_bytes, true) }} @@ -32,7 +32,7 @@
{% else %} {# customer-resources #} -
+
{{ dashboard.ditem('customer.diskspace', userinfo.diskspace_bytes, userinfo.diskspace_bytes_used, null, true) }} {{ dashboard.ditem('customer.traffic', userinfo.traffic_bytes, userinfo.traffic_bytes_used, null, true) }} {{ dashboard.ditem('customer.subdomains', userinfo.subdomains, userinfo.subdomains_used) }} @@ -47,54 +47,116 @@
-
-
-
Applicant Information
- Personal details and application. -
-
- dd -
-
- {% if userinfo.adminsession == 1 %} - {# froxlor-details #} -
-
- - {{ lng('admin.froxlordetails') }} -
-
    -
  • -
    -
    {{ lng('tasks.outstanding_tasks') }}
    - {% for task in outstanding_tasks %} - - {{ task.desc }}
    - {% endfor %} -
    -
    • - {% for cronrun in cron_last_runs %} + {# system infos #} +
    +
    + + {{ lng('admin.systemdetails') }} +
    +
    • -
      {{ cronrun.title }}
      - +
      +
      {{ lng('admin.hostname') }}
      + {{ sysinfo.hostname }} +
      +
      • +
    • +
      +
      {{ lng('admin.serversoftware') }}
      + {{ sysinfo.webserver }} +
      +
      • +
    • +
      +
      {{ lng('admin.phpversion') }}
      + {{ sysinfo.phpversion }} +
      +
      • +
    • +
      +
      {{ lng('admin.mysqlserverversion') }}
      + {{ sysinfo.mysqlserverversion }} +
      +
      • +
    • +
      +
      {{ lng('admin.webserverinterface') }}
      + {{ sysinfo.phpsapi }} +
      +
      • + {% if sysinfo.memory is not empty %} +
    • +
      +
      {{ lng('admin.memory') }}
      + 
      {{ sysinfo.memory }}
      +
      +
      • + {% endif %} +
    • +
      +
      {{ lng('admin.sysload') }}
      + {{ sysinfo.load }} +
      +
      • + {% if sysinfo.kernel is not empty %} +
    • +
      +
      Kernel
      + {{ sysinfo.kernel }} +
      +
      • + {% endif %} + {% if sysinfo.uptime is not empty %} +
    • +
      +
      Uptime
      + {{ sysinfo.uptime }} +
      +
      • + {% endif %} +
    +
    + {% endif %} +
+
+ {% if userinfo.adminsession == 1 %} + {# froxlor-details #} +
+
+ + {{ lng('admin.froxlordetails') }} +
+
    +
  • +
    +
    {{ lng('tasks.outstanding_tasks') }}
    + {% for task in outstanding_tasks %} + + {{ task.desc }}
    + {% endfor %} +
    +
    • + {% for cronrun in cron_last_runs %} +
  • +
    {{ cronrun.title }}
    + {% if cronrun.lastrun > 0 %} {{ cronrun.lastrun|date('d.m.Y H:i') }} {% else %} {{ lng('cronjobs.notyetrun') }} {% endif %} -
    • - {% endfor %} -
-
+ + {% endfor %} + +
{% endif %} -
-
+
-
Froxlor Newsfeed
- Personal details and application. + + Froxlor Newsfeed