From f9e2dfa9fd8944390cad7d91eb1eb3a259420fb8 Mon Sep 17 00:00:00 2001 From: following Date: Wed, 27 Feb 2013 03:11:00 +0100 Subject: [PATCH] nicer header line display - all items levelled in one line - flags better centered in msie and in firefox - removed three white pixel lines (line 0-2) in firefox - all flags shown with a bit shadow, instead of only spain [and sweden] - nicer display of "logged in as " - all labels in the same font instead of two fonts - smoother gradient background, espacially in winter Still not optimally vertical centered in chrome also fixed print css for some earlier changes to screen css --- htdocs/config2/locale.inc.php | 22 +++---- htdocs/config2/settings-dist.inc.php | 2 +- htdocs/images/flag/CZ.gif | Bin 680 -> 0 bytes htdocs/images/flag/CZ.png | Bin 0 -> 659 bytes htdocs/images/flag/DE.gif | Bin 655 -> 0 bytes htdocs/images/flag/DE.png | Bin 0 -> 463 bytes htdocs/images/flag/EN.gif | Bin 1217 -> 0 bytes htdocs/images/flag/EN.png | Bin 0 -> 1148 bytes htdocs/images/flag/ES.png | Bin 666 -> 654 bytes htdocs/images/flag/FR.gif | Bin 674 -> 0 bytes htdocs/images/flag/FR.png | Bin 0 -> 512 bytes htdocs/images/flag/IT.gif | Bin 674 -> 0 bytes htdocs/images/flag/IT.png | Bin 0 -> 514 bytes htdocs/images/flag/JA.png | Bin 0 -> 573 bytes htdocs/images/flag/JP.gif | Bin 639 -> 0 bytes htdocs/images/flag/NL.gif | Bin 404 -> 0 bytes htdocs/images/flag/NL.png | Bin 0 -> 409 bytes htdocs/images/flag/PL.gif | Bin 390 -> 0 bytes htdocs/images/flag/PL.png | Bin 0 -> 329 bytes htdocs/images/flag/RU.gif | Bin 408 -> 0 bytes htdocs/images/flag/RU.png | Bin 0 -> 387 bytes htdocs/images/flag/SE.png | Bin 636 -> 690 bytes htdocs/images/flag/US.gif | Bin 671 -> 0 bytes htdocs/lang/de/ocstyle/main.tpl.php | 41 +++++------- htdocs/lang/de/ocstyle/varset.inc.php | 4 +- .../css/seasons/bg-langstripe-autumn.png | Bin 194 -> 152 bytes .../css/seasons/bg-langstripe-spring.png | Bin 200 -> 157 bytes .../css/seasons/bg-langstripe-summer.png | Bin 202 -> 166 bytes .../css/seasons/bg-langstripe-winter.png | Bin 220 -> 210 bytes htdocs/resource2/ocstyle/css/style_print.css | 55 ++++++++++------ htdocs/resource2/ocstyle/css/style_screen.css | 33 ++++------ htdocs/resource2/ocstyle/js/session.js | 4 ++ htdocs/templates2/ocstyle/sys_main.tpl | 59 +++++++++--------- 33 files changed, 114 insertions(+), 106 deletions(-) delete mode 100644 htdocs/images/flag/CZ.gif create mode 100644 htdocs/images/flag/CZ.png delete mode 100644 htdocs/images/flag/DE.gif create mode 100644 htdocs/images/flag/DE.png delete mode 100644 htdocs/images/flag/EN.gif create mode 100644 htdocs/images/flag/EN.png delete mode 100644 htdocs/images/flag/FR.gif create mode 100644 htdocs/images/flag/FR.png delete mode 100644 htdocs/images/flag/IT.gif create mode 100644 htdocs/images/flag/IT.png create mode 100644 htdocs/images/flag/JA.png delete mode 100644 htdocs/images/flag/JP.gif delete mode 100644 htdocs/images/flag/NL.gif create mode 100644 htdocs/images/flag/NL.png delete mode 100644 htdocs/images/flag/PL.gif create mode 100644 htdocs/images/flag/PL.png delete mode 100644 htdocs/images/flag/RU.gif create mode 100644 htdocs/images/flag/RU.png delete mode 100644 htdocs/images/flag/US.gif diff --git a/htdocs/config2/locale.inc.php b/htdocs/config2/locale.inc.php index 0e5e35ef..c3b1dc37 100644 --- a/htdocs/config2/locale.inc.php +++ b/htdocs/config2/locale.inc.php @@ -21,25 +21,25 @@ * */ $opt['template']['locales']['DE']['show'] = true; - $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.gif'; + $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png'; $opt['template']['locales']['DE']['name'] = 'Deutsch'; $opt['template']['locales']['FR']['show'] = true; - $opt['template']['locales']['FR']['flag'] = 'images/flag/FR.gif'; + $opt['template']['locales']['FR']['flag'] = 'images/flag/FR.png'; $opt['template']['locales']['FR']['name'] = 'Français'; $opt['template']['locales']['NL']['show'] = true; - $opt['template']['locales']['NL']['flag'] = 'images/flag/NL.gif'; + $opt['template']['locales']['NL']['flag'] = 'images/flag/NL.png'; $opt['template']['locales']['NL']['name'] = 'Nederlands'; $opt['template']['locales']['EN']['show'] = true; - $opt['template']['locales']['EN']['flag'] = 'images/flag/EN.gif'; + $opt['template']['locales']['EN']['flag'] = 'images/flag/EN.png'; $opt['template']['locales']['EN']['name'] = 'English'; $opt['template']['locales']['PL']['show'] = true; - $opt['template']['locales']['PL']['flag'] = 'images/flag/PL.gif'; + $opt['template']['locales']['PL']['flag'] = 'images/flag/PL.png'; $opt['template']['locales']['PL']['name'] = 'Polski'; $opt['template']['locales']['IT']['show'] = true; - $opt['template']['locales']['IT']['flag'] = 'images/flag/IT.gif'; + $opt['template']['locales']['IT']['flag'] = 'images/flag/IT.png'; $opt['template']['locales']['IT']['name'] = 'Italiano'; $opt['template']['locales']['RU']['show'] = true; - $opt['template']['locales']['RU']['flag'] = 'images/flag/RU.gif'; + $opt['template']['locales']['RU']['flag'] = 'images/flag/RU.png'; $opt['template']['locales']['RU']['name'] = 'Русский'; $opt['template']['locales']['ES']['show'] = true; $opt['template']['locales']['ES']['flag'] = 'images/flag/ES.png'; @@ -48,16 +48,16 @@ $opt['template']['locales']['SV']['flag'] = 'images/flag/SE.png'; $opt['template']['locales']['SV']['name'] = 'Svenska'; $opt['template']['locales']['NO']['show'] = true; // no_NO - $opt['template']['locales']['NO']['flag'] = 'images/flags/no.gif'; + $opt['template']['locales']['NO']['flag'] = 'images/flags/no.png'; $opt['template']['locales']['NO']['name'] = 'Norsk'; $opt['template']['locales']['DA']['show'] = true; // da_DK - $opt['template']['locales']['DA']['flag'] = 'images/flags/dk.gif'; + $opt['template']['locales']['DA']['flag'] = 'images/flags/dk.png'; $opt['template']['locales']['DA']['name'] = 'Danske'; $opt['template']['locales']['PT']['show'] = true; // pt_PT - $opt['template']['locales']['PT']['flag'] = 'images/flags/pt.gif'; + $opt['template']['locales']['PT']['flag'] = 'images/flags/pt.png'; $opt['template']['locales']['PT']['name'] = 'Portuguesa'; $opt['template']['locales']['JA']['show'] = true; // ja_JP - $opt['template']['locales']['JA']['flag'] = 'images/flag/JP.gif'; + $opt['template']['locales']['JA']['flag'] = 'images/flag/JP.png'; $opt['template']['locales']['JA']['name'] = '日本語'; // geokrety language key association diff --git a/htdocs/config2/settings-dist.inc.php b/htdocs/config2/settings-dist.inc.php index 7b6a1f9b..a51f2f63 100644 --- a/htdocs/config2/settings-dist.inc.php +++ b/htdocs/config2/settings-dist.inc.php @@ -133,7 +133,7 @@ * * other parameters may be customized */ - $opt['session']['mode'] = SAVE_COOKIE; + $opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly $opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE $opt['session']['path'] = '/'; $opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain'] diff --git a/htdocs/images/flag/CZ.gif b/htdocs/images/flag/CZ.gif deleted file mode 100644 index 8eed96489a01aef2cbcfe3a923f85ac1a79bdce8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 680 zcmV;Z0$2SpbvHjO_la7Zg-4>yz(IF1rIk`g(S7dePBGk$L-R~9>vEjEH1Jc}7Ukzp-k z96*wRDN`Upj*})z9zvADAS)zAk<1??BSx0PAu-qK-50BP-z{B+w=-=pZ89BPr)1BrZ;v-6bpOBP87? zE#47tI98$6G&$chI6GRP z);K=kHatdJqCZ@tKwYChUZg=^q(fn)O=PIzL`hC+tK3RYPHU@BY^+;utXy`nUwE@; zc(Z4Iwrhd7Y=pUYiM)7?zJij$hMLBerp=wK(4MZ*s=eI3$l%S@=icM*=IiwE^7!=j z`}p|y`T6_C zX>@2HM@dak03rDV0SW+r04x9i000;O7ytkV@PL1UgM@{Khlq)ai;RtiXmWd!la!T} zf>LU5mYkM?S7&8ydYzqlf>dT=VQF!tmUx0sWM5xiV{WgMcY;Y^T3TFKSZj5poFYSzCf4APw~m3=kDAJu?0N zGCX)Vfg;EQhXV)^DA-U#M~;UOBQ9woD1(Lp0|*%SfWyX&k03+NID$kFg$n@$I4D7* z#R?TKU&4&3!UzyS3nT!rfFi|-pFo2K6>>vR0SqvP1o^?Vsne%FUI=;+!o-NHShH%) O>Zq&NuVB9h0suS9k0yEm diff --git a/htdocs/images/flag/CZ.png b/htdocs/images/flag/CZ.png new file mode 100644 index 0000000000000000000000000000000000000000..e7f777659423538daa9059fe4407eac2afe2e3de GIT binary patch literal 659 zcmV;E0&M+>P)7wg(l&Yw;v_P`rqG(Nm9- z2!=$ZilUYxE!`3;R_tbfWp^htRTrLiYEk0s~kHll%v61~r_BTX3a05I}5grSFL@;$j9s*FY*px~WWX3d9VY?YzU) zpn-~t;1LsM3>7{dDV}1yUn0rOzW|D|E=v#B{8yNcmk?3ZKsTHcqv=l!6tZ1J=Rg?> zNjFmPlkqBU`86CDzu?k+TCZd=;kG@ZH%H%dMv01EGCheT6dh_tF)oC4T<*Lj_k?9Wrp9+^T>o;(ibhnuP tE$r<(lrgSF)6IL7eDq^Fn%U&*zX7%}c`aniFZ{_mD z&f|%_$5RK-^z`)X?CfX0Vb21>3k!>i3PBJ^gIGmH<>los;?f$MK%ld;^Z9A<=cgrJ zoRxlYR_5h7`IqMuUY%EdbzbH5MfKO0G=JU_{dr6L=WWTKcjSNGQTTaB`R85LpLf;% z4`rbEPtdt2HL)Z$MWH;iBtya7(>H)Y@h1x-7ehUR4g(N?B8q|idP99vb4zPmdq-zi zcTaB{JI};Plc!8=;?$ctYxbNu{7r1Sn(CUG8cS6dFI8EprlP9D-NdS;uxLGXxr$9nBlw%<$N_$hFJ9fMeA| z=l0|M3eI(35}hyf$XN!hia8mS$}iQF^kIhQ=4HOKjac^H;C$?Qey&~OAC_OjZHpIs MOxE(1;$W}_09Ye`M*si- diff --git a/htdocs/images/flag/DE.png b/htdocs/images/flag/DE.png new file mode 100644 index 0000000000000000000000000000000000000000..acd800273f4a7c8d175d96d7d7ddc6e0505201ae GIT binary patch literal 463 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 z zYoY=Nn=24wGGT1XcDQx9*vskhMJpM9zaL6vB7vOswv;pi1?AMHR4Ty{9BsRd;)1VW zPE3RLr%R9}a;W<4yZ^d~pZcsB-YeHIQd)%%JI66P+#PYzISkNCgxzL?V>UdU3c>>c zZzMl~*#-t~VBPBd__%Q^wtVm|xC=(0w~MC{R0NL^BrnJiL>C>ZhyMaY{MMiUq1Fgb+x8m>IRhqGH};^03XdlQuy`${;1uNqp`29N&kp13(ZwLIveM z5n*k}8{@}MC*Ztfeqj5}>yCdBsDp7-A03xU?w`ChpSlqcDvqIo0BSlTQxlx@i*#&E zvK=S4o}WW9pKf8DHk6WPD1=>-WUPJ@R^=Subtwa}9a@3AuOjeUOHx{vBj5-~s`y!@LJ% zs1c=q0zIw5J=@3dbc|D7$HUJYeYb;(^q_h}FpmUO5x=P-&kmUt&?ZF2CE7{hs_byw zdlI7S|HRjm7x2Hlgxi0v0;bw5djW{ca$X5&Co;EzEQz?qG29Ix?+6?oHL%xPBWPUW zVlRfS(doHN{w;vzybh76S*h&B@x&aB;0)b^HE{49JI@lY&o4iKn^Q%bq#zZZJ2D@DNe zD47XFiUfY86Ir9nH$3Flu37%Ue4|N5=DkJe!*-5RpDAJV2Q)zeyrQ@i0RR9107*qo IM6N<$f(I`hU;qFB delta 655 zcmV;A0&x9~1)2qr7k?NC1^@s6;CDUv00009a7bBm000XU000XU0RWnu7ytkOAY({U zO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fdMgRZ;AW1|)RCwCdmc4Eh zK@i7(d%JcVf5na>Ac+D}M3p8&c>zFB@Bq96ufU7&927Kk5q}j0iXwy%NPvi~Boq;e z?HK!fyE7Dbmd^soLAn%-G|k-X{C7U~KW9{x>y(IVmTLzvfCDN(so>ZNFm^!w^wE=Z ztS$WZ>#tw69Z(~(EI)iuXz=uZG^?EEstBlpF}d$~8>u}z617{1 z1OVp%Gz1v_f`8$#nCq9zka)-%%&nIRcIguIvY^p%G$#RC8Gvd49i-|~*kQLq|JV^l zO5={Fx)T2bf<-l%Wgy}~d!T(}r1VY|e^g@lPN5nRiE_C%;l`%D^7Ko{l}I%K?E^j3 zSSDeM@bN2pzE1P*Gu-M2M)DT)WY*vX0IHLG1{07jM1SY##WLl?9Xbc69B7SupDbJD zHluj%$iR)*aY^?&i%d#w7DVHUO^K{7uF(B1PiM3KR?xJPvUICaGLt5S4B7({a!Bq#D%PDHLkV1myz9%BFi diff --git a/htdocs/images/flag/FR.gif b/htdocs/images/flag/FR.gif deleted file mode 100644 index 2047d2f0b069c2ecaecab82a2507ebc71e977053..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 674 zcmZ?wbhEHblwgoxI2Ogg#+JpwkYlqDooC@NYk zE}knPQ6eQ(AT3=kCs!daU#z55t*l(3sadV3S7%_*Y-H4QiBI{ckjhbEmCFJ^q-ti? zdQ4Q~vXI(kQO)C$I#yO4SH!iiNa$RV)IBL@XlLJTZ{K}Y#=ya$_o|$slT+_0WfK>d zzH7>+Zf+BtGIzgb;~gD6_l842T->}{ zt|50^L+`qU-u4JjPhWD!C;FaG%sv0u?CjkPB}b%>S^61swMXJ?J28|9~~{5M1;70{ye4n_pgaL zi*G~0f&|A@Wg)emK<9uKc2*^~5Vl20N5zdsnnvt%+bUZ>b7V_Ab%4JPsAyc?#s*lj6JR{P;6#%kJy}b Kca^CCgEauy*h*jk diff --git a/htdocs/images/flag/FR.png b/htdocs/images/flag/FR.png new file mode 100644 index 0000000000000000000000000000000000000000..dd16c18d855ed6c7ab37d1dafdd7b03d9061e056 GIT binary patch literal 512 zcmV+b0{{JqP)ST4W7k|FTP!~4hj!P?o&$?G@hz}@8UW{&~@0000vvv+C?>;d&-*kRJHG^>)uz_xuk7) zUqko4mccz8!z=nG5A;p1nOHtBwzzI#_rT2NmYwrmC-=ur?)TihANT}3@(+0$5c(`2 zRK6F8!X5{QEB8k{36EBt81*b7=2>K{?6e5^X;Jdiqco?)Db9#io)P;jE>U@AtlqRl z)tPb6$omP~1tSEn7S?jZ^`gL8S|Ju4Y^-Tfm>H^l+hpcM|UElPkxjlSCbHv8xxXm5$ zTRPwN_Gj&!n7eE8yD8I3_s^_6FsJVDg8IV?nvX5+JGFYs*$q?9ZFu|k?SFa!#eag% zMX8A;sVNHOnI#zt?w-B@42nNl7`Yhg8FUzc02EOS?5`T?o0?l%+uA!iySjUN+q`@y zPKuo}b&B$gnaWK*QS+h~Oq&+GWT{G%XJmNT>aayq-P~L@2PihVMuhCzwSJ2I{{7za zP0pc#$B*xgwLEjiNvg>)$nVOPQ`$Ff*hn_n`MW=Oa7y~g6Mcy$TMvgfZ%&DS_#h+J zWMysm1G2XQ-WE9f=5e_kVT;u_kqdk%*;&=2PC{gW;QMM;N*DqVByMO Yy@16|tPWeX7~CT^XWd<8D!^b30Ey^b&j0`b diff --git a/htdocs/images/flag/IT.png b/htdocs/images/flag/IT.png new file mode 100644 index 0000000000000000000000000000000000000000..ff82d972faa645fde059008d8da7ef6f7fe64561 GIT binary patch literal 514 zcmV+d0{#7oP)c+F zF;Ofr(kRKqp6B^l06@eVvku^YMY0yg`Qi1`{bv{m=c>o6yG}3fH@AQOJDon97{DkH z0w!k{^&bJfC7xV5?Zxwpd5jDo(x{=-5*C{bsPa!e0r)YuPojE9Fg^lAG_O%)lSK%b zDj-)I??hw1ZrNzC2c(pJw*aj*GKW;={t=|BwoNdglr=zdiWcnLKzs$$v}LnRqIM#fE$6n2d_}&^9BIoy$NRql zrX*Esd4}NFWBipt1HctmJjqBq-QQ>6Tmbe*qFDp(BBBrwb{6-THbUKIas*gyt^gVY za^;cgQ}-TaYHZlv0fKEv%{gFV2*EajzK)$KqMr~rvPJ}^xB-6;quA3s-#fztN8Sji zF=$dTQ7zpwkR(YbASpVp7ip3b@?P)|N+6yD z!N(zbFp2Sz#NC;(XWc*uJ0?ObD0XJHySi(8mI1JcQKF6Z!X;Lec$bv2&}MNTjImyW zo}K?89-vbdu*gB%l><%7s%^-QHkjw0Q9i$bdw1{etdKzN@NT#MmgW)$&_b;Q{4i3UeOluwZ1%wcx1>Voj;JrM-K!@_8RDV1N5Onr-dWyb~0yRy&13If-Wg%Zb zNXQHS&g7_?xrQW%%(ffSn>nBWFPDS&@IafGW|UPhE8@rM92nXHh5>te5`urx#6%r= zKtb;+aHb}}9Ow4}x*>NblVFAeDJqn~0}7u~Q1`+>d@~vT`2tP71449h9s~OaU{b}D zNc6*}TB~CHyL*VOE{EneA98^B_9i0pvnU-Np_0k^-A58Li0^D6x-h5BtJfSW6biB> zaQ?#}j)jk@)xx?>#p3%cA{x00000 LNkvXXu0mjfk5Tmf literal 0 HcmV?d00001 diff --git a/htdocs/images/flag/JP.gif b/htdocs/images/flag/JP.gif deleted file mode 100644 index 4c1d586422753f07242c873dd70f4969e29e1461..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmZ?wbhEHblwgoxIOfZ6o16O%H{Ts@p}RaHcX$Qw@B&HEyS$RO`T6hiOW);}xg#ig zR|ts2?+VF1G%$W>VEV|w>XEVSBNLlPruL6*T_4%oJ+ildV(0P1-s72X;4|N#XTD+2 z{DYqQhdm1ldma||EIRr*2*tgKPIwWQ{31T}WkSZQ)SMUTS#Ro_-gR`p>*)K?Kkeg; zd7qZ9`n+Q8x83``?K$x6;L-2LPkldm=EvC!KQCSVb@R@jCr|%8d-3+|+jsBYy?_7y z!-o$aKYslD`SX`AU%q|&_T$HopFe;81EOEQe*gac=g*(NfB*jf`}g0!fB%7KumZ(@ zg3d*$i6yBi3gww484B*6z5xu1KUo;L80r~x7=Qp2Q4H+I8|s^yTUy)NJ370%dwSb^ zCrq3)d5Uk-)EQHoyl2k!^=|TpHQA-fd6JI;zu@gV0&;GXoSU2`d5QAyy?n(h>^jM*$#JqK z2iG@FPA(3W$&O79lQVQQ3Kl$IWM)b6VN!a*t}4#Vz{0`c;K1!=&+>Cc3NtG!r+QY% oC&d-+YN}pFUj>dF4px(EDmyX9bMvyZvVBFb?wl-6S75LP07ANdnE(I) diff --git a/htdocs/images/flag/NL.gif b/htdocs/images/flag/NL.gif deleted file mode 100644 index acfc45c6e8d0ba1c292898219a076c1143f34e80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 404 zcmZ?wbhEHblwgoxSgOmwuHVJ2-^8Qe#A(>gW85QP+$vzwDs0*&V%9EX*)ME4LENfS z!n#Y$W`eYBkA&SMNxMn1_Pq~%0v`E?JO-lR@FyV=PeUW0ghxLEqKKGhk+Cnc@?Moz zyeh4HU0M6OuJKKM)0^hDH_h#Dd;8z@O?WqD+UL)ozkK=f?c28>KYslD`SbVh-~Y)4 zivI+ii&7IyQd1PlGfOfQ+&z5*7!-f9Fmf^2Gw3h?0m!2aY;z9GFYwTj>OZlh=wyzR z{;U-xUTe9Gm#rx~{WPy-S`decTL1Zs3A0)RgIr|&Yu-&PfA{sz3Z*GE77dL}&5iQH zPCB|>-95d%I!@YslP7CCX-%2gt>vUSYnG;y#{8KYPU=ghs5|iqu&m#(anlBVK__lr z=3Tq@?A^`F5UgY;%i=7qUIo#k-ynX0cMpD=cMtxE_#49F*~c>DGD*7aPIlOF&y8R~ z(M=Cjr8|>$02<*!7+{Mi+^YEU?e6~F&1S~>z}eH|sT#D-dn|6QO~tp*FB)1kXeei3 z7(kz2U}iYyN>pgBnAQ(#V?M&KjzL74Hcj~$6R7J!eXo*WaET~cjkS(lZIAl>H#p3} zDV4k!P)^|f8{G9K<6${Br(7o>yofQrHnkZuBdxw?G-xj8o7U?RS3=LjzD4U)WM_Jm9}o#=QX=ZQhgB_ksP-8^Oej0SpgFOR-G zvf0?WO!DrM)gVTB)-G*K#19a4Rjh>P!V_ch58?U;>xG_~SIutQ00000NkvXXu0mjf DF(|6k literal 0 HcmV?d00001 diff --git a/htdocs/images/flag/PL.gif b/htdocs/images/flag/PL.gif deleted file mode 100644 index 3816f71241ef55fea0f2c468cf7c26b4da392eb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmZ?wbhEHblwgoxSgOKsUP9r#q{4kMx%(0d7iE+$$*SC!QhFexa#=y`vZDF}Ikkrh z8dp@b9w=%&RMfnps`F4q`U!6-3?6A3T-P8 diff --git a/htdocs/images/flag/PL.png b/htdocs/images/flag/PL.png new file mode 100644 index 0000000000000000000000000000000000000000..ffd7f3acea7aacb96b823a3f8446cca138a12afb GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^5Kd0v;_)r z7I;J!Gca%qgD@k*tT`Y}Ea{HEjtmSN`?>!lvI6-xJY5_^DsJ7K;>g!zAmF-O^k@TT z1;hGBr+&vfUGK6^zAgFRVe65ll4g8A7p8uUf6o7)V@1=p3$t>x9r#V}cb+(VqekcX zoqLb(=_Srv9qQ1^cV_P9^rz{wRT;jhGo+cZ@39qs@35bFmyG`w&c=!zvuFI?w>Ujk z+@Z;`wWT#MT*u(@*fAxEB|&DI`u|Ifhf`S#K0Gv#-jv~z zmntDRS>U|2$K&|J=DoZO>sP$+F;>ucAa$8Pa>dQ-^FD3PwC&r~%omVf{Kud7!cW%l X$<-`vDH{GjKQef_`njxgN@xNA>Zg2P literal 0 HcmV?d00001 diff --git a/htdocs/images/flag/RU.gif b/htdocs/images/flag/RU.gif deleted file mode 100644 index 73fd022e90feafd49d01cd12dee2d88c3060dd22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmZ?wbhEHblwgoxSgOl#UP9r#q{4kMx%(0d7iE+$$*SC!Qo5|5c3DyVp@PO06|IMg znpaeH9;#?x)6jdMru#r$@0yl@X!I)am{pQ-t5uU%DyOX1NL{6xwm~axm2Spr&CHE@ z+3O5*)|=#QG%MU_S+v=_c$-bh7TdC|4i(#7Yj(TU?Fnu>5Ym1ydE&7@fByXa`}g0! zfB(q^ivI+ii&7IyQd1PlGfOfQ+&z5*7!-f9Fmf^2Gw3h?0m!2aYzq#|FYwTj>OZlh z=wyym^o12AUb&pBZ>*Xy_3gHZLsQLn3#~d9F|}Zd)z14LeptH-H3cl)Q+NLQVizYl zHN}?Jw)R#vc_$fZk^Tu2Cryx+b&`}2o;7>U+}RRRPNHH$OP4KQu}nD}4-9yiA00;s5lU(EiC<4x12C!oDdi0Bk zNlZ%3B9e&6`&RY2?ARs56tjr9pn-B~CflgwUG%hmM9n&V99#fl+MumUEPntRBLbhK z>I0yUN_K)o077YJ^U0`FFz^AO*0cO;6m{(bVE!p|6%+u3p4vuqhI@e7n^RV hJ8I^${ok>rHeXQAi-`lr237z7002ovPDHLkV1i`noTUH& literal 0 HcmV?d00001 diff --git a/htdocs/images/flag/SE.png b/htdocs/images/flag/SE.png index aa14b9f3f91a6347050d0ac0a2d0ed16dd3cad3a..b391590c111f2c76c6337123c044ee6587aa2d89 100644 GIT binary patch delta 679 zcmV;Y0$Bb01hNH?7k?561^@s6LF^u$00007bV*G`2i*c16f`Zu%H`w$000SaNLh0L z01FcU01FcV0GgZ_00004XF*Lt006O%3;baP0006(NklWSWroKb)~+l`ntjZ1f&ru$Nv>cn%m&<_N}`I!?hI{Yo>?C45oPx7q&j* z#-%-s`Wbd#oW#zPbMSo)uO-6$+t-d*fWc}UA|U`5-xvqL!XDy5pVlLQ3G{jihDij^ zqw^}2HZrgPfq&5oPEGZpAplbab=@*w z$8W)6EJ#3oLd#M!x3Pik4eG)$+t@u;^@Y8uidoLgwm}n}1*bMK1iS?N5>2O;E!zKB zQex#{Y}y$L$^(U@U%2dNvj8(1zOLc`uJ2rK7~LeN5iXwkfSXsJVq-1EvzMoF=i&IU zRjuS+1%L41`I%<#JQ}8HjIi{P+Fukmc=sj2Px#24YJ`L;(K){{a7> zy{D4^000SaNLh0L04;_904;_A(W+BJ00007bV*G`2ipM+4gm;ec_UZ=00I0-L_t(Y z$L*EDYEwZJhQBkJ+?(5`iCXAh6cll#RNQuLrRYoO(xtDW8-MW?bfw@@6kVvRV#RHX zMg!6`_ukw)=eS53o1}}*qKM#ZhB+MgIRF38jF=gxxg4jw{(XRKK73+lyGt0r#17|_ z{z1n5jgQ>AxeddFXCE%|^z~J;q(&kDex;q#?PLHP8t$B7KBbj*fK`x$H0^Mv+oIJB z2qzDQHw~Buj(?`f%+L@}3xI+shK~ERj*`fiWkpdGa}pUv0iiBHa*RM-=M;GfAyT5c zuBfU8c7))ZF&YU$OOOIkG?a|0k_G{h2#LP+n-sO5Xfxg#&gkto8Rh|Gh?p`cl-(Z* z%V`xi!JQl1v|7uv*%f0@G&#T4gDRkuTv+R|b^SAm4}VAmL9DlKxD{qhKtK#tA*diS zhB{{u`LcN2SHQC{w-_#Xs*y(oe6xl|4N(Gt-`fosv(XbkO=!0UETUMOKO^(1KQaL7Xwfe%w#5dVhWS`^!WgSIn-o) zm~Qi?|4E_&etM4m*pBO$#k#k{qMV#zFrC=ui87z||9|q|2K)v=lJC$7bn-0#0000< KMNUMnLSTZgDH|mK diff --git a/htdocs/images/flag/US.gif b/htdocs/images/flag/US.gif deleted file mode 100644 index 39029c212da8ec6706d9df19de48382c6d336577..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 671 zcmZ?wbhEHblwgoxIOfZsuitczOa2_UyrE&Uv2lyFb*HUu>qALhN5>9F$DW7M`j6y| zuPU3ky7pXEF@24NEVt{zvLozP^+F{U<%qvA<>L^hDn=C}`?!GxxBt z>5-AMqoU@-#?EKpsQH}<(-+_QlA7ojOd zMXO$hr@e~FuC3kJ(6IS+Mrmv7wzjryZ;I>RmN!qCvhQ7E&#YO8=FK}bfBxx@ljba0 za&GnNiyJpy-L&cI_U$+J?!CQl-|a((?jAe#;KYds7cM+|_wL=tj~~B%`}X_y?|=XP z{U5AA@t>e`QEFmIYKlU6W=V#EyQgmegW^vXMlObW1|0?<07Vo7`}2nSrskH`w)T$B zuI`@RHbs?*lO|8pnKpfTld`+zoOyE>*eqJSNUurW+|_uMtH~N;6W>jnH~BQlx*53a z+OvDN>4Af$7TQfRhEBRCPoL7&HM(%o$V{V2%300v=IvXzwrufk5>vOAd;0vDoSf#H zx0?E@O~MYMc3;1L`=<2!kCK)`la$I0$A$$5n^-t%W-oOSXp&)DtXtN}B7h1CE6 diff --git a/htdocs/lang/de/ocstyle/main.tpl.php b/htdocs/lang/de/ocstyle/main.tpl.php index 51c16655..e7228284 100644 --- a/htdocs/lang/de/ocstyle/main.tpl.php +++ b/htdocs/lang/de/ocstyle/main.tpl.php @@ -99,31 +99,24 @@
-
+
-
-
- {loginbox} -
-
- -
-
    -
  • {t}Language:{/t}
    • + + + + + + + + +
    +   {loginbox} + {t}Language:{/t}  $lang) - { if ($lang['show'] == true) - echo '
  • ' . $nbsp . '' . $lang['name'] . '
    • '; - // insert space between flags to match search.php layout with other pages (see RT ticket #4505); - // reason of different flag spacing is unknown - $nbsp = " "; - } + echo '' . $lang['name'] . ' '; ?> -
  •     {t}Country:{/t}
    • -
  • +
    		•     {t}Country:{/t}  - - - - +   +
    +
 
 
diff --git a/htdocs/lang/de/ocstyle/varset.inc.php b/htdocs/lang/de/ocstyle/varset.inc.php index 8dd84232..9d056815 100644 --- a/htdocs/lang/de/ocstyle/varset.inc.php +++ b/htdocs/lang/de/ocstyle/varset.inc.php @@ -26,8 +26,8 @@ tpl_set_var('runtime', ''); //set up main template specific string - $sLoggedOut = '
' . t('User') . ':  ' . t('Password') . ':  
'; - $sLoggedIn = "" . t('Logged in as') . ': {username} - ' . t('Logout') . ''; + $sLoggedOut = '
' . t('User') . ':     ' . t('Password') . ':    
'; + $sLoggedIn = "" . t('Logged in as') . ' {username} - ' . t('Logout') . ''; // target in Loginbox setzen $target = basename($_SERVER['PHP_SELF']).'?'; diff --git a/htdocs/resource2/ocstyle/css/seasons/bg-langstripe-autumn.png b/htdocs/resource2/ocstyle/css/seasons/bg-langstripe-autumn.png index 8db09afa3a958957587bffd994b2f32ab5c5ad37..89e7ce9e46370704539acf70e1ccff7db97479fc 100644 GIT binary patch delta 116 zcmX@aID>J5xU4(}69WUo%GCy@K#IM@)7O>#E|WBa9MjUr6)_X_Bz#!X9eo`c7&i8E z|4C#8s!{iJaSW-rm0S_A{@{@lM-Ci0ai+n=I7!fX(ZZY!UM7ZbUP)d&>cGJ8ScFNV T*QU4~sD;7P)z4*}Q$iB}4m~E^ delta 179 zcmbQic!+U=c)c_S8v_Hw-iW6qK#H+A$lZxy-8q?;Kn`btM`SSr1Gg{;GcwGYBLNg- zFY)wsWxvHGB_PAtZv2GQ)x_9zV%+v@I-=PYee%G810UoW YDoa`9R#h*(2-M5q>FVdQ&MBb@0L17t{{R30 diff --git a/htdocs/resource2/ocstyle/css/seasons/bg-langstripe-spring.png b/htdocs/resource2/ocstyle/css/seasons/bg-langstripe-spring.png index e73838acb9586c14f6d8d9541b1540cb1d17d2ed..3d584ee509cea288dad7dea1a0e1f052be95fafc 100644 GIT binary patch delta 121 zcmX@XIG1sPxU4(}69WUo%GCy@K#IM@)7O>#E|WBa3@hix{@RIp5`iq~j=qiz3>*8o z|0J>k)#!M-IEGZ*N}jR5y|J@%VsB?>XK$yZ&*novS3FX%)8;D-sq`uA*y-_z$AN+2 Xdm7WKxV*YRpgsmqS3j3^P67=42}sMiR^?j(g(OQ{BTAg}b8}PkN*J7rQWHy3QxwWGOEMJPJ$(bh8~Mb6 zicCFS978y+r*<9WWKa+|d}~g@_Ww+Jj|z#E|WBay#7yh(Ts_D5>YJaj=qiz3>*8o z|0J>k)tGv^IEGZ*N}jRXxv_I*XKUxonNvGEJ4Mg2UG`Bh46!pd=5Di6TVY{5$wF9I hOMW5WnKT9_29{M!$Mw1wxd07d@O1TaS?83{1OSd(Cn^8{ delta 187 zcmZ3+c#3g?c)c_S69WT-kyVj0kYX$ja(7}_cTVOdki%Kv5n0T@z%2~Ij105pNB{-d zOFVsD*>7=42}o=HJ$}j*C?r|p8d2h$pPQSSSHj?2l$uzQnxasiS(2gP?&%v4-pD5o zRAlby;uyklJ+%8IFM|P3v(B89KD~RkR&gfwf&JnfoM%lZu*@h(6n}Wcsf1~>iZ geXkNKQC7)hzSqyRe^s5~Dxet*p00i_>zopr03fwEV*mgE diff --git a/htdocs/resource2/ocstyle/css/seasons/bg-langstripe-winter.png b/htdocs/resource2/ocstyle/css/seasons/bg-langstripe-winter.png index cd014ca169423568e945380ee8f906eccdfc9221..5737b7b3852f18f1e969301cd2adb7fafb004ce0 100644 GIT binary patch delta 195 zcmcb^c!_a>c)dIa69WUo%GCy@KuWvBHKN41C^fMpGe1uuBr`Xa!6j3{$V|a4HA%t9 zz|a^-SeckvnHnl+8yFfGypb;H1!`k2@$_|Nzsn>gu4mm+Dq;>4;w*8o|0J>k`C6VXHjW_`w~{MX*B=}NtU=qlsM<-=BDPAFgO>bCYGe8 zD3oWGWGJ|M`UZqI@`(c#nR~i8hH$uD&+RhgJD?zNc+H>x2W3=S9!9NXo|&VqBDf%Z waZ!ld;mVzR=j3(A_qXl*Zx?^@j^JKq<}D7EaZgqHfMzgwy85}Sb4q9e0A!Fsod5s; diff --git a/htdocs/resource2/ocstyle/css/style_print.css b/htdocs/resource2/ocstyle/css/style_print.css index 58c72e6c..0166227c 100644 --- a/htdocs/resource2/ocstyle/css/style_print.css +++ b/htdocs/resource2/ocstyle/css/style_print.css @@ -17,7 +17,7 @@ div#map_canvas img { behavior: none; } div#cacheinfo { background-color: blue;} body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #ffffff; font-family: arial, sans-serif, Tahoma, Verdana;} -.page-container-1 { margin: 0px auto; padding: 0px; background-color:#ffffff; border: solid 1px rgb(100,100,100);} +.page-container-1 { margin: 29px auto auto auto; padding: 0px; background-color:#ffffff; border: solid 1px rgb(100,100,100);} /*************************************/ /* SECTION 2 - HEADER AND NAVIGATION */ @@ -31,7 +31,29 @@ body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #fffff /*-----------------------------------*/ /* 2.1 - Sitename, slogan and banner */ /*-----------------------------------*/ -.header {height:81px;} +.header { + height: 81px; +} + +.headerimage { + height: 80px; + width: 970px; + overflow: hidden; + position: absolute; + top: 1px; + z-index: 1; +} + +.headerlogo { + position: absolute; + top: 0px; + z-index: 2; +} + +.headerimagecontent { + border: 0px none; +} + .mapa {background-image: url(../../../images/celownik.png); height:180px; width:180px;} .site-name {width: 300px; height: 45px; top: 12px; position: absolute; z-index: 4; overflow: hidden; margin: 0px; padding-left: 80px;} @@ -54,26 +76,19 @@ body {font-size: 62.5%; margin: 0px auto; padding: 0px; background-color: #fffff .site-slogan a {color: rgb(234,239,247); text-decoration: underline;} .site-slogan a:hover {text-decoration: none; color: rgb(50,50,50);} -/*--------------------------*/ -/* 2.2 - Navigation - Flags */ -/*--------------------------*/ -.navflag-container { top: 14px; position: absolute; z-index: 2; background-color: transparent;} -.navflag {margin: 0px; padding: 0px; font-size: 1.0em;} -.navflag ul {float: right; margin: 0px; padding: 0px 20px 0px 0px;} -.navflag li {display: inline; list-style: none; margin: 0px; padding: 0px;} -.navflag li a {margin: 0px; padding: 0px 0px 0px 1px;} -.navflag a:hover {color: rgb(0,0,0); text-decoration: none;} -.img-navflag {display: inline; height: 14px; margin: 0px; padding: 0px; border: none;} - /*----------------------------*/ /* 2.3 - Navigation - Level 1 */ /*----------------------------*/ -.nav1-container { top: 35px; position: absolute; z-index: 3; background: transparent;} -.nav1 {margin: 0px; padding: 0px; font-family: verdana, arial, sans serif; font-size: 1.0em;} -.nav1 ul {float: right; margin: 0px; padding: 0px 20px 0px 0px; border-left: solid 1px rgb(115,162,182); background-color: rgb(255,255,255); font-weight: bold;} -.nav1 li {display: inline; list-style: none; margin: 0px; padding: 0px;} -.nav1 li a {display: block; float: left; margin: 0px; padding: 2px 5px 2px 5px; border-right: solid 1px rgb(115,162,182); color: rgb(115,162,182); text-decoration: none; font-size: 10px;} -.nav1 a:hover, .nav2 a.selected {color: rgb(50,50,50); text-decoration: none;} +.nav1 { + height:29px; + } + +.nav1 td { + font-family: verdana, arial, sans serif; + font-size: 1.0em; + vertical-align: middle; + white-space:nowrap; + } /*----------------------------*/ /* 2.4 - Navigation - Level 2 */ @@ -130,6 +145,7 @@ ul#statmenu { padding: 0px; margin: 0px;} .warning {overflow: hidden; width: 735px; height: 24px; border: 1px solid black; background-color: rgb(240,100,100); margin: 0px 0px 0px 0px; padding: 8px 0px 0px 32px; color: rgb(50,50,50); font-weight: bold; font-size: 12px; background-image: url(../images/misc/32x32-impressum.png); background-position: top left; background-repeat:no-repeat;} .errormsg {color: rgb(240,100,100); font-weight: bold;} +.okmsg {color: rgb(0,191,0); font-weight: bold;} #cache_name_block { width: 670px; padding-left: 5px; padding-top: 5px;} @@ -461,6 +477,7 @@ input { border:1px solid black; background-color:white; padding:1px; font-size:1 *.input120 {width:120px;} /* emailadress */ *.input200 {width:200px;} *.input300 {width:300px;} +*.input350 {width:350px;} /* overwrite saved query */ *.input400 {width:400px;} /* short cachedescription */ input.checkbox {width:12px; height:12px; font-size:12px; border:0;} diff --git a/htdocs/resource2/ocstyle/css/style_screen.css b/htdocs/resource2/ocstyle/css/style_screen.css index ff8f6940..8bdd3679 100644 --- a/htdocs/resource2/ocstyle/css/style_screen.css +++ b/htdocs/resource2/ocstyle/css/style_screen.css @@ -46,8 +46,8 @@ div#langstripe { top: 0; left: 0; width: 100%; - padding-top: 3px; - height: 28px; + padding-top: 0; + height: 31px; background: #707070 url(../images/bg-langstripe.png) 0 100% repeat-x; color: black; z-index: 5; @@ -124,7 +124,6 @@ div#bg2 {display: none;} border: 0px none; } - .site-name { width: 300px; height: 60px; @@ -160,28 +159,20 @@ div#bg2 {display: none;} .site-slogan a {color: rgb(234,239,247); text-decoration: underline;} .site-slogan a:hover {text-decoration: none; color: rgb(50,50,50);} -/*--------------------------*/ -/* 2.2 - Navigation - Flags */ -/*--------------------------*/ -.navflag-container {width: 970px; top: 14px; position: absolute; z-index: 2; background-color: transparent;} -.navflag {margin: 0px; padding: 0px; font-size: 1.0em; } -.navflag ul {float: right; margin: 0px; padding: 0px 20px 0px 0px;} -.navflag li {display: inline; list-style: none; margin: 0px; padding: 0px;} -.navflag li a {margin: 0px; padding: 0px 0px 0px 1px;} -.navflag a:hover {color: rgb(0,0,0); text-decoration: none;} -.img-navflag {display: inline; height: 14px; margin: 0px; padding: 0px; border: none;} - /*----------------------------*/ /* 2.3 - Navigation - Level 1 */ /*----------------------------*/ -/* .nav1-container {width: 970px; top: 35px; position: absolute; z-index: 3; background: transparent;} */ -.nav1-container {top: 10x; left: 5px; background: transparent; position: absolute; float: left;} -.nav1 {margin: 3px; padding: 0px; font-family: verdana, arial, sans serif; font-size: 1.0em;} -.nav1 ul {float: right; margin: 0px; padding: 0px 20px 0px 0px; border-left: solid 1px rgb(115,162,182); background-color: rgb(255,255,255); font-weight: bold;} -.nav1 li {display: inline; list-style: none; margin: 0px; padding: 0px;} -.nav1 li a {display: block; float: left; margin: 0px; padding: 2px 5px 2px 5px; border-right: solid 1px rgb(115,162,182); color: rgb(115,162,182); text-decoration: none; font-size: 10px;} -.nav1 a:hover, .nav2 a.selected {color: rgb(50,50,50); text-decoration: none;} +.nav1 { + height:29px; + } + +.nav1 td { + font-family: verdana, arial, sans serif; + font-size: 1.0em; + vertical-align: middle; + white-space:nowrap; + } /*----------------------------*/ /* 2.4 - Navigation - Level 2 */ diff --git a/htdocs/resource2/ocstyle/js/session.js b/htdocs/resource2/ocstyle/js/session.js index cef5eb5b..1b78f696 100644 --- a/htdocs/resource2/ocstyle/js/session.js +++ b/htdocs/resource2/ocstyle/js/session.js @@ -5,6 +5,10 @@ * * Unicode Reminder メモ ***************************************************************************/ + +// implementation incomplete in sys_main.tpl and missing in main.tpl +// therefore not in use + var nSessionTimeout = 30; // in minutes (default 30) nSessionTimeout -= 3; // tolerance diff --git a/htdocs/templates2/ocstyle/sys_main.tpl b/htdocs/templates2/ocstyle/sys_main.tpl index 4e0f5c1d..176a1787 100644 --- a/htdocs/templates2/ocstyle/sys_main.tpl +++ b/htdocs/templates2/ocstyle/sys_main.tpl @@ -78,32 +78,35 @@
{* *} -
- {if $opt.session.url==true} -
- Automatische Abmeldung in
0
 Minuten - Abbrechen -
- {/if} -
- {nocache} - {if ($login.userid==0)} -
{t}User{/t}:  {t}Password{/t}:  
 - {else} - {t}Logged in as{/t}: {$login.username|escape} - {t}Logout{/t}  - {/if} - {/nocache} -
-
-
-
    -
  • {t}Language:{/t}
    • - {foreach from=$opt.template.locales key=localeKey item=localeItem} - {if $localeItem.show} -
  • {$localeItem.name|escape}
    • + + + {if $opt.session.url==true} +
    + {* message is not properly formated and displays always 0 + don't enable this feature until this is fixed and tested *} + Automatische Abmeldung in
    0
     Minuten - Abbrechen +
    + {/if} + + + + + + +
    + {nocache} +   + {if $login.userid==0} +
    {t}User{/t}:     {t}Password{/t}:    
     + {else} + {t}Logged in as{/t} {$login.username|escape} - {t}Logout{/t} + {/if} + {/nocache} +     		{t}Language:{/t}  + {foreach from=$opt.template.locales key=localeKey item=localeItem} + {if $localeItem.show} + {$localeItem.name|escape} {/if} {/foreach} -
  •     {t}Country:{/t}
    • -
  • +
    		•     {t}Country:{/t}  - - - +   +