From 273c3816288ecad237223d054eedb64b8471ceed Mon Sep 17 00:00:00 2001 From: seek3r Date: Mon, 3 Jun 2002 22:17:56 +0000 Subject: [PATCH] updating for my netscape 4.x patches --- phpgwapi/inc/functions.inc.php | 9 +++++++++ phpgwapi/templates/default/parts.inc.php | 13 ++++++++++--- phpgwapi/templates/default/parts.tpl | 15 +++++---------- phpgwapi/templates/default/phpgw.tpl | 10 +++++----- .../idsociety/images/nav_bar_left_spacer.gif | Bin 2249 -> 336 bytes .../idsociety/images/nav_bar_left_spacer.png | Bin 454 -> 325 bytes phpgwapi/templates/idsociety/parts.inc.php | 12 ++++++++---- phpgwapi/templates/idsociety/parts.tpl | 12 ++++++------ 8 files changed, 43 insertions(+), 28 deletions(-) diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php index 47737218ae..7cb59e572e 100644 --- a/phpgwapi/inc/functions.inc.php +++ b/phpgwapi/inc/functions.inc.php @@ -350,12 +350,21 @@ $GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','0'); $GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','0'); $GLOBALS['phpgw']->template->set_var('phpgw_top_scrolling','AUTO'); + $GLOBALS['phpgw']->template->set_var('phpgw_left_table_width','0'); $GLOBALS['phpgw']->template->set_var('phpgw_left_frame_width','0'); $GLOBALS['phpgw']->template->set_var('phpgw_left_scrolling','AUTO'); + + $GLOBALS['phpgw']->template->set_var('phpgw_body_table_height','100%'); + $GLOBALS['phpgw']->template->set_var('phpgw_body_table_width','100%'); + $GLOBALS['phpgw']->template->set_var('phpgw_body_frame_height','*'); + $GLOBALS['phpgw']->template->set_var('phpgw_body_frame_width','*'); + $GLOBALS['phpgw']->template->set_var('phpgw_body_scrolling','AUTO'); + $GLOBALS['phpgw']->template->set_var('phpgw_right_table_width','0'); $GLOBALS['phpgw']->template->set_var('phpgw_right_frame_width','0'); $GLOBALS['phpgw']->template->set_var('phpgw_right_scrolling','AUTO'); + $GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','0'); $GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','0'); $GLOBALS['phpgw']->template->set_var('phpgw_bottom_scrolling','AUTO'); diff --git a/phpgwapi/templates/default/parts.inc.php b/phpgwapi/templates/default/parts.inc.php index 2551f1ea43..188c2f0d6e 100644 --- a/phpgwapi/templates/default/parts.inc.php +++ b/phpgwapi/templates/default/parts.inc.php @@ -11,9 +11,15 @@ /* $Id$ */ - $GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','10%'); + $GLOBALS['phpgw']->template->set_var('phpgw_left_table_width','5%'); + $GLOBALS['phpgw']->template->set_var('phpgw_right_table_width','5%'); + + $GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','5%'); $GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','45'); - $GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','5%'); + $GLOBALS['phpgw']->template->set_var('phpgw_top_scrolling','NO'); + $GLOBALS['phpgw']->template->set_var('phpgw_body_table_width','90%'); + $GLOBALS['phpgw']->template->set_var('phpgw_body_table_height','89%'); + $GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','1%'); $GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','40'); function parse_toppart($output) @@ -105,7 +111,7 @@ $GLOBALS['phpgw']->template->set_file('parts','parts.tpl'); $GLOBALS['phpgw']->template->set_block('parts','bottom_part'); $var = Array( - 'msg' => "

\n".lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']).'

', + 'msg' => lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']), 'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] ); $GLOBALS['phpgw']->template->set_var($var); @@ -116,3 +122,4 @@ $GLOBALS['phpgw']->template->set_var($output,''); } } + diff --git a/phpgwapi/templates/default/parts.tpl b/phpgwapi/templates/default/parts.tpl index b633a83fad..7570a606a2 100644 --- a/phpgwapi/templates/default/parts.tpl +++ b/phpgwapi/templates/default/parts.tpl @@ -5,21 +5,16 @@ {applications} - - - - +
{powered_by}{current_users}
+ + +
{powered_by}  {current_users}
-

{messages}
- - - - -
{msg}
+
{msg}
diff --git a/phpgwapi/templates/default/phpgw.tpl b/phpgwapi/templates/default/phpgw.tpl index fd88a4b894..3ce24a3208 100644 --- a/phpgwapi/templates/default/phpgw.tpl +++ b/phpgwapi/templates/default/phpgw.tpl @@ -21,15 +21,15 @@ {phpgw_top} - {phpgw_left} - + {phpgw_left} + {phpgw_msgbox} {phpgw_body} - {phpgw_right} + {phpgw_right} {phpgw_bottom} @@ -79,9 +79,9 @@ {phpgw_head_website_title} - + - + diff --git a/phpgwapi/templates/idsociety/images/nav_bar_left_spacer.gif b/phpgwapi/templates/idsociety/images/nav_bar_left_spacer.gif index 3a7303f93054ea8d9485b4edc1014da89864b7d6..36c6dd9c7ce6e2c640d41f540c818f6525cdd492 100644 GIT binary patch literal 336 zcmZ?wbhEHboW;P#(89oQ_4rJ#*$vMP+4eU0qXCQ(awMadGka z^XE^TIKjZc5E2qnSy}m?M4Ub8Nnh7Uv%9ZL!^F#D%H(N2Gwi0%n$hAP#K6S9 zXvyMbOIIvkwQ|ksRp~4o8#iy-x@G&eojZ2#+Pi1}zJvTcM~-$H_Mez=>WuN!nGUlr zUU0f}^@>|d8&5|PV|?s`ghz=f_wPMnOK&Kvt$5q`{>|s6FQ2}0&I{yLWUvMR&jh(h literal 2249 zcmV;)2sZaeNk%w1VVVG>0K@c#k1_!~z!o|eL#>vRb%E>hY1klpa)YI10*w@?kpGyDm3L`joDP(u(N3B@p>s8IV% zwJS66%sPr)-q{0`Z{EgQ9q-kPH>gm8bN?j&0i2Yw<-ie@9y)BeaHh?gI5FK^67fn! zRTnL?3mQOUNRA_udOQkJsYs7K`w?_G^<}`SDPq#pnRC-luU!wyJW|rosi9~wrWL9- zi&3XYm%?o-x9-!sfTA+n+l;T@z6YLx`$l-M;lhXy6A(A9@!7U)BLiJK*)3hXm*Zll zXIFFHDJD@`WjT7K>4FNmss_7S>{iyWqxh0Y^c7{>kSmLL+c~pu&YM5>q9TzhB&^4i zUxn%VYxA(FV@H=w$m~ztlCkUF&O10$;GTaA2M|@IdE?8|lg|3Q_4M~+-HR$;+m-$6 zsk(;;FaG;@lAxLO*MNW#h>T!~C8(JHf($CgSYru1mfd~z{iI)ibMdF)c;%tDo^l_m z2as0I!S`Bw(#7{gStm)jopvx%NZExO`e$Q?9M0yGho|v)9ttEvry`0(n&=RHx5=1W zjIq>+_@+sAif_dWU0&rDcgFdRwLl=A$JJ=?Rj5;%8|_Xc|f=o0{&y zqG(r!C~A*ZHCm*ks6r|vr4wG7WRrt-x?ilb0_dhxAd(uYuFQGKWu&V9N*0yp_}Qwl zMP*tmr^{~IW+`vVDeasG=85P3wbs`8pkuC9imaf8HY=;LZ+wdDqKW!Q!>PeK3hcYX z-rDW4uVO0Yxc7=XE26t9I;x_k`s(hN@XBZIye|UE9l7~3oTI$zrYkXf0<&B2zy^zn zFq!q9+3?4-if8V$BvV@qg4trLa>~?fJIuSzV; z8^@fV!#CS}XwDPo>hFj^3oA9oR8t2n(a6diDALSwo#w$jqq{SZQCD5@*`sKjwb2%O zjc?5lUtRLtbE3TR-7G7}7@x&rJ@)E{lfC%QuM1sWpMKK|c(SJto_pb9((OB7 zcIPcT-if&!VdQJWYWebAZwPkNVz*9l=by)3ecJLSuRYDoQ?5JQhDR@c;;vI~w)voA z9~#!RlRl&AaCh&i>eAOQKIe>Ee?CNNw?F#m;A&p{1Zb=E{qBHtBHr*8SUd>540--L z+U_O@KKhN1SNBU_{?G@XgKh72+6kcd;Agq;k&ks5)Sm`n7pCk*5Q3JWp!~j9K+zmBXsxDrShqAkx7%90hOIq=i zpMeo@@snJq#B_H%Qt@VNd1%IC~JAgOX4w;vpd8h6$!jY zI`Wx|ap3U=ImJ3+(v;sbAs;uXI6#8(m$F;mC<&>&V`39$s@$b6wdBb!z7kb(oMron zc}rXBB8~QAWgoriOLu0>g~Fs|J&S42%iU_3ziXs37mBSX(k`I#w5B-?2{LW2bBo>l zraw0t$6!wXlAJ`L=Q$~ePmHdTm;8LEMmq}7k5;pi6pd*KbIDEUxe}Z>=)_Lx=t-O1y zN!6Lrezr4xvfL_O?S)vj3Y8ym-DW4TdRDaEm6RZ*B2)=V+Qf=etc%s5V>xSAkAjw| zAv~;C{gX()5><(U%`M9u+BeC*ww$At?a~xW)sv#8u8;MsYeVbXt_JnFZ91)SQ9IY< zB6m{%%Y`jdof}-XS`@Wxv~F2r${nC_FmnZm>cu;Epy3uUkRJ>y9q{Nby;iO$ey>k1$HqS5zJTx)A+|N6fk{P+|(AA zwxXJhF7?y;a%i)Xr))y90jF^l8uX9}BQ#JAN( z@`)!MO$UCN$N-%3VM|))C6{l!Yi{kHF)igrQ~AKey|Ab4oaazGuDnsstEo55<5k-) X&7dwcOQEdjL>HOSaE`7aLI40e7h86u diff --git a/phpgwapi/templates/idsociety/images/nav_bar_left_spacer.png b/phpgwapi/templates/idsociety/images/nav_bar_left_spacer.png index 4de337b9727cf6339452217ed46e15b18cbb1999..3ac58744980eee3760bb3d006043a8d51075664d 100644 GIT binary patch delta 311 zcmX@ce3WT|cs&~j8v_G_b#%KvkYY)9^mSxl*x1kgCy^D%XG`*ScVYMsf(!O8p9~b? zEbxddW?vp{= z*=Mu-W#dvVMF);RmHqeL-FUxkLXh4*b){!BE3TJbh*JNl7ALdD_t}e>i!~B#3=M{A zGtYef6yddUXZ|cUQR!S;H;uXfO`DH^t1nB&7}|avI{QEjlOqr#{YEp&-c#P#$K;rls(jWrRaVl&^rtap00i_>zopr E0OCP^8~^|S literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^vw(OB2Q!e22t57+NF@aLgt(qLbLQaT!*z9aM~@zD zYHF&etlYhKZ*5)O`Sa&boH(&$#mcMKZxk07hlGRxbyQYX0!fm<+&?=ifEvU~Tq8~S>}Yvc zKV4}D<17JRn-2%|C7*qI)+Vt&_kD7DbgMIsZcO)R#D}ON}!QI9>l1uxW^zK&`6-c!RsKrU_Jh)AO`?>Afu-)ys!R+ YRa)ncq=Ntemplate->set_var('phpgw_top_table_height','10%'); - $GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','85'); + $GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','90'); + $GLOBALS['phpgw']->template->set_var('phpgw_left_table_width','5%'); - $GLOBALS['phpgw']->template->set_var('phpgw_left_frame_width','155'); + $GLOBALS['phpgw']->template->set_var('phpgw_left_frame_width','165'); + + $GLOBALS['phpgw']->template->set_var('phpgw_body_table_height','85%'); + $GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','5%'); $GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','30'); $GLOBALS['phpgw_info']['flags']['body_tags']['background']=$GLOBALS['phpgw']->common->image('phpgwapi','content_spacer_middle'); @@ -141,6 +145,7 @@ $GLOBALS['phpgw']->template->set_file('parts','parts.tpl'); $GLOBALS['phpgw']->template->set_block('parts','left_part'); $applications = ''; + $var['nav_bar_left_spacer_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','nav_bar_left_spacer'); while ($app = each($GLOBALS['phpgw_info']['navbar'])) { if ($app[1]['title'] != 'Home' && $app[1]['title'] != 'preferences' && !ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout') @@ -150,7 +155,7 @@ $img_src_over = $app[1]['icon_hover']; $img_src_out = $app[1]['icon']; - $applications .= 'common->image('phpgwapi','nav_bar_left_spacer'); $var['nav_bar_left_top_bg_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','nav_bar_left_top_bg'); $GLOBALS['phpgw']->template->set_var($var); diff --git a/phpgwapi/templates/idsociety/parts.tpl b/phpgwapi/templates/idsociety/parts.tpl index 304056c93f..8f74311d1a 100644 --- a/phpgwapi/templates/idsociety/parts.tpl +++ b/phpgwapi/templates/idsociety/parts.tpl @@ -1,9 +1,9 @@ - +
-
+ @@ -11,10 +11,10 @@
- {current_users} + {current_users}  - {powered_by}  +  {powered_by}
@@ -49,7 +49,7 @@ - +
@@ -67,7 +67,7 @@ - +
{powered}