From 68da4219c09575ed452587a56c160ba74770694f Mon Sep 17 00:00:00 2001 From: jengo Date: Mon, 8 Jan 2001 15:01:37 +0000 Subject: [PATCH] Cleaned up the images for the new layout and made the red icon work w/ home and preferences --- phpgwapi/inc/phpgw_categories.inc.php | 95 +++++++----------- phpgwapi/templates/verdilak/images/help.gif | Bin 0 -> 669 bytes .../templates/verdilak/images/logout-grey.gif | Bin 0 -> 3213 bytes .../templates/verdilak/images/logout-red.gif | Bin 0 -> 2099 bytes .../verdilak/images/preferences-grey.gif | Bin 0 -> 4215 bytes .../verdilak/images/preferences-red.gif | Bin 0 -> 2505 bytes .../verdilak/images/welcome-grey.gif | Bin 0 -> 2171 bytes .../templates/verdilak/images/welcome-red.gif | Bin 0 -> 2181 bytes phpgwapi/templates/verdilak/navbar.inc.php | 16 ++- phpgwapi/templates/verdilak/navbar.tpl | 4 +- setup/sql/mysql_newtables.inc.php | 18 ++-- setup/sql/mysql_upgrade_beta.inc.php | 23 +++++ setup/sql/pgsql_newtables.inc.php | 18 ++-- setup/sql/pgsql_upgrade_beta.inc.php | 21 ++++ 14 files changed, 116 insertions(+), 79 deletions(-) create mode 100644 phpgwapi/templates/verdilak/images/help.gif create mode 100644 phpgwapi/templates/verdilak/images/logout-grey.gif create mode 100644 phpgwapi/templates/verdilak/images/logout-red.gif create mode 100644 phpgwapi/templates/verdilak/images/preferences-grey.gif create mode 100644 phpgwapi/templates/verdilak/images/preferences-red.gif create mode 100644 phpgwapi/templates/verdilak/images/welcome-grey.gif create mode 100644 phpgwapi/templates/verdilak/images/welcome-red.gif diff --git a/phpgwapi/inc/phpgw_categories.inc.php b/phpgwapi/inc/phpgw_categories.inc.php index 42bf5ddd81..d800dfbba3 100644 --- a/phpgwapi/inc/phpgw_categories.inc.php +++ b/phpgwapi/inc/phpgw_categories.inc.php @@ -13,78 +13,51 @@ class categories { - function read($format = "", $app_name = "", $owner = "", $cat_id = "") - { - global $phpgw_info, $phpgw; - $db2 = $phpgw->db; - - if (! isset($owner)) { - $owner = $phpgw_info["user"]["account_id"]; - } - - if (! isset($format)) { - $format = "array"; - } - - if ($format == "single") { - $db2->query("select * from categories where cat_id='$cat_id' and account_id='$owner' " - . "and app_name='" . addslashes($app_name) . "'"); - $db2->next_record(); - - $cat_info[]["id"] = $db2->f("cat_id"); - $cat_info[]["name"] = $db2->f("cat_name"); - $cat_info[]["descrption"] = $db2->f("cat_descrption"); - return $cat_info; - } - - if (! $app_name) { - $app_name = $phpgw_info["flags"]["currentapp"]; - } - if (! $account_id) { - $owner = $phpgw_info["user"]["account_id"]; - } - - $db2->query("select cat_id,cat_name,cat_description from categories where app_name='$app_name' " - . "and account_id='$owner'"); - $i = 0; - while ($db2->next_record()) { - if ($format == "array") { - $cat_list[$i]["cat_id"] = $db2->f("cat_id"); - $cat_list[$i]["cat_name"] = $db2->f("cat_name"); - $cat_list[$i]["cat_description"] = $db2->f("cat_description"); - $i++; - } - if ($format == "select") { - $cat_list .= ''; - } - } - return $cat_list; - } - - function add($owner,$app_name,$cat_name,$cat_description = "") + var $account_id; + var $app_name; + var $cats; + var $db; + + function categories($account_id,$app_name) { global $phpgw; - $db2 = $phpgw->db; + $this->account_id = $account_id; + $this->app_name = $app_name; + $this->db = $phpgw->db; - $db2->query("insert into categories (account_id,app_name,cat_name,cat_description) values ('" - . "$owner','" . addslashes($app_name) . "','" . addslashes($cat_name) . "','" - . addslashes($cat_description) . "')"); + $this->db->query("select * from phpgw_categories where cat_owner='$account_id' and app_name='" + . "$app_name'",__LINE__,__FILE__); + while ($this->db->next_record()) { + $this->cats[]["id"] = $this->db->f("cat_id"); + $this->cats[]["parent"] = $this->db->f("cat_parent"); + $this->cats[]["name"] = $this->db->f("cat_name"); + $this->cats[]["description"] = $this->db->f("cat_description"); + $this->cats[]["data"] = $this->db->f("cat_data"); + } } - function delete($owner,$app_name,$cat_name) + // Return into a select box, list or other formats + function list() { - global $phpgw; - $db2 = $phpgw->db; + + } + + function add($app_name,$cat_name,$cat_parent,$cat_description = "", $cat_data = "") + { + $this->db->query("insert into phpgw_categories (cat_parent,cat_owner,cat_appname,cat_name," + . "cat_description,cat_data) values ('$cat_parent','" . $this->account_id . "','" + . "$app_name','" . addslashes($cat_name) . "','" . addslashes($cat_description) + . "','$cat_data'",__LINE__,__FILE__); + } - $db2->query("delete from categories where account_id='$account_id' and app_name='" - . addslashes($app_name) . "' and cat_name='" . addslashes($cat_name) . "'"); + function delete($cat_id) + { + $this->db->query("delete from phpgw_categories where cat_id='$cat_id' and cat_owner='" + . $this->account_id . "'",__LINE__,__FILE__); } function edit($owner,$app_name,$cat_name,$cat_description) { - global $phpgw; - $db2 = $phpgw->db; $db2->query("update categories set cat_name='" . addslashes($cat_name) . "', cat_description='" . addslashes($cat_description) . "' where account_id='$owner' and app_name='" diff --git a/phpgwapi/templates/verdilak/images/help.gif b/phpgwapi/templates/verdilak/images/help.gif new file mode 100644 index 0000000000000000000000000000000000000000..ea3c9284f82b0f4f4031c854e0aafc7ea585def8 GIT binary patch literal 669 zcmZ?wbhEHbm{t;VDz5OrAV>_wL9gl^78Wf`uaCRV9%fflw|;UoPq6tgM)$s15eut zm4yijavUAbixy-k32?hQb!q7EwPsFV5TL*ln-v_bU?RzTocU6Q9#?zEBkh?1T4G}2 z-rO8q6`T^1QqnTA;&LqPu^C)ElJW|QvP#N9Y@F=@LMp0i>KbyfngNNdJRDkr+LFFL zAt@|8>N@JWzTV-S5!IZsdipz9+gML?2pSj~8HeSzwFM~aN(!>vJIAt+<8XLv_}R17 nfh>{Xi|)0tXRv5~4i9+x^z6?+CMKo~jJG5_3K9f{r>Cp|*Ju7$ literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/verdilak/images/logout-grey.gif b/phpgwapi/templates/verdilak/images/logout-grey.gif new file mode 100644 index 0000000000000000000000000000000000000000..e2f921fb9f8b3e378c43930d1b8bfda2d0ae722f GIT binary patch literal 3213 zcmeIy`&ZHl8V2z1mz#o$H&D=V23RJ|7$a9rvu02M0WaYdbJb8mWm-2JFPT{ZA_`jJ z9WNOwrkOTq>d971yryY^X=ZwMbvN72INMP>+wOKsxBWBrY|pRHZ_j()PcWP5>z5n@ z*aLq9fSH+@xw*N=j~~y^&o?wQ)YaA1*Vk(_nx>|v+S=O2#>VT{uh-PnG&eU_S62@Y z4^K}|S5#CyeE6`tyZg$OE4{tFFJ8P*sZ=d3Eu*8O27_UIe0*eNWN>hBY;5e#oja40 zlf}iwD=RCH9zE*p?5wJ)Dl03yb?cVNWGXBy+}+)M{`~pE!ouF(UPnjA($dn?r%&I% zf3H@nKYaMGv9a;&*|WEA->$B%Din&BFJE4}cCEd={o}`vXV0EpTwGjUUe@V!m6er# zetswviby2J#>Pq{lG4)Bo}Qktu&|Jj5H6R?WHLW}`VuCBnqz=DE;l9G~}H*Xq^Mx|1D@#4j# zq$H_Snx3AXl9F=a!iAiioEtZ82n2%6%uJa~=HTG);K762w{K@>XBQO}t*x!Sd-pCe zF|nr=byKZi7$B!R>{rdI5z`*9_W`BP_old`h|30739~v6U%F6Qc z@^W!;Szljgu~?TbT{?5-OniL&?Ck85Cr^@-lYM-Ac6N5OTJ5P*r}FdjPo6v(7Z;b8 zmlqWk6&@ZQ6B82|8L8Lnx3;z}U%o7t%S9p)gTbh;|9siTw6rv#FjXiNrln;7004nN zKoHbu8q(86LSg#n9sb`!+_wm4L`MY$a2cK+R4Dj)6yhE_ELk8VoD=0_5Q5oZT!8p* z7>EM)0m|nV`0wKY=6e7Lv!N0sh9Yx&_k>6KmhloBtD7X67674+)`ZT|-qdN8xt$GH zJqk>fIas-E=W8W0D8`;b0II-w1cLH4Riq_P)%l-CF~kI^3_^@aJg6Mig}^K=DH3EA zDNN;Iox$KrT$fdcdGVn%jBvRu%%!uN^;=g)l~Xb5gqEP2iT*CuNn7CMIx|8a_;Jl| z*9~HZ_s;utzjiCU?*Mi}t~7NlHGBMXc9T6gDuv%_U?s5$2B`UuJa?Nz=LNiSpR)z% zVc^K*bu$u6!;d~Re-}~esX1jL$(9<928V0Cm#_^g3vMTWBT!_C_sV#&KD3Fj`pReT z_hMsT5W*V&J(<7Fhs?onG`YR)xiv^vtvV3m z)TxJ9xOE$479Rb22KbLMPQh@e6iBucX6W($E3oDG04BXV+4?v5qUJ^XBU8pOVLr8 zII18Sh8HFzEAYJP046HkQVen8=~|dhC%TUS&d_^eI=JVlG16@*6r;lV7**nY5;oim zew8ILO!0F>F*>m8Rr?ZzG$0(s`TP1JY|snjX>7LmmvO6{Zmtb{lPpLqXMH(7{T%XY=Cp8vI*$3F-KsY&)&R<}m2}UKZ zIsd1izXsq3?V(-UMhOewSDvM5Nts2oQA`at~k#;(5Tfg8p@)c!>I$MHRp8_q# zMVMEF5{`rf$udN-QCzzRHd7=lzFc6}-vEKJW$q>p8@Entt5&!d9oz`U88J?^h(k@s z@GT}>G3MbM!grFm82*dQ`HwVL7EiT2{mNnQHibcA6F-*zyGik*Ty2ov51ZawG7kEpCno%>;8=I z!Kll1WLNeKCw{lG#%mHEn5BrS{tKpan@oO6n|1GpU^_$G53vr;L^ZWyLGTM!U$FXu M)fcS(H?Z>m4+=P#X#fBK literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/verdilak/images/logout-red.gif b/phpgwapi/templates/verdilak/images/logout-red.gif new file mode 100644 index 0000000000000000000000000000000000000000..5bef6b80e56ed2ef14792c04b683be2cbefeef4c GIT binary patch literal 2099 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 literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/verdilak/images/preferences-red.gif b/phpgwapi/templates/verdilak/images/preferences-red.gif new file mode 100644 index 0000000000000000000000000000000000000000..519d7f387309c4b461312826356b350d40cad8f5 GIT binary patch literal 2505 zcmd6m`#)3(1BcH!bDX&t%ovw(%V5eSd1owd7S*`SgbbsQOSa>F+2W*eNw+f>LdswW zsSr}_)>PUkwKGGlBn?s8RM@RmYxmQ>Z(Ax&+xuU<&kx@};Q4-@^`Qcvuak=b2JjmI z+`fH#WMt&dojZ5$-feDfZftC9YHB)i3yi`udiZmSe|`)zs9~ z)zvALN`*r4?Af!&j~`#Vc1@$v{P^RKYPEWBaIm$t_1w90TCMi__3O2@wVj=v-QC?w zOG~FtovN&??C8GD=+_=%+-aarepi-%-tE->7t?{ye{rd6o@m;%ig@lA`*sviiEUc@mYxnNm5fKr=!NHd_|yT zkw_%lwrvxO#f621+qZ8|N=nMh%iFqjYiViefddDkqoeok-FxWJp{lB?@4x?ket!PN zix+KeZD-G(J%9eZTrN*bOB)^@#&O)=-#;NCAtokf)22S+%R=xCh?;}I548OsKYmO|*zy8m-$JO( z5S$Oez7Rb3bUHOPwYgc@-rkXbz-uA+!=DS|KTpTS#l^J z_|L0_hT|Pyp8bErL2oQfPD^JMWs9>|>qCViz~Ma%Qh?8Z`xm#s|0)4UdH{rJ92TyT zkr-}UhE#0>2WU=VX)ZiqIRsOfJ}SBdB*0X*NX2!64k4m5UQH-Ss3wtYc{%1>^Vua{zm7KfM0&DxtTSMjaoDg|(^z&V)2AXsjJ3{37?|Yv zhF}u_RP7z*xP}*-Avx+t*IobJLi!Z3Id9>DUvil|X4JI;J6n`WAmM*gj9zgAWmiI1 z`<5%rA;G{dr(Z9d4V)aR$}+bVt;*M|zq;<&3VqXfx2&#}o3hlmlPhdVvI!Qc@z?2E zKcb&5?rj>O-Sx>@A+Ki}0SZ0ji1OYRJ%rNE>rv|I!b3>ky0AmpnaUXYRZ6ea_?GYXlp-yljbS)-mAFySrHV53ze?jXXV z{dJ1wVWz?9daH0Af$D|UR*<+o*v;?U;db(h4lN6?F%6~@sNO2Poaj2qSFdOhk5@RK zz#V5RSn&LU~UBq?1*|egBE@2&<>|60t8kNjtUr=trEU<&b&%M zeV<|kSgoej@GWW4^dJUTP9xZC@1DIy&QnM6ZGES8gVS+WS|zqZ5tpd9O@9NxPTYA- zh-DR9J2V-LJ{fc@;5isPh)Y#%35Pj~O1HC(+OU=9l=XGFn{*i=-Aq_K6|_ z6PUBi#|8jYCo}Bj#Jh_+fjL(B?`$=wCY5o@#tc);f>un74Q{;^Hq@Z{;Lz3o_YBiE2;I{0r z>J&*yn>|hT>sYd<=T(=$V|S&jhg zOv!Lw76P+I0ivfr4(=lbLsOp72)mvdr+Qfzts?lSXQ@uOn!p5!JTXX%o}q?)vy-7t zV}tAZ>he4{Hc-gVy`6f&cQYkTlS~$L_;h7LM32qFlqs9v*O^u;wR_Qza45Z@;pYfb zRm>N@whq=QP3<*_IT>!NXNO|g|D`v2m98uKFqHI%@1v#(^W~mLn_WONrPY)?&HEsj z6iH89_VYB~%iK-90oPid(%p2uvgU5Cts2m~pYr!>qD1~#t3+d;C-%f|j}+Yj)VO@j zov7{m=7Kax!8_NQN5hd3TAQ}-_`cWLbVaKsTCQI8{@OB!mKk=i4jDsMdy_qOEU%;2 rS}&?e5h|(W$PD7QsG)kuEu0)GDhXcKDE literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/verdilak/images/welcome-grey.gif b/phpgwapi/templates/verdilak/images/welcome-grey.gif new file mode 100644 index 0000000000000000000000000000000000000000..46625167ba74d8281116efb5a96fa5a13bea6399 GIT binary patch literal 2171 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 literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php index 72fbfedf28..5ef8643dd0 100644 --- a/phpgwapi/templates/verdilak/navbar.inc.php +++ b/phpgwapi/templates/verdilak/navbar.inc.php @@ -13,7 +13,7 @@ function parse_navbar($force = False) { - global $phpgw_info, $phpgw; + global $phpgw_info, $phpgw, $PHP_SELF; $tpl = new Template($phpgw_info["server"]["template_dir"]); $tpl->set_unknowns("remove"); @@ -44,6 +44,20 @@ $tpl->set_var("logout_link",$phpgw_info["navbar"]["logout"]["url"]); $tpl->set_var("help_link",$phpgw_info["navbar"]["about"]["url"]); + $ir = $phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/verdilak/images"; + if (ereg($phpgw_info["server"]["webserver_url"] . "/index.php",$PHP_SELF)) { + $tpl->set_var("welcome_img",$ir . "/welcome-red.gif"); + } else { + $tpl->set_var("welcome_img",$ir . "/welcome-grey.gif"); + } + + if (ereg("preferences",$PHP_SELF)) { + $tpl->set_var("preferences_img",$ir . "/preferences-red.gif"); + } else { + $tpl->set_var("preferences_img",$ir . "/preferences-grey.gif"); + } + $tpl->set_var("logout_img",$ir . "/logout-grey.gif"); + /* if ($phpgw_info["server"]["showpoweredbyon"] == "top") { $tpl->set_var("powered_by",lang("Powered by phpGroupWare version x",$phpgw_info["server"]["versions"]["phpgwapi"])); } diff --git a/phpgwapi/templates/verdilak/navbar.tpl b/phpgwapi/templates/verdilak/navbar.tpl index 3591df505f..d7ea4e4b46 100755 --- a/phpgwapi/templates/verdilak/navbar.tpl +++ b/phpgwapi/templates/verdilak/navbar.tpl @@ -6,11 +6,11 @@ {user_info} - + - + diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php index f691523514..7281856996 100644 --- a/setup/sql/mysql_newtables.inc.php +++ b/setup/sql/mysql_newtables.inc.php @@ -262,14 +262,16 @@ )"; $phpgw_setup->db->query($sql); - $sql = "CREATE TABLE categories ( - cat_id int(9) DEFAULT '0' NOT NULL auto_increment, - account_id int(11) DEFAULT '0' NOT NULL, - app_name varchar(25) NOT NULL, - cat_name varchar(150) NOT NULL, - cat_description text NOT NULL, - PRIMARY KEY (cat_id) - )"; + $sql = "CREATE TABLE phpgw_categories ( + cat_id int(9) DEFAULT '0' NOT NULL auto_increment, + cat_parent int(9) DEFAULT '0' NOT NULL, + cat_owner int(11) DEFAULT '0' NOT NULL, + cat_appname varchar(50) NOT NULL, + cat_name varchar(150) NOT NULL, + cat_description varchar(255) NOT NULL, + cat_data text, + PRIMARY KEY (cat_id) + )"; $phpgw_setup->db->query($sql); $sql = "CREATE TABLE languages ( diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php index 78efcc1628..e4cf3b86b1 100644 --- a/setup/sql/mysql_upgrade_beta.inc.php +++ b/setup/sql/mysql_upgrade_beta.inc.php @@ -766,6 +766,29 @@ $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.8pre5"; } + $test[] = "0.9.8pre5"; + function upgrade0_9_8pre5(){ + global $phpgw_info, $phpgw_setup; + + // Since no applications are using it yet. I am gonna drop it and create a new one. + // This is becuase I never finished the classes + $phpgw_setup->db->query("drop table categories"); + $sql = "CREATE TABLE phpgw_categories ( + cat_id int(9) DEFAULT '0' NOT NULL auto_increment, + cat_parent int(9) DEFAULT '0' NOT NULL, + cat_owner int(11) DEFAULT '0' NOT NULL, + cat_appname varchar(50) NOT NULL, + cat_name varchar(150) NOT NULL, + cat_description varchar(255) NOT NULL, + cat_data text, + PRIMARY KEY (cat_id) + )"; + $phpgw_setup->db->query($sql); + + $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.9pre1"; + } + + reset ($test); while (list ($key, $value) = each ($test)){ if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) { diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php index e6a0789af6..f4602366d0 100644 --- a/setup/sql/pgsql_newtables.inc.php +++ b/setup/sql/pgsql_newtables.inc.php @@ -236,14 +236,18 @@ )"; $phpgw_setup->db->query($sql); - $sql = "CREATE TABLE categories ( - cat_id serial, - account_id int DEFAULT '0' NOT NULL, - app_name varchar(25) NOT NULL, - cat_name varchar(150) NOT NULL, - cat_description text NOT NULL - )"; + + $sql = "CREATE TABLE phpgw_categories ( + cat_id serial, + cat_parent int, + cat_owner int, + cat_appname varchar(50) NOT NULL, + cat_name varchar(150) NOT NULL, + cat_description varchar(255) NOT NULL, + cat_data text + )"; $phpgw_setup->db->query($sql); + $sql = "CREATE TABLE languages ( lang_id varchar(2) NOT NULL, diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php index 47f9a77cb3..1a8397f140 100644 --- a/setup/sql/pgsql_upgrade_beta.inc.php +++ b/setup/sql/pgsql_upgrade_beta.inc.php @@ -792,6 +792,27 @@ $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.8pre5"; } + $test[] = "0.9.8pre5"; + function upgrade0_9_8pre5(){ + global $phpgw_info, $phpgw_setup; + + // Since no applications are using it yet. I am gonna drop it and create a new one. + // This is becuase I never finished the classes + $phpgw_setup->db->query("drop table categories"); + $sql = "CREATE TABLE phpgw_categories ( + cat_id serial, + cat_parent int, + cat_owner int, + cat_appname varchar(50) NOT NULL, + cat_name varchar(150) NOT NULL, + cat_description varchar(255) NOT NULL, + cat_data text + )"; + $phpgw_setup->db->query($sql); + + $phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.9pre1"; + } + reset ($test); while (list ($key, $value) = each ($test)){ if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) {