* 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

diff --git a/TODO b/TODO
index ae6ee31fb023fcbb2526a65dd0e32be0c3d8ad93..6bbda208ddc14476d6ca28448635ca9966838e22 100644 (file)
--- 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 768d1f4a89a43cf7c6ba4f87574f3b5ebaeadb56..beac374a3484b49653e403ff2d65b76e780d19b4 100755 (executable)
--- 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 e795803be3a6f25951d2470f68982f5e2d41bdcf..836e733a8a7d5095d77eb066f4b315f8e0370d60 100644 (file)
--- 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"=>"<input type='radio' name='gotoLdapServer' value='".$server."' ".$use.">",
-                  "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 ae317e9af894d59d0a81c774099793b1def4c914..d1213b4bd98d31393a609f51882c1cc44a51caf0 100644 (file)
--- 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"=>"<input type='radio' name='gotoLdapServer' value='".$key."' ".$use.">",
-                  "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 39ae8c8237471248dd32c07753b2a8b609b5e0cc..e45fa874a85cc0039f1b09636471ee324a29492d 100644 (file)
--- a/plugins/admin/systems/terminalStartup.tpl
+++ b/plugins/admin/systems/terminalStartup.tpl
@@ -4,11 +4,6 @@
   <td style="width:50%; vertical-align:top;">
 
    <table summary="" style="width:100%">
-    <tr>
-     <td colspan="2" style='vertical-align:top;padding-top:3px;width:100%'><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL>
-               {$SelectBoxLdapServer}
-     </td>
-    </tr>
     <tr>
      <td style="width:30%"><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
      <td>
@@ -23,6 +18,11 @@
      <td><input name="customParameters" id="customParameters"  size=25 maxlength=500 {$gotoKernelParametersACL}
                 value="{$customParameters}" title="{t}Enter any parameters that should be passed to the kernel as append line during bootup{/t}"></td>
     </tr>
+    <tr>
+     <td colspan="2" style='vertical-align:top;padding-top:3px;width:100%'><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL>
+               {$SelectBoxLdapServer}
+     </td>
+    </tr>
    </table>
 
   </td>

diff --git a/plugins/generic/welcome/welcome.tpl b/plugins/generic/welcome/welcome.tpl
index 896372ae292989bc91768ff1e8debf5cd359c6f5..35a27edf4edca2bd5071af80f0248da8b4514a9a 100644 (file)
--- a/plugins/generic/welcome/welcome.tpl
+++ b/plugins/generic/welcome/welcome.tpl
@@ -1,7 +1,7 @@
 {$header}
 
 <p>
-  {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}
 </p>
 
 <p>

diff --git a/plugins/personal/environment/hotplugDialogNew.tpl b/plugins/personal/environment/hotplugDialogNew.tpl
index 040f87dc66721c11e42763ac2dcc08d1e71d50ac..635e93c962aabf9c9fe327d6d43ecdac19bf3ea2 100644 (file)
--- a/plugins/personal/environment/hotplugDialogNew.tpl
+++ b/plugins/personal/environment/hotplugDialogNew.tpl
@@ -7,14 +7,14 @@
   <td width="50%">
        <table summary="{t}Create new hotplug device{/t}" style="border-right:1px solid #B0B0B0;width:100%">
                <tr>
-                       <td><LABEL for="HOT_name">{t}Device name{/t}</LABEL>
+                       <td><LABEL for="HOT_name">{t}Device name{/t}</LABEL>{$must}
                        </td>
                        <td>    
                                <input type="text" size=40 value="{$HOT_name}" name="HOT_name" id="HOT_name">
                        </td>
                </tr>
                <tr>
-                       <td><LABEL for="HOT_description">{t}Description{/t}</LABEL>
+                       <td><LABEL for="HOT_description">{t}Description{/t}</LABEL>{$must}
                        </td>
                        <td>
                                <input type="text" size=40 value="{$HOT_description}" name="HOT_description" id="HOT_description">
@@ -25,7 +25,7 @@
    <td style="vertical-align:top">
        <table summary="">
                <tr>
-                       <td><LABEL for="HOT_id">{t}Device ID{/t}</LABEL>
+                       <td><LABEL for="HOT_id">{t}Device ID{/t}</LABEL>{$must}
                        </td>
                        <td>
                                <input type="text" value="{$HOT_id}" name="HOT_id" id="HOT_id">

diff --git a/plugins/personal/password/nochange.tpl b/plugins/personal/password/nochange.tpl
index 775bcafe0920fc3333342805d01b33c512c8a4aa..280928cb73e8c07a8de991b9b5373bc1233ffd48 100644 (file)
--- a/plugins/personal/password/nochange.tpl
+++ b/plugins/personal/password/nochange.tpl
@@ -1,9 +1,9 @@
 <div class="plugtop">
-  <img class="center" alt="" src="{$headimage}" align="middle">{t}Change password not Allowed{/t}
+  <img class="center" alt="" src="{$headimage}" align="middle">{t}Password change not allowed{/t}
 </div>
 
 <p>
- <b>{t} You are not allowed to change your password at this time{/t}</b>
+ <b>{t}You are not allowed to change your password at this time{/t}</b>
 </p>
 
 <br>