From ef1a58ebdf4626e4916da0325192704502452925 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 17 Mar 2010 16:15:48 +0000 Subject: [PATCH] Updated templates git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16818 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/goto/addons/goto/deploy-list.tpl | 9 ++++--- .../goto/events/DaemonEvent_activate.tpl | 18 +++++++++----- .../goto/events/DaemonEvent_faireboot.tpl | 18 +++++++++----- .../goto/events/DaemonEvent_goto_reload.tpl | 18 +++++++++----- .../addons/goto/events/DaemonEvent_halt.tpl | 18 +++++++++----- .../DaemonEvent_installation_activation.tpl | 18 +++++++++----- .../goto/events/DaemonEvent_localboot.tpl | 18 +++++++++----- .../addons/goto/events/DaemonEvent_lock.tpl | 18 +++++++++----- .../goto/events/DaemonEvent_memcheck.tpl | 18 +++++++++----- .../addons/goto/events/DaemonEvent_notify.tpl | 15 ++++++++---- .../addons/goto/events/DaemonEvent_reboot.tpl | 18 +++++++++----- .../goto/events/DaemonEvent_reinstall.tpl | 18 +++++++++----- .../events/DaemonEvent_reload_ldap_config.tpl | 18 +++++++++----- .../addons/goto/events/DaemonEvent_rescan.tpl | 18 +++++++++----- .../goto/events/DaemonEvent_sysinfo.tpl | 18 +++++++++----- .../addons/goto/events/DaemonEvent_update.tpl | 18 +++++++++----- .../addons/goto/events/DaemonEvent_wakeup.tpl | 18 +++++++++----- .../addons/goto/events/timestamp_select.tpl | 14 +++++------ .../goto/addons/goto/goto_import_file.tpl | 24 ++++++++++++------- gosa-plugins/goto/addons/goto/remove.tpl | 3 ++- 20 files changed, 221 insertions(+), 114 deletions(-) diff --git a/gosa-plugins/goto/addons/goto/deploy-list.tpl b/gosa-plugins/goto/addons/goto/deploy-list.tpl index 0d06bedfb..26c980d44 100644 --- a/gosa-plugins/goto/addons/goto/deploy-list.tpl +++ b/gosa-plugins/goto/addons/goto/deploy-list.tpl @@ -1,6 +1,8 @@ - +
+ -
+ +

 {$HEADLINE} {$SIZELIMIT}

@@ -8,7 +10,8 @@
- +
{$ROOT} {$BACK} {$HOME} {$RELOAD} {$SEPARATOR} {t}Base{/t} {$BASE} {$SEPARATOR}  {$ACTIONS}{$ROOT} {$BACK} {$HOME} {$RELOAD} {$SEPARATOR} {t}Base{/t} {$BASE} {$SEPARATOR} {image path="images/rocket.png"} + {$ACTIONS}
diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_activate.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_activate.tpl index d8db5666c..5a4022aee 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_activate.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_activate.tpl @@ -3,15 +3,18 @@ - -
+ + -
{t}Time schedule{/t}

+ 		+{t}Time schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_faireboot.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_faireboot.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_faireboot.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_faireboot.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_goto_reload.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_goto_reload.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_goto_reload.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_goto_reload.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_halt.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_halt.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_halt.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_halt.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_installation_activation.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_installation_activation.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_installation_activation.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_installation_activation.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_localboot.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_localboot.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_localboot.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_localboot.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_lock.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_lock.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_lock.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_lock.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_memcheck.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_memcheck.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_memcheck.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_memcheck.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl index ed132fe9d..acb4f588d 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl @@ -3,7 +3,8 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + {t}Message settings{/t} @@ -24,11 +25,13 @@
+ + {t}Schedule{/t} - +
{$timestamp}

{$timestamp} +
@@ -65,7 +68,8 @@
-
+ + @@ -84,7 +88,8 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_reboot.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_reboot.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_reboot.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_reboot.tpl @@ -3,15 +3,18 @@ - -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_reinstall.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_reinstall.tpl index b61f37edf..95c4299ff 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_reinstall.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_reinstall.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_reload_ldap_config.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_reload_ldap_config.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_reload_ldap_config.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_reload_ldap_config.tpl @@ -3,15 +3,18 @@
+ + @@ -52,12 +56,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_rescan.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_rescan.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_rescan.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_rescan.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_sysinfo.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_sysinfo.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_sysinfo.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_sysinfo.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_update.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_update.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_update.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_update.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_wakeup.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_wakeup.tpl index 02f6dacaf..edd3aa550 100644 --- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_wakeup.tpl +++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_wakeup.tpl @@ -3,15 +3,18 @@
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- -
+ + -
{t}Schedule{/t}

+ 		+{t}Schedule{/t}

{$timestamp}
+ +
@@ -29,7 +32,8 @@ - - diff --git a/gosa-plugins/goto/addons/goto/events/timestamp_select.tpl b/gosa-plugins/goto/addons/goto/events/timestamp_select.tpl index 7664d59d6..cb253da29 100644 --- a/gosa-plugins/goto/addons/goto/events/timestamp_select.tpl +++ b/gosa-plugins/goto/addons/goto/events/timestamp_select.tpl @@ -10,33 +10,33 @@ @@ -56,7 +56,7 @@ diff --git a/gosa-plugins/goto/addons/goto/goto_import_file.tpl b/gosa-plugins/goto/addons/goto/goto_import_file.tpl index 03c7085bc..8c34cfd66 100644 --- a/gosa-plugins/goto/addons/goto/goto_import_file.tpl +++ b/gosa-plugins/goto/addons/goto/goto_import_file.tpl @@ -33,7 +33,8 @@

-
+ + @@ -48,12 +52,14 @@ - +
{t}ID{/t}{$data.MACADDRESS}
{t}Timestamp{/t}{t}Timestamp{/t} + {$timestamp}
+ +
- {html_options values=$years options=$years selected=$time_year}   - {html_options values=$months options=$months selected=$time_month}   - {html_options values=$days options=$days selected=$time_day}     - {html_options values=$hours options=$hours selected=$time_hour}   - {html_options values=$minutes options=$minutes selected=$time_minute}   - {html_options values=$seconds options=$seconds selected=$time_second} - {html_options options=$periodTypes selected=$periodType}
+
+ @@ -66,13 +67,20 @@ {/if} - - - - - - - + + + + + + + {/if} {/foreach} diff --git a/gosa-plugins/goto/addons/goto/remove.tpl b/gosa-plugins/goto/addons/goto/remove.tpl index ca744a4a9..d61aac0e1 100644 --- a/gosa-plugins/goto/addons/goto/remove.tpl +++ b/gosa-plugins/goto/addons/goto/remove.tpl @@ -1,5 +1,6 @@
-  {t}Warning{/t} + {image path="images/warning.png" align="top"} {t}Warning{/t} +

{$info} -- 2.30.2

{t}Timestamp{/t} {t}MAC{/t}
{$item.TIMESTAMP}{$item.MAC}{$item.HEADER}{$item.OGROUP}{$item.BASE}{$item.FQDN}{$item.IP}{$item.DHCP}{$item.MAC} +{$item.HEADER} +{$item.OGROUP} +{$item.BASE} +{$item.FQDN} +{$item.IP} +{$item.DHCP} +