From 71ab3c98e7f3c8a40baf3f135acd90ef72dcc8d4 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 12 Oct 2005 06:47:27 +0000 Subject: [PATCH] Layout changes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1560 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/images/hotplug.png | Bin 0 -> 861 bytes include/functions.inc | 2 +- plugins/personal/environment/environment.tpl | 231 +++++++++--------- .../personal/environment/hotplugDialog.tpl | 26 +- .../personal/environment/hotplugDialogNew.tpl | 21 +- .../personal/environment/kioskManagement.tpl | 6 +- .../personal/environment/logonManagement.tpl | 46 ++-- .../environment/selectPrinterDialog.tpl | 21 +- 8 files changed, 179 insertions(+), 174 deletions(-) create mode 100644 html/images/hotplug.png diff --git a/html/images/hotplug.png b/html/images/hotplug.png new file mode 100644 index 0000000000000000000000000000000000000000..546c7afad57616b7bca3eeae9eed8381bbeb4487 GIT binary patch literal 861 zcmV-j1ETziP)@2HQ*UHxaBpO3pY$&$0000EbVXQnL3MO! zZ*l-tZfkCDcW#U!4DtW~03Lc&Sad{Xb7OL8aCB*JZU6vyoJ&+F$V@INElLFd5MKj+ z>hujP00084Nkl z7bAo)@FL#5c?dih2whB=2sST9R+vy~5R+6UXrp9ICyCpu&fMN@uXFGFu9IS*)T!_3 zIemEG;UOj`XRjFy)bm(OG$v%7q$J}zl63s3r|02IfXL!65q|$ha5|#r>zypVM`f%; z(l8_=s8+&TImpZ|FaPKs9PE`Y1lHHL#I?O+_Y|CV^b70)r|+yT1!MnF39bh>6mdj*iyb0H6Z^zkjpSVqvFP zmT>?ot`wO;2RC6dT|!#QAel@-I!Z&>KZK$xP!$xOUg2bLyWicbt1BC$D3XvdLaPHf&IFF*5Ln-dJ$l^60z~!{0DzH^H@#I=CC>-~Yvx}b?f>)}Gkg*-0v;oS00000NkvXXu0mjfen5G> literal 0 HcmV?d00001 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} + +

 {t}Profiles{/t}

- - +
-

 {t}Profiles{/t}

+
- @@ -27,7 +28,7 @@ - -
+ -
- - + + id="gotoProfileFlag_C" {$gotoProfileFlag_CACL} {$gotoProfileFlag_CCHK}>  +
- - - - - - - - - - - - - -
- - - {t}MB{/t} -
- - - -
- - - -
- -

 

-

 {t}Kiosk profile{/t}

+ + - - -
@@ -88,97 +56,132 @@   +
-   - - + +
+
-

 

-

 

- - -
- - + {t}MB{/t} +

- - -
- - -

 

- - -
- -
- - - - + 		+ +
-

 

-

 

- - - -
-
- - - +
-

 

-

 

- - - - -
- -
- - - -
- - - - - + + + + +

 

+ + + + + +
+

 

+ + + + +
+ +
+ + + + +
+ 		+

 

+ + + + +
+ +
+ + + +
+
+ +

 

+ + + + + + +
+

 

+ + + + + + + +
+
+ + + +
+ 		+

 

+ + + + +
+ +
+ + + +
+
{/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 @@ -

 {t}Select hotplug entry{/t}

+

 {t}Add hotplug devices{/t}

@@ -7,7 +7,7 @@

- +

@@ -24,8 +24,8 @@

[i]{t}Information{/t}

-

- {t}This menu allows you to select an existing hotplug configuration.{/t} +

+ {t}This menu allows you to select existing hotplug devices. All devices of all users are choosable here.{/t}


@@ -34,24 +34,20 @@

[F]{t}Filters{/t}

+ + {$alphabet} +
-
-  {t}Display hotplugs of department{/t} - +  
-
-
- - {$alphabet} -
- +
+

 

+

- +

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 @@ -

 {t}Create new hotplug entry{/t}

+

 {t}Create new hotplug entry{/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 @@ - +
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 @@ -

 {t}Logon management{/t}

+

 {t}Logon script management{/t}

- {html_options values=$gotoKioskProfileKeys output=$gotoKioskProfiles}
- +
- - +
+ - -
+ - +
- +
- + @@ -31,49 +30,48 @@
+ - - - - - -
- +
- - -
- - - - +
+

 

+
- +

 {t}Script{/t}

+
+ + +
+ + +
+

 

- +

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 @@ -

 {t}Select printer entry{/t}

+

 {t}Add printer devcies{/t}

@@ -24,7 +24,7 @@

[i]{t}Information{/t}

-

+

{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}

@@ -35,24 +35,20 @@

[F]{t}Filters{/t}

+
+ {$alphabet} +
-
-  {t}Display printers of department{/t} - +  
-
-
- - {$alphabet} -
- +
+

 

- +

-- 2.30.2