Menu
▾
▴
[basedb-cvs] basedb/www acquisition_list.phtml,NONE,1.1 Makefile.am,1.3,1.4 hyb_edit.phtml,1.52,1.53 left.phtml,1.67,1.68
|
From: <tr...@us...> - 2003-02-13 08:47:52
|
Update of /cvsroot/basedb/basedb/www In directory sc8-pr-cvs1:/tmp/cvs-serv17896/www Modified Files: Makefile.am hyb_edit.phtml left.phtml Added Files: acquisition_list.phtml Log Message: Added image set list and fixed ware links --- NEW FILE: acquisition_list.phtml --- <? // $Id: acquisition_list.phtml,v 1.1 2003/02/13 08:47:47 troein Exp $ // // BioArray Software Environment (BASE) - homepage http://base.thep.lu.se/ // Copyright (C) 2002,2003 Lao Saal, Carl Troein, Johan Vallon-Christersson // // This file is part of BASE. // // BASE is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // BASE is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License [...73 lines suppressed...] "<td>".wareArrLink("hard", $a)."</td>". "<td>".htmldate($a["scanDate"])."</td>". "<td>".html($a["userName"])."</td>". "<td>".groupAccessCheckbox($a["id"])."</td>". "<td>".groupInfo($a, $users)."</td>". "<td>".worldInfo($a)."</td>". "<td>".html($a["images"])."</td>". "<td>".implode(", ", $rlink)."</td>". "</tr>\n"; } $cols = count($headerfields); if($acqs) groupAccessFooter($cols, $curUser); showDelLinks($cols); ?> </table> <? htmlEnd(); ?> Index: Makefile.am =================================================================== RCS file: /cvsroot/basedb/basedb/www/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 12 Feb 2003 17:00:49 -0000 1.3 --- Makefile.am 13 Feb 2003 08:47:47 -0000 1.4 *************** *** 35,40 **** sampleannot_edit.phtml sampleannot_list.phtml sample_edit.phtml \ sample_list.phtml sampletissue_tree.phtml settings.phtml \ ! showtext.phtml spotinfo.phtml test.phtml trans_create.phtml \ upload_list.phtml user_edit.phtml usergroup_edit.phtml \ usergroup_list.phtml user_list.phtml ware_edit.phtml ware_list.phtml \ ! wizzzard_edit.phtml wizzzard_list.phtml --- 35,40 ---- sampleannot_edit.phtml sampleannot_list.phtml sample_edit.phtml \ sample_list.phtml sampletissue_tree.phtml settings.phtml \ ! showtext.phtml spotinfo.phtml trans_create.phtml \ upload_list.phtml user_edit.phtml usergroup_edit.phtml \ usergroup_list.phtml user_list.phtml ware_edit.phtml ware_list.phtml \ ! wizzzard_edit.phtml wizzzard_list.phtml acquisition_list.phtml Index: hyb_edit.phtml =================================================================== RCS file: /cvsroot/basedb/basedb/www/hyb_edit.phtml,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** hyb_edit.phtml 2 Feb 2003 15:31:52 -0000 1.52 --- hyb_edit.phtml 13 Feb 2003 08:47:47 -0000 1.53 *************** *** 443,447 **** ImageAcquisition::prepareSearch($search, $hybid, $curUser, 0, showDelValue()); ! $headerfields = array("Name", "Scanner", "Version", "Scan date", "Owner", "[<a href=javascript:selAll(1)>A</a> ". "<a href=javascript:selAll(0)>N</a>]", "Group", "World", --- 443,447 ---- ImageAcquisition::prepareSearch($search, $hybid, $curUser, 0, showDelValue()); ! $headerfields = array("Name", "Hybridization", "Scanner", "Scan date", "Owner", "[<a href=javascript:selAll(1)>A</a> ". "<a href=javascript:selAll(0)>N</a>]", "Group", "World", *************** *** 449,452 **** --- 449,453 ---- $sortorder = array(1, 1, 1, -1, 1, 0, 0, 0, 1, 1); $defsort = 0; + unset($headerfields[1]); if($hyb->mayEdit($curUser)) { *************** *** 482,498 **** $rlink[] = html(""); - $scanner = html($a["scannerName"]); - if($a["scannerShared"]) - { - $scanner = "<a href='ware_edit.phtml". - "?i_type=hard&i_w=$a[scanner]'>". - $scanner."</a>"; - } - echo "<tr bgcolor=$tdbg[$odd]>". "<td><a ".href("hyb_image.phtml?i_acq=$a[id]", 2).">". html($a["name"])."</a></td>". ! "<td>".$scanner."</td>". ! "<td>".html($a["scannerVersion"])."</td>". "<td>".htmldate($a["scanDate"])."</td>". "<td>".html($a["userName"])."</td>". --- 483,490 ---- $rlink[] = html(""); echo "<tr bgcolor=$tdbg[$odd]>". "<td><a ".href("hyb_image.phtml?i_acq=$a[id]", 2).">". html($a["name"])."</a></td>". ! "<td>".wareArrLink("hard", $a)."</td>". "<td>".htmldate($a["scanDate"])."</td>". "<td>".html($a["userName"])."</td>". *************** *** 504,508 **** "</tr>\n"; } ! $cols = 10; if($addscan != "") echo "<tr><td colspan=$cols>$addscan</td></tr>\n"; --- 496,500 ---- "</tr>\n"; } ! $cols = count($headerfields); if($addscan != "") echo "<tr><td colspan=$cols>$addscan</td></tr>\n"; Index: left.phtml =================================================================== RCS file: /cvsroot/basedb/basedb/www/left.phtml,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** left.phtml 3 Feb 2003 08:54:12 -0000 1.67 --- left.phtml 13 Feb 2003 08:47:48 -0000 1.68 *************** *** 201,204 **** --- 201,205 ---- href="index.phtml?l=hyb&m=hyb_list.phtml">Hybridizations</a></td></tr> <tr><td><a target=main href="hyb_list.phtml">Hybridizations</a></td></tr> + <tr><td><a target=main href="acquisition_list.phtml">Image sets</a></td></tr> <tr><td><img src='img/1.gif' alt='' width=1 height=1></td></tr> <tr><td><a target=main href="ware_list.phtml?i_type=hard" |
