From 4b440811044ff0ba60f6fcc90a8409aaf4037d3d Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 30 May 2006 16:07:57 +0000 Subject: [PATCH] * Fixed typos * Fixed layout * Fixed radio-button/text order git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3565 594d385d-05f5-0310-b6e9-bd551577e9d8 --- TODO | 8 +++++--- gen_online_help.sh | 2 +- plugins/admin/systems/class_terminalStartup.inc | 4 ++-- plugins/admin/systems/class_workstationStartup.inc | 4 ++-- plugins/admin/systems/terminalStartup.tpl | 10 +++++----- plugins/generic/welcome/welcome.tpl | 2 +- plugins/personal/environment/hotplugDialogNew.tpl | 6 +++--- plugins/personal/password/nochange.tpl | 4 ++-- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/TODO b/TODO index ae6ee31fb..6bbda208d 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ -Target for 2.4.1: -================= +Target for 2.5: +=============== * Add online help (english/german) Document how to generate it, generate it and check it in @@ -17,6 +17,8 @@ Target for 2.4.1: * Change FAIstate when triggering actions (install, sysinfo, softupdate) +* Fix hotplug device adding -> multi[] select + * Fix error messages on login * Fix DNS plugin @@ -24,7 +26,7 @@ Target for 2.4.1: * Error messages are partly wrong -Target for 2.5: +Target for 2.6: =============== * Asterisk : Create entry like this #309,1,PickupChan(SIP/rainer), diff --git a/gen_online_help.sh b/gen_online_help.sh index 768d1f4a8..beac374a3 100755 --- a/gen_online_help.sh +++ b/gen_online_help.sh @@ -30,7 +30,7 @@ for lang in *; do for source in *.lyx; do $LYX -e latex $source; d=../html/${source%%\.*}/ > /dev/null - [ -d $d ] || mkdir -p $d && rm -r $d/* + [ -d $d ] || mkdir -p $d && rm -r $d/* &> /dev/null $CNV -no_navigation -dir $d ${source%%\.*}.tex > /dev/null done diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc index e795803be..836e733a8 100644 --- a/plugins/admin/systems/class_terminalStartup.inc +++ b/plugins/admin/systems/class_terminalStartup.inc @@ -230,9 +230,9 @@ class termstartup extends plugin $SelectBoxLdapServer->AddEntry( array( - array("string"=>$visible), array("string"=>"", - "attach"=>"style='border-right:0px;'") + "attach"=>"style='border-left:0px;'"), + array("string"=>$visible) )); } diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc index ae317e9af..d1213b4bd 100644 --- a/plugins/admin/systems/class_workstationStartup.inc +++ b/plugins/admin/systems/class_workstationStartup.inc @@ -662,9 +662,9 @@ class workstartup extends plugin $SelectBoxLdapServer->AddEntry( array( - array("string"=>$display), array("string"=>"", - "attach"=>"style='border-right:0px;'") + "attach"=>"style='border-left:0px;'"), + array("string"=>$display) )); } diff --git a/plugins/admin/systems/terminalStartup.tpl b/plugins/admin/systems/terminalStartup.tpl index 39ae8c823..e45fa874a 100644 --- a/plugins/admin/systems/terminalStartup.tpl +++ b/plugins/admin/systems/terminalStartup.tpl @@ -4,11 +4,6 @@ - - - + + +
- {$SelectBoxLdapServer} -
@@ -23,6 +18,11 @@
+ {$SelectBoxLdapServer} +
diff --git a/plugins/generic/welcome/welcome.tpl b/plugins/generic/welcome/welcome.tpl index 896372ae2..35a27edf4 100644 --- a/plugins/generic/welcome/welcome.tpl +++ b/plugins/generic/welcome/welcome.tpl @@ -1,7 +1,7 @@ {$header}

- {t}This is the GOsa main screen. You can select your tasks from the menu on the left, or by choosing one of the pictograms below. All changes apply directly to your companies LDAP server.{/t} + {t}This is the GOsa main menu. You can select your tasks from the menu on the left, or by choosing one of the pictograms below. All changes apply directly to your companies LDAP server.{/t}

diff --git a/plugins/personal/environment/hotplugDialogNew.tpl b/plugins/personal/environment/hotplugDialogNew.tpl index 040f87dc6..635e93c96 100644 --- a/plugins/personal/environment/hotplugDialogNew.tpl +++ b/plugins/personal/environment/hotplugDialogNew.tpl @@ -7,14 +7,14 @@ - -
+ {$must}
+ {$must} @@ -25,7 +25,7 @@ -
+ {$must} diff --git a/plugins/personal/password/nochange.tpl b/plugins/personal/password/nochange.tpl index 775bcafe0..280928cb7 100644 --- a/plugins/personal/password/nochange.tpl +++ b/plugins/personal/password/nochange.tpl @@ -1,9 +1,9 @@
- {t}Change password not Allowed{/t} + {t}Password change not allowed{/t}

- {t} You are not allowed to change your password at this time{/t} + {t}You are not allowed to change your password at this time{/t}


-- 2.30.2