From 9344a78adfff20e74b35bae122944829784c2323 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 19 Apr 2007 09:07:18 +0000 Subject: [PATCH] Layout updates git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6116 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/images/welcome.png | Bin 0 -> 3899 bytes html/themes/default/style.css | 2 +- setup/class_setupStep_Config1.inc | 4 +- setup/setup_config1.tpl | 113 +++++++++--------------------- 4 files changed, 36 insertions(+), 83 deletions(-) create mode 100644 html/images/welcome.png diff --git a/html/images/welcome.png b/html/images/welcome.png new file mode 100644 index 0000000000000000000000000000000000000000..0964749c5744cf725dc46a3d202a9671195a917a GIT binary patch literal 3899 zcmW+(c~n!!7k)1<8zB%7goG`jELGM(5E0S5AmWAvtwpp}!y?cYAxafcBrhxh6xl>2 zq7u|rtP6=+wQ5Z;tcr$8+aD@z5>W&}2}C83koODzap#_yGv}T=-`x4WJLPd-t+FCH zkpKX&TC+N8quDd(jEFann=#X+W@o`$y(Jp}EbZnD1Wul!nisKYob?<4kXGg!HXJq2 z8Of_Rt_OhqUI2g;0l+kB_9FnW*BtFF7XZTR0l+bsjU z=J|V&8f(f0f^u3Ui^)lkuAUbi_L$Umjf~PNkZn7~^_aLi*D^M+E026W3mCD4r#Hht zqQS^z{7V!?sL@5*9mL1TtC0U}#@=Iz35n2R){jcX_Rtch zW2gnPZ9Up|oW+m_i`8ZaE18866R3b;>`zQBfGTaAhx$ho+;o#Q>(PoE&?}h(4CQ32cBZ4!8QHex+MM&iKLvYuNBA zcCvnIFi0U&DO<0qYoDZXU)n&?a=N%vB#^ceKX|erJGfImV`w6}-ZQGGSvES5dAB^tDth&WsnT{9*+1dpDfYtL&xL7<1?d z28lfVH;SvX3cKSsKtMi;QTul%*$(4I@8rtW# zU{;U}l+kGJZh%f8ohWh~wg~lJC;sv#_|DF~V*>yds~~=po(?%OuU|EG243w*yi+F- zeP=zKP+i1ECfH&HM~}*sHoL0_IZ`cU0gAGiUpKIr((=N2%bBm-Y2~(c(xxCpETR=m zTn{oPCO;)SUpl}3%LML9-vGb{&Rqrsom0cEfL zfcQ&f3~f}O;p(SwT?K@nTr45qTLEFukfZauTH(+(mQCl1HpUsff7cW32~iNa{>np( zJb-~{_p4QGX8i2biKYt9lRClrzv#omIb4Ft0FnOPA+J7`%+&;Qxtd<=D#r!1Sro-p zpx}x|u+21eMo?2?*&L4@PKeHZo`!^<5?E+#z2kZ$7#)u3jqG~^xCWLhAu~E`Jly^) zOE@4q6%*;Q_L=wx;;A7{H?Ho9DB)*$eT|5o@VptbZk-jcHc?-Ch!fPNMSUTU24=%x0E}8-A%zy*WtBe!k5AbrW2D$#0KMcZ0ab;HfBAB5j=xCRW-`G@HQZlodOU^IRa$Z)*;h&FKXp$(3BYwjh%2tiS``5;-fV+#23MX5TD@bmY) zW^|S`(Zi0ruP5e2K!0f})aS7uJo|Q}e-B-(5sAAAwlgu>^9tY!otl7TSf|EqzoB>? zWlr`*J#<{LUmeno{lN=O)9ZH9d!faGm1n&qQ8lX033}VYt~9n+R*Ss>2D*Ci?ARtk*eIoB)I>cmHlXSARf4{+r530zRx_8BKRYf{_bUh;<=A@;d|Cq_;i!Ugc4;ycepFxnKFdngUm1_aOcZhTYTf zS;|Lj|KAKRlre&`!@e_?rsRrguxw&*j|U8Bsst*sqoCix#gdP%=v%;C6Lbx8gm64c zb`?x^85Ya3kYD-W$WnNHi@SA_(Q*Uj&|TDq5F~JYjLke6%rq6<3Pn-qkif^4%a|pM z;DWYHx300=)?&ou2qhQ$efv)sPgx`#rXTAyxK_lN!~cV6zR6Ne|if3tqQTa zqk|X8@=g`*7_cM9u3ze(|e&-hDZ*lPx=S&i~_#gEmpBqgb zL|>(-={H|i9i?R#t@X;+t1nLg4erlj-Ro9qciY1*?bIwwIKKHl@)p_3eR!bqQMvhr z-}e8|nD|DPh2FjI#($)pvXrb>;{7jauB=Ws;1(8Z+ywtzRa=t>6cyFv9_$ZWb%5&? z%un|$AUpHUc5H@L3cP?D-!t=0=5mD2`RDTXN0G0%|2Vm7p|AV07&t7Y6W0AkbXY3B--o1`CRKfSqM==PNC7da+BJKy%# zY6ox2+gMBz*Ak>JEpnI{8Z70in`yDmXuUk6k}9 z%PtWek&=c7mBss0%+NfLkeYvNx7W=+tD^BkmmRVHRF}j(F@!&WslCW408^8^gSbzD zecy{b1^fHe8;AjA)zMd|oNi)>H9n@0&u1s;c^QipogPzy)8vlORELgCyb+`j%%Oj{ zV6yY@&F-n%Ec3p%%}}iA92}Q_c!XIW+N17pf;`frUe4>CISeZiAJ%qBr(AT}cGFrx z60V<|hW#aHUjSG4DnfC1?<3lO@9(0+Dt2nDxb)7N-8L{#GYs;YjgZ5|5;hz4&%gg^ z0!W+0meA@xxk2BIgHOdLeQ>#TIs! zP^p3-&@wNSBUJt`fEkf+twu9CsQQAEz>0Z`!{+mbk8`jyT*BeW2=5cBIa2qx*iMvIqKdw<6yH4h_`3(lq3bF3}DhoXL zPm8>uFBTtkGnRZAW^ECf;FC0z*a^&?MLsm%8aA`UPp(Y^OZ&1z_u~8Lqp}I;1q(Hq zimY!3M?U}9O9U4krBRmy?b}%}DIr=&;ZL8*EZEhm)s`-RmiA?F7h3%k#&ifnj&Qag zr}O?`BED%5)@D0}d0nFJ{XnlTE+~pzqp`d&S^VO`5}(E`{NQ_G{#du22Hl%Lg>na* zcK_h)L+ywzO_-CV3eKOMnI8`KbZJMA5fzVO$I4sK$!{Uo0UUW0;tP%q(7FF=-vv4= z8dUdI@5C2;Zh#naWhWw&PQ}KrT|1y^?LHupn)RH8UHVc`A2@Y zcGi$BY*DG0`QZMcz6(k+U6!As|M2c~u(K{_XLRVzB6)Qf@X6)IP^yqpYWL|gPC#H_ zpecZ5L$t7%{ig0jVuv?6vxorsj?$S!n#9yx!*N`~R!oB>o6Wpu!jA=J^OzE;boOjY zA!bg-kkhA6R}+xRu0RDwwxtPcU!y?x3>6hZV1=nX3Dbd2gP$N|MS`YTrlAN%K4mP$@@nWGBm_3_G zk^)?#dx7dfr0EgCcOIw7YLDlF?tFawHU>F~uh$ARvxX_|$KC3_xTYnglkc zreebDXmtxY?v!k1nbq30l6k}qlesam^ID&mVy>S$Z})_Q6BF%+9od3BLHompBo|Au zrw4-p>`ph3)V9m;}qOL}A3;z#nC+X1u literal 0 HcmV?d00001 diff --git a/html/themes/default/style.css b/html/themes/default/style.css index 4810309ab..6f72053dd 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -1031,7 +1031,7 @@ div.step2_warning_text{ li.step4_name, div.step4_name { float:left; - width:15%; + width:20%; height:2.0em; } diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc index 8ee39b2f2..1afc3b07d 100644 --- a/setup/class_setupStep_Config1.inc +++ b/setup/class_setupStep_Config1.inc @@ -72,8 +72,8 @@ class Step_Config1 extends setup_step function update_strings() { $this->s_title = _("GOsa settings 1/3"); - $this->s_title_long = _("GOsa generic settings, page 1/3"); - $this->s_info = _("This dialog allows you to setup GOsa behaviour"); + $this->s_title_long = _("GOsa settings 1/3"); + $this->s_info = _("GOsa generic settings"); } diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl index 9572a7747..376eb5c11 100644 --- a/setup/setup_config1.tpl +++ b/setup/setup_config1.tpl @@ -7,110 +7,83 @@ {/foreach} {/if} -
-
-
- {t}GOsa settings{/t} -
+
+

{t}Look and feel{/t}

- {t}GOsa theme{/t} + {t}Theme{/t}
-
+
+
+
+ {t}Show PHP errors{/t} +
+
+
+

{t}People and group storage{/t}

- {t}People dn attribute{/t} + {t}People DN attribute{/t}
-
-
- {t}People storage ou{/t} + {t}People storage subtree{/t}
- -
-
+
- {t}Group storage ou{/t} + {t}Group storage subtree{/t}
- -
-
+
-
+
- {t}ID base for users/groups{/t} + {t}Number base for people/groups{/t}
-
-
-
-
- - -
-
- {t}Base hook{/t} -
-
+
{if $base_hook_active == FALSE} - + {t}Use hook{/t} + {else} - + {t}Use hook{/t} + {/if}
-
- {t}Infos in FAQ{/t}  - !
- -
-
- {t}Display PHP errors{/t} -
-
- -
-
-
-
-
-
- {t}Password settings{/t} -
+

{t}Password settings{/t}

@@ -154,36 +127,25 @@ {/if}
-
- {t}Infos in FAQ{/t}  - ! -
- {t}External script{/t} + {t}Password change hook{/t}
{if $pwd_rules.externalpwdhook_active == FALSE} - + {else} - + {/if}
-
- {t}Infos in FAQ{/t}  - ! -
-
-
- {t}Mail settings{/t} -
+

{t}Mail settings{/t}

@@ -207,33 +169,24 @@ {if $mail_settings.vacationdir_active == FALSE} - + {else} - + {/if}
-
- {t}Infos in FAQ{/t}  - ! -
- {t}Use cyrus account style{/t} + {t}Use Cyrus UNIX style{/t}
-
- {t}Infos in FAQ{/t}  - ! -
-