[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha admin/categorie.pl koha-tmpl/intranet-tmpl... [rel_3_0]
From: |
paul poulain |
Subject: |
[Koha-cvs] koha admin/categorie.pl koha-tmpl/intranet-tmpl... [rel_3_0] |
Date: |
Tue, 24 Oct 2006 20:11:05 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 06/10/24 20:11:05
Modified files:
admin : categorie.pl
koha-tmpl/intranet-tmpl/prog/en/admin: categorie.tmpl
Log message:
adding category_type in list
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/categorie.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.23&r2=1.23.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
Patches:
Index: admin/categorie.pl
===================================================================
RCS file: /sources/koha/koha/admin/categorie.pl,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -b -r1.23 -r1.23.2.1
--- admin/categorie.pl 4 Jul 2006 14:36:51 -0000 1.23
+++ admin/categorie.pl 24 Oct 2006 20:11:05 -0000 1.23.2.1
@@ -150,7 +150,7 @@
overduenoticerequired =>
$data->{'overduenoticerequired'},
issuelimit =>
$data->{'issuelimit'},
reservefee =>
sprintf("%.2f",$data->{'reservefee'}),
- category_type =>
$data->{'category_type'}
+ category_type =>
$data->{'category_type'},
);
# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
@@ -183,7 +183,9 @@
issuelimit => $results->[$i]{'issuelimit'},
reservefee =>
sprintf("%.2f",$results->[$i]{'reservefee'}),
category_type =>
$results->[$i]{'category_type'},
+ "type_".$results->[$i]{'category_type'} => 1,
toggle => $toggle );
+ warn "ICI". $results->[$i]{'category_type'};
push @loop, \%row;
if ( $toggle eq 0 )
{
Index: koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl 18 Oct 2006
10:28:07 -0000 1.3.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl 24 Oct 2006
20:11:05 -0000 1.3.2.3
@@ -166,8 +166,9 @@
</form>
<table>
<tr>
- <th scope="col">Category Name</th>
<th scope="col">Code</th>
+ <th scope="col">Category Name</th>
+ <th scope="col">Type</th>
<th scope="col">Enrollment Period</th>
<th scope="col">Upper Age Limit</th>
<th scope="col">Age Required</th>
@@ -177,9 +178,17 @@
<th scope="col" colspan="2"> </th>
</tr>
<!-- TMPL_LOOP NAME="loop" -->
- <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!--
TMPL_ELSE --><tr><!-- /TMPl_IF -->
- <td><a href="<!-- TMPL_VAR NAME=script_name
-->?op=add_form&categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!--
TMPL_VAR NAME="description" --></a></td><td><!-- TMPL_VAR NAME="categorycode"
--></td>
-
+ <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!--
TMPL_ELSE --><tr><!-- /TMPL_IF -->
+ <td><!-- TMPL_VAR NAME="categorycode" --></td>
+ <td>
+ <a href="<!-- TMPL_VAR NAME=script_name
-->?op=add_form&categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!--
TMPL_VAR NAME="description" --></a>
+ </td>
+ <td>
+ <!-- TMPL_IF NAME="type_A" -->Adult<!-- /TMPL_IF
-->
+ <!-- TMPL_IF NAME="type_C" -->Child<!-- /TMPL_IF
-->
+ <!-- TMPL_IF NAME="type_P" -->Prof.<!-- /TMPL_IF
-->
+ <!-- TMPL_IF NAME="type_O" -->Org.<!-- /TMPL_IF -->
+ </td>
<td><!-- TMPL_VAR NAME="enrolmentperiod" -->
months</td>
<td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
<td><!-- TMPL_VAR NAME="dateofbirthrequired" -->
years</td>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha admin/categorie.pl koha-tmpl/intranet-tmpl... [rel_3_0],
paul poulain <=