From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 12 Oct 2005 06:47:27 +0000 (+0000)
Subject: Layout changes
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=71ab3c98e7f3c8a40baf3f135acd90ef72dcc8d4;p=gosa.git

Layout changes


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1560 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/html/images/hotplug.png b/html/images/hotplug.png
new file mode 100644
index 000000000..546c7afad
Binary files /dev/null and b/html/images/hotplug.png differ
diff --git a/include/functions.inc b/include/functions.inc
index 26ae481b5..6db14c0b8 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -21,7 +21,7 @@
 /* Configuration file location */
 define ("CONFIG_DIR", "/etc/gosa");
 define ("CONFIG_TEMPLATE_DIR", "../contrib/");
-define ("HELP_BASEDIR", "/home/cajus/");
+define ("HELP_BASEDIR", "/var/www/doc/");
 
 /* Define globals for revision comparing */
 $svn_path = '$HeadURL$';
diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index 0c458576b..3802b2442 100644
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -3,13 +3,14 @@
 	{t}The environment extension is currently disabled.{/t}
 {else}
 <input type="hidden" name="iamposted" value="1">
+
+<h2><img alt="" src="images/fai_profile.png" align="middle">&nbsp;{t}Profiles{/t}</h2>
 <table summary="{t}Environment managment settings{/t}" width="100%">
-	<tr>
-		<td valign="top" width="50%">
-			<h2><img alt="" src="images/banana.png" align="middle">&nbsp;{t}Profiles{/t}</h2>
+  <tr>
+   <td style="width:50%;border-right:1px solid #B0B0B0;vertical-align:top;">
 			<table summary="{t}Profile managment{/t}">
 				<tr>
-					<td>
+					<td style="vertical-align:top">
 						<input type="checkbox" value="1" {$useProfileCHK} name="useProfile" {$useProfileACL} id="useProfile"
 									onclick="changeState('gotoProfileServer');changeState('gotoProfileFlag_C');">
 					</td>
@@ -27,7 +28,7 @@
 									<LABEL for="gotoProfileServer">{t}Profil path{/t}</LABEL>
 								</td>
 								<td>
-									<select style="width:350px;" id="gotoProfileServer" 
+									<select id="gotoProfileServer" 
 											name="gotoProfileServer" {$gotoProfileServerACL} id="gotoProfileServer">
 										{html_options values=$gotoProfileServerKeys output=$gotoProfileServers selected=$gotoProfileServer}
 										<option disabled>&nbsp;</option>
@@ -35,51 +36,18 @@
 								</td>
 							</tr>
 							<tr>
-								<td>	
-									<LABEL for="gotoProfileFlag_C">{t}Use local caching{/t}</LABEL>
-								</td>
-								<td>
+								<td colspan=2>	
 									<input type="checkbox" name="gotoProfileFlag_C" value="C" 
-										id="gotoProfileFlag_C" {$gotoProfileFlag_CACL} {$gotoProfileFlag_CCHK}>
+										id="gotoProfileFlag_C" {$gotoProfileFlag_CACL} {$gotoProfileFlag_CCHK}>&nbsp;
+									<LABEL for="gotoProfileFlag_C">{t}Cache profile localy{/t}</LABEL>
 								</td>
 							</tr>
 						</table>
 					</td>
 				</tr>
 				</table>
-				<table>
-				<tr>
-					<td>
-						<LABEL for="gotoProfileQuota">{t}Quota{/t}</LABEL> 
-					</td>
-					<td>
-						<input type="text" name="gotoProfileQuota" value="{$gotoProfileQuota}" style="width:100px;" 
-							{$gotoProfileQuotaACL} id="gotoProfileQuota">{t}MB{/t}
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<LABEL for="gotoXResolution">{t}Resolution{/t}</LABEL>
-					</td>
-					<td>
-						<select name="gotoXResolution" {$gotoXResolutionACL} id="gotoXResolution">
-                        	{html_options values=$gotoXResolutions output=$gotoXResolutions selected=$gotoXResolution}
-                            <option disabled>&nbsp;</option>
-                    	</select>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<input type="checkbox" name="gotoProfileFlag_L" id="gotoProfileFlag_L" value="L" {$gotoProfileFlagsACL} {$gotoProfileFlag_LCHK}>
-					</td>
-					<td>
-						<LABEL for="gotoProfileFlag_L">{t}Resolution changeable on runtime{/t}</LABEL>
-					</td>
-				</tr>
-			</table>
-
-			<p class="seperator">&nbsp;</p>
-            <h2><img alt="" src="images/banana.png" align="middle">&nbsp;{t}Kiosk profile{/t}</h2>	
+		</td>
+		<td style="vertical-align:top">
 			<table summary="{t}Kiosk profile settings{/t}">
 				<tr>
 					<td>
@@ -88,97 +56,132 @@
 					<td>
 						<select name="gotoKioskProfile" {$gotoKioskProfileACL} id="gotoKioskProfile">
                         {html_options values=$gotoKioskProfiles output=$gotoKioskProfiles selected=$gotoKioskProfile}
-                        <option disabled>&nbsp;</option>
+                        <option disabled>&nbsp;</option></select>&nbsp;
+						<input type="submit" name="KioskManagementDialog" value="{t}Manage{/t}" {$gotoKioskProfileACL}>
 					</td>
 				</tr>
 				<tr>
 					<td>
-						&nbsp;
-					</td>
-					<td>
-						<input type="submit" name="KioskManagementDialog" value="{t}Profile management{/t}" {$gotoKioskProfileACL}>
+						<LABEL for="gotoProfileQuota">{t}Quota{/t}</LABEL> 
+						<br>
+						<br>
 					</td>
-				</tr>
-			</table>	
-			<p class="seperator">&nbsp;</p>
-			<h2><img alt="" src="images/banana.png" align="middle">&nbsp;<LABEL for="gotoLogonScript">{t}Logon scripts{/t}</LABEL></h2>
-			<table summary="{t}Logon script management{/t}">
-				<tr>
 					<td>
-			        	<select style="width:350px;" name="gotoLogonScript" multiple size=4 {$gotoLogonScriptACL} id="gotoLogonScript">
-                        {html_options values=$gotoLogonScriptKeys output=$gotoLogonScripts }
-                        <option disabled>&nbsp;</option>
-						</select>
-			
+						<input type="text" name="gotoProfileQuota" value="{$gotoProfileQuota}" style="width:100px;" 
+							{$gotoProfileQuotaACL} id="gotoProfileQuota">{t}MB{/t}
+						<br>
 						<br>
-						<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptNew"		value="{t}Add{/t}">
-						<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptDel" 	value="{t}Delete{/t}"> 
-						<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptEdit" 	value="{t}Edit{/t}"> 
 					</td>
 				</tr>
-			</table>	
-		</td>
-		<td style="border-left: 1px solid rgb(160, 160, 160);"  valign="top">
-			<h2><img alt="" src="images/banana.png" align="middle">&nbsp;<LABEL for="gotoShare">{t}Attach share{/t}</LABEL></h2>
-			<table summary="">
 				<tr>
-					<td>
-			        	<select style="width:350px;" name="gotoShare" multiple size=4 {$gotoShareACL} id="gotoShare">
-                        {html_options values=$gotoShareKeys output=$gotoShares}
-                        <option disabled>&nbsp;</option>
-						</select>
-						<br>
-			        	<select name="gotoShareSelection" {$gotoShareACL}>
-                        {html_options values=$gotoShareSelectionKeys output=$gotoShareSelections}
-                        <option disabled>&nbsp;</option>
-						</select>
-						<input type="text"	 {$gotoShareACL} name="gotoShareMountPoint"	value="">
-						<input type="submit" {$gotoShareACL} name="gotoShareAdd" 		value="+"> 
-						<input type="submit" {$gotoShareACL} name="gotoShareDel" 		value="-"> 
+					<td colspan=2>
+						<input type="checkbox" name="gotoProfileFlag_L" id="gotoProfileFlag_L" value="L" {$gotoProfileFlagsACL} {$gotoProfileFlag_LCHK}>
+						<LABEL for="gotoProfileFlag_L">{t}Resolution changeable on runtime{/t}</LABEL>
 					</td>
 				</tr>
-			</table>
-			<p class="seperator">&nbsp;</p>
-            <h2><img alt="" src="images/banana.png" align="middle">&nbsp;<LABEL for="gotoHotplugDevice">{t}Hotplug devices{/t}</LABEL></h2>	
-			<table summary="{t}Hotplug device settings{/t}">
 				<tr>
 					<td>
-						<select name="gotoHotplugDevice" {$gotoHotplugDeviceACL} size=4  style="width:350px;" id="gotoHotplugDevice">
-                        {html_options values=$gotoHotplugDeviceKeys output=$gotoHotplugDevices}
-                        <option disabled>&nbsp;</option>
+						<LABEL for="gotoXResolution">{t}Resolution{/t}</LABEL>
 					</td>
-				</tr>
-				<tr>
 					<td>
-						<input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceNew" value="{t}New{/t}">
-						<input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceUse" value="{t}Existing{/t}">
-						<input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceDel" value="{t}Delete{/t}">
+						<select name="gotoXResolution" {$gotoXResolutionACL} id="gotoXResolution">
+                        	{html_options values=$gotoXResolutions output=$gotoXResolutions selected=$gotoXResolution}
+                            <option disabled>&nbsp;</option>
+                    	</select>
 					</td>
 				</tr>
-			</table>
-		 	<p class="seperator">&nbsp;</p>
-            <h2><img alt="" src="images/banana.png" align="middle">&nbsp;<LABEL for="gotoPrinter">{t}Printer{/t}</LABEL></h2>
-            <table summary="{t}Printer settings{/t}">
-                <tr>
-                    <td>
-                        <select style="width:350px;" name="gotoPrinter" multiple size=4 {$gotoPrinterACL} id="gotoPrinter">
-                        {html_options values=$gotoPrinterKeys output=$gotoPrinters}
-                        <option disabled>&nbsp;</option>
-                        </select>
-                        <br>
-                        <input type="submit" {$gotoPrinterACL} name="gotoPrinterAdd"     value="{t}Add{/t}">
-                        <input type="submit" {$gotoPrinterACL} name="gotoPrinterDel"     value="{t}Delete{/t}">
-                        <input type="submit" {$gotoPrinterACL} name="gotoPrinterEdit"    value="{t}Admin Toggle{/t}">
-                    </td>
-                </tr>
-            </table>
-		</td>
-	</tr>
-</table>	
-	
-		
+			</table>	
+   </td>
+  </tr>
+</table>
 
+<p class="seperator">&nbsp;</p>
 
+<table summary="{t}Environment managment settings{/t}" width="100%">
+  <tr>
+   <td style="width:50%;border-right:1px solid #B0B0B0">
+	<h2><img alt="" src="images/fai_partitionTable.png" align="middle">&nbsp;<LABEL for="gotoShare">{t}Shares{/t}</LABEL></h2>
+	<table summary="">
+		<tr>
+			<td>
+			<select style="width:350px;" name="gotoShare" multiple size=4 {$gotoShareACL} id="gotoShare">
+	{html_options values=$gotoShareKeys output=$gotoShares}
+	<option disabled>&nbsp;</option>
+				</select>
+				<br>
+			<select name="gotoShareSelection" {$gotoShareACL}>
+	{html_options values=$gotoShareSelectionKeys output=$gotoShareSelections}
+	<option disabled>&nbsp;</option>
+				</select>
+				<input type="text" size=15 {$gotoShareACL} name="gotoShareMountPoint" value="{t}Mountpoint{/t}">
+				<input type="submit" {$gotoShareACL} name="gotoShareAdd" value="{t}Add{/t}"> 
+				<input type="submit" {$gotoShareACL} name="gotoShareDel" value="{t}Remove{/t}"> 
+			</td>
+		</tr>
+	</table>
+   </td>
+   <td>
+	<h2><img alt="" src="images/fai_script.png" align="middle">&nbsp;<LABEL for="gotoLogonScript">{t}Logon scripts{/t}</LABEL></h2>
+	<table summary="{t}Logon script management{/t}">
+		<tr>
+			<td>
+			<select style="width:350px;" name="gotoLogonScript" multiple size=4 {$gotoLogonScriptACL} id="gotoLogonScript">
+	{html_options values=$gotoLogonScriptKeys output=$gotoLogonScripts }
+	<option disabled>&nbsp;</option>
+				</select>
 	
+				<br>
+				<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptNew"		value="{t}Add{/t}">
+				<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptDel" 	value="{t}Delete{/t}"> 
+				<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptEdit" 	value="{t}Edit{/t}"> 
+			</td>
+		</tr>
+	</table>	
+   </td>
+  </tr>
+</table>
+
+<p class="seperator">&nbsp;</p>
+
+<table summary="{t}Environment managment settings{/t}" width="100%">
+  <tr>
+   <td style="border-right:1px solid #B0B0B0">
+	<h2><img alt="" src="images/hotplug.png" align="middle">&nbsp;<LABEL for="gotoHotplugDevice">{t}Hotplug devices{/t}</LABEL></h2>	
+	<table summary="{t}Hotplug device settings{/t}">
+		<tr>
+			<td>
+				<select name="gotoHotplugDevice" {$gotoHotplugDeviceACL} size=4  style="width:350px;" id="gotoHotplugDevice">
+	{html_options values=$gotoHotplugDeviceKeys output=$gotoHotplugDevices}
+	<option disabled>&nbsp;</option>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceNew" value="{t}New{/t}">
+				<input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceUse" value="{t}Existing{/t}">
+				<input type="submit" {$gotoHotplugDeviceACL} name="gotoHotplugDeviceDel" value="{t}Delete{/t}">
+			</td>
+		</tr>
+	</table>
+   </td>
+   <td>
+    <h2><img alt="" src="images/select_printer.png" align="middle">&nbsp;<LABEL for="gotoPrinter">{t}Printer{/t}</LABEL></h2>
+    <table summary="{t}Printer settings{/t}">
+	<tr>
+	    <td>
+		<select style="width:350px;" name="gotoPrinter" multiple size=4 {$gotoPrinterACL} id="gotoPrinter">
+		{html_options values=$gotoPrinterKeys output=$gotoPrinters}
+		<option disabled>&nbsp;</option>
+		</select>
+		<br>
+		<input type="submit" {$gotoPrinterACL} name="gotoPrinterAdd"     value="{t}Add{/t}">
+		<input type="submit" {$gotoPrinterACL} name="gotoPrinterDel"     value="{t}Delete{/t}">
+		<input type="submit" {$gotoPrinterACL} name="gotoPrinterEdit"    value="{t}Admin Toggle{/t}">
+	    </td>
+	</tr>
+    </table>
+   </td>
+  </tr>
+</table>
 
 {/if}
diff --git a/plugins/personal/environment/hotplugDialog.tpl b/plugins/personal/environment/hotplugDialog.tpl
index 61a84072d..759b637bf 100644
--- a/plugins/personal/environment/hotplugDialog.tpl
+++ b/plugins/personal/environment/hotplugDialog.tpl
@@ -1,4 +1,4 @@
-<h2><img alt="" src="images/house.png" align="middle">&nbsp;{t}Select hotplug entry{/t}</h2>
+<h2><img alt="" src="images/hotplug.png" align="middle">&nbsp;{t}Add hotplug devices{/t}</h2>
 
     <input type="hidden" name="dialogissubmitted" value="1">
 
@@ -7,7 +7,7 @@
             <td width="50%" style="vertical-align:top;">
 	 			<div class="contentboxh" style="height:20px;">
     				<p class="contentboxh" style="font-size:12px">
-     					<b><LABEL for="hotplugName">Select hotplug to add</LABEL></b>
+     					<b><LABEL for="hotplugName">{t}Select hotplug device to add{/t}</LABEL></b>
     				</p>
    				</div>
    				<div class="contentboxb">
@@ -24,8 +24,8 @@
                     <p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
                 </div>
                 <div class="contentboxb">
-                    <p class="contentboxb">
-                        {t}This menu allows you to select an existing hotplug configuration.{/t}
+                    <p class="contentboxb" style="background-color:#F8F8F8">
+                        {t}This menu allows you to select existing hotplug devices. All devices of all users are choosable here.{/t}
                     </p>
                 </div>
                 <br>
@@ -34,24 +34,20 @@
                     <p class="contentboxh"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
                 </div>
                 <div class="contentboxb">
+                    <table summary="" style="width:100%;border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+                    {$alphabet}
+                    </table>
                 <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
                     <tr>
-                        <td width="50%">
-                            <img alt="" src="{$tree_image}" align=middle>&nbsp;{t}Display hotplugs of department{/t}
-                        </td>
                         <td>
+                            <img alt="" src="{$tree_image}" align=middle>&nbsp;
                             <select name="depselectHot" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based    on{/t}">
                               {html_options options=$deplistHot selected=$depselectHot}
                             </select>
                         </td>
                     </tr>
                 </table>
-                </div>
-                <div class="contentboxb">
-                    <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
-                    {$alphabet}
-                    </table>
-                        <table summary="" width="100%" style="border-top:1px solid #B0B0B0;">
+                        <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
                             <tr>
                                 <td>
                                     <LABEL for='filter'><img alt="Search" src="{$search_image}" align="middle" title="{t}Display users matching{/t}">
@@ -71,8 +67,10 @@
 		</tr>
 	</table>
 
+    <p class="seperator">&nbsp;</p>
+
     <p align="right">
-    <input type="submit" name="HotPlugSave"     value="{t}Use{/t}">
+    <input type="submit" name="HotPlugSave"     value="{t}Add{/t}">
     <input type="submit" name="HotPlugCancel"   value="{t}Cancel{/t}">
     </p>
 
diff --git a/plugins/personal/environment/hotplugDialogNew.tpl b/plugins/personal/environment/hotplugDialogNew.tpl
index f65565328..fd6ea9df1 100644
--- a/plugins/personal/environment/hotplugDialogNew.tpl
+++ b/plugins/personal/environment/hotplugDialogNew.tpl
@@ -1,30 +1,39 @@
-<h2><img alt="" src="images/house.png" align="middle">&nbsp;{t}Create new hotplug entry{/t}</h2>
+<h2><img alt="" src="images/hotplug.png" align="middle">&nbsp;{t}Create new hotplug entry{/t}</h2>
 	
 	<input type="hidden" name="dialogissubmitted" value="1">
 	
-	<table summary="{t}Create new hotplug entry{/t}">
+<table width="100%">
+ <tr>
+  <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}Name{/t}</LABEL>
+			<td><LABEL for="HOT_name">{t}Device name{/t}</LABEL>
 			</td>
 			<td>	
-				<input type="text" value="{$HOT_name}" name="HOT_name" id="HOT_name">
+				<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>
 			<td>
-				<input type="text" value="{$HOT_description}" name="HOT_description" id="HOT_description">
+				<input type="text" size=40 value="{$HOT_description}" name="HOT_description" id="HOT_description">
 			</td>
 		</tr>
+	</table>
+   </td>
+   <td style="vertical-align:top">
+	<table>
 		<tr>
-			<td><LABEL for="HOT_id">{t}ID{/t}</LABEL>
+			<td><LABEL for="HOT_id">{t}Device ID{/t}</LABEL>
 			</td>
 			<td>
 				<input type="text" value="{$HOT_id}" name="HOT_id" id="HOT_id">
 			</td>
 		</tr>
 	</table>
+</table>
+	<p class="seperator">&nbsp;</p>
 	<p align="right">
 	<input type="submit" name="HotPlugSave" 	value="{t}save{/t}">
 	<input type="submit" name="HotPlugCancel" 	value="{t}Cancel{/t}">
diff --git a/plugins/personal/environment/kioskManagement.tpl b/plugins/personal/environment/kioskManagement.tpl
index 612e69a7d..88e9a40f3 100644
--- a/plugins/personal/environment/kioskManagement.tpl
+++ b/plugins/personal/environment/kioskManagement.tpl
@@ -2,14 +2,14 @@
 
     <input type="hidden" name="dialogissubmitted" value="1">
 
-	<table summary="{t}Kiosk profile management{/t}">
+	<table summary="{t}Kiosk profile management{/t}" width="100%">
 		<tr>
 			<td>
-            	<select style="width:350px;" size=8 name="gotoKioskProfile" {$gotoKioskProfileACL} id="gotoKioskProfile">
+            	<select style="width:100%;" size=8 name="gotoKioskProfile" {$gotoKioskProfileACL} id="gotoKioskProfile">
                 {html_options values=$gotoKioskProfileKeys output=$gotoKioskProfiles}
                 <option disabled>&nbsp;</option>
                 </select><br>
-				<input type="file" 	 name="newProfile" value="{t}Browse{/t}">			
+		<input type="file" size=50 name="newProfile" value="{t}Browse{/t}">			
     		<input type="submit" name="profileAdd" value="{t}Add{/t}">
 			  <input type="submit" name="profileDel" value="{t}Remove{/t}">
 			</td>
diff --git a/plugins/personal/environment/logonManagement.tpl b/plugins/personal/environment/logonManagement.tpl
index 178dc57cc..3917270c3 100644
--- a/plugins/personal/environment/logonManagement.tpl
+++ b/plugins/personal/environment/logonManagement.tpl
@@ -1,29 +1,28 @@
-<h2><img alt="" src="images/house.png" align="middle">&nbsp;{t}Logon management{/t}</h2>
+<h2><img alt="" src="images/fai_script.png" align="middle">&nbsp;{t}Logon script management{/t}</h2>
 
     <input type="hidden" name="dialogissubmitted" value="1">
 
     <table summary="{t}Logon script management{/t}" width="100%">
     	<tr>
-			<td width="50%">
+			<td width="50%" style="vertical-align:top;border-right:1px solid #B0B0B0">
 					<table summary="{t}Logon script settings{/t}">
 						<tr>
-							<td><LABEL for="LogonName">{t}Name{/t}</LABEL>
+							<td><LABEL for="LogonName">{t}Skript name{/t}</LABEL>
 							</td>
 							<td>
-								<input type="text" value="{$LogonName}" name="LogonName" {$LogonNameACL} id="LogonName">
+								<input type="text" size=20 value="{$LogonName}" name="LogonName" {$LogonNameACL} id="LogonName">
 							</td>
 						</tr>
 						<tr>
 							<td><LABEL for="LogonDescription">{t}Description{/t}</LABEL>
 							</td>
 							<td>
-								<input type="text" value="{$LogonDescription}" name="LogonDescription" id="LogonDescription"> 
+								<input type="text" size=40 value="{$LogonDescription}" name="LogonDescription" id="LogonDescription"> 
 							</td>
 						</tr>
 						<tr>
 							<td><LABEL for="LogonPriority">{t}Priority{/t}</LABEL>
-							</td>
-							<td>
+							</td><td>
 				            	<select name="LogonPriority" id="LogonPriority">
                 					{html_options values=$LogonPriorityKeys output=$LogonPrioritys}
                 				</select>
@@ -31,49 +30,48 @@
 						</tr>
 					</table>
 			</td>
-			<td>
+			<td style="vertical-align:top">
 					<table summary="{t}Logon script flags{/t}">
 						<tr>
 							<td>
 								<input type="checkbox" value="L" name="LogonLast" {$LogonLastCHK} id="LogonLast">
-							</td>
-							<td><LABEL for="LogonLast">{t}Last script{/t}</LABEL>
+							<LABEL for="LogonLast">{t}Last script{/t}</LABEL>
 							</td>
 						</tr>
 						<tr>
 							<td>
 								<input type="checkbox" value="O" name="LogonOverload" {$LogonOverloadCHK} id="LogonOverload">
-							</td>
-							<td>
-								<LABEL for="LogonOverload">{t}Overloadable{/t}</LABEL>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<LABEL for="importFile">{t}Import{/t}</LABEL>
-							</td>
-							<td>
-								<input type="file" name="importFile" id="importFile">
-								<input type="submit" value="{t}Import{/t}" name="StartImport" >
+								<LABEL for="LogonOverload">{t}Script can be replaced by user{/t}</LABEL>
 							</td>
 						</tr>
 					</table>
 			</td>
 		</tr>
+	</table>
+	<p class="seperator">&nbsp;</p>
+	<table width=100%>
 		<tr>
 			<td colspan="2">
-					<table width="80%" summary="{t}Logon script{/t}">
+			<h2><img alt="" src="images/fai_script.png" align="middle">&nbsp;{t}Script{/t}</h2>
+					<table width="100%" summary="{t}Logon script{/t}">
 						<tr>
 							<td>
 								<textarea style="width:100%;height:400px;" name="LogonData">{$LogonData}</textarea>
 							</td>
 						</tr>
+						<tr>
+							<td>
+								<input type="file" name="importFile" id="importFile">
+								<input type="submit" value="{t}Import{/t}" name="StartImport" >
+							</td>
+						</tr>
 					</table>
 			</td>
 		</tr>
 	<table>	
 
+	<p class="seperator">&nbsp;</p>
     <p align="right">
-    <input type="submit" name="LogonSave"     value="{t}Use{/t}">
+    <input type="submit" name="LogonSave"     value="{t}Save{/t}">
     <input type="submit" name="LogonCancel"   value="{t}Cancel{/t}">
     </p>
diff --git a/plugins/personal/environment/selectPrinterDialog.tpl b/plugins/personal/environment/selectPrinterDialog.tpl
index 75259dfc3..7a68a34d0 100644
--- a/plugins/personal/environment/selectPrinterDialog.tpl
+++ b/plugins/personal/environment/selectPrinterDialog.tpl
@@ -1,4 +1,4 @@
-<h2><img alt="" src="images/house.png" align="middle">&nbsp;{t}Select printer entry{/t}</h2>
+<h2><img alt="" src="images/select_printer.png" align="middle">&nbsp;{t}Add printer devcies{/t}</h2>
 
     <input type="hidden" name="dialogissubmitted" value="1">
 
@@ -24,7 +24,7 @@
     				<p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
   	 			</div>
    				<div class="contentboxb">
-   					<p class="contentboxb">
+   					<p class="contentboxb" style="background-color:#F8F8F8">
     					{t}This menu allows you to create, edit and delete selected printers. 
 							Having a great number of printers, you may want to use the range selectors on top of the printers list.{/t}
     				</p>
@@ -35,24 +35,20 @@
     				<p class="contentboxh"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
    				</div>
    				<div class="contentboxb">
+     				<table summary="" style="width:100%;border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+      				{$alphabet}
+     				</table>
 				<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
 					<tr>
-						<td width="50%">
-							<img alt="" src="{$tree_image}" align=middle>&nbsp;{t}Display printers of department{/t}
-						</td>
 						<td>
+							<img alt="" src="{$tree_image}" align=middle>&nbsp;
 							<select name="depselectPrinter" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
 							  {html_options options=$deplistPrinter selected=$depselectPrinter}
 							</select>
 						</td>
 					</tr>
 				</table>
-   				</div>
-   				<div class="contentboxb">
-     				<table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
-      				{$alphabet}
-     				</table>
-    					<table summary="" width="100%" style="border-top:1px solid #B0B0B0;">
+    					<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
 							<tr>
 								<td>
 									<LABEL for='filter'><img alt="Search" src="{$search_image}" align="middle" title="{t}Display printers matching{/t}">
@@ -70,8 +66,9 @@
     	</tr>
     </table>
 
+    <p class="seperator">&nbsp;</p>
     <p align="right">
-    <input type="submit" name="PrinterSave"     value="{t}Use{/t}">
+    <input type="submit" name="PrinterSave"     value="{t}Add{/t}">
     <input type="submit" name="PrinterCancel"   value="{t}Cancel{/t}">
     </p>