[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en admin/bran... [rel_3_0]
paul poulain
paul at koha-fr.org
Wed Nov 15 17:04:12 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 06/11/15 16:04:12
Modified files:
koha-tmpl/intranet-tmpl/prog/en/admin: branches.tmpl
koha-tmpl/intranet-tmpl/prog/en/includes: intranet.css
Log message:
fixing template errors
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.14&r2=1.7.2.15
Patches:
Index: admin/branches.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/branches.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
--- admin/branches.tmpl 15 Nov 2006 15:56:17 -0000 1.3.2.2
+++ admin/branches.tmpl 15 Nov 2006 16:04:12 -0000 1.3.2.3
@@ -10,69 +10,41 @@
<!-- TMPL_IF name="add" -->
<h1><!-- TMPL_VAR name="head" --></h1>
<form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
-<input type="hidden" name="op" value="add_validate" />
-<table>
- <tr>
- <td>Branch code</td>
- <td>
+ <input type="hidden" name="op" value="add_validate" />
+ <p>
+ <label><b>Branch code</b></label>
<!-- TMPL_IF name="branchcode" -->
<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
<!-- TMPL_VAR name="branchcode" -->
<!-- TMPL_ELSE -->
<input type="text" name="branchcode" size="10" maxlength="10" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
<!-- /TMPL_IF -->
- </td>
- </tr>
- <tr>
- <td>Name</td>
- <td><input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" /> </td>
- </tr>
-<!-- TMPL_LOOP name="categoryloop" -->
- <tr>
- <td><!-- TMPL_VAR name="categoryname" --></td>
- <td><input type="checkbox" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /><!-- TMPL_VAR name="codedescription" --></td>
- </tr>
+ </p>
+ <p>
+ <label><b>Name</b></label>
+ <input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />
+ </p>
+ <!-- TMPL_LOOP name="categoryloop" -->
+ <p>
+ <label><!-- TMPL_VAR name="categoryname" --></label>
+ <input type="checkbox" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /><!-- TMPL_VAR name="codedescription" -->
+ </p>
<!-- /TMPL_LOOP -->
-<tr>
- <td>Address</td>
- <td><input type="text" name="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></td>
- </tr>
- <tr>
- <td> </td>
- <td><input type="text" name="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></td>
- </tr>
- <tr>
- <td> </td>
- <td><input type="text" name="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></td>
- </tr>
- <tr>
- <td>Phone</td>
- <td><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></td>
- </tr>
- <tr>
- <td>Fax</td>
- <td><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></td>
- </tr>
- <tr>
- <td>E-mail</td>
- <td><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></td>
- </tr>
- <tr>
- <td>Branch IP</td>
- <td><input type="text" name="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /></td>
- </tr>
- <tr>
- <td>Branch Printer</td>
- <td>
+ <p><label>Address</label><input type="text" name="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></p>
+ <p><label> </label><input type="text" name="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></p>
+ <p><label> </label><input type="text" name="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></p>
+ <p><label>Phone</label><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></p>
+ <p><label>Fax</label><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></p>
+ <p><label>E-mail</label><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></p>
+ <p><label>Branch IP</label><input type="text" name="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /></p>
+ <p><label>Branch Printer</label>
<select id="branchprinter" name="branchprinter">
<option value="">None</option>
<!-- TMPL_LOOP NAME="printerloop" -->
<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchprinter" --></option>
<!-- /TMPL_LOOP -->
</select>
- </td>
- </tr>
-</table><p><input type="submit" value="Submit" /></p>
+ <p><input type="submit" value="Submit" /></p>
</form>
<!-- /TMPL_IF -->
@@ -90,7 +62,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF name="else" -->
-
+ <h1><!-- TMPL_VAR name="head" --></h1>
<!-- TMPL_IF NAME="message" --><div class="problem">
<!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="MESSAGE1" --><div class="problem">Branch saved</div><!-- /TMPL_IF -->
@@ -103,7 +75,6 @@
<!-- TMPL_IF name="MESSAGE8" --><div class="problem">Category cannot be deleted because there are branches using that category.</div><!-- /TMPL_IF -->
<table>
- <caption><!-- TMPL_VAR name="head" --></caption>
<tr>
<th>Name</th>
<th>Code</th>
@@ -152,17 +123,10 @@
<!-- TMPL_VAR NAME="branchprinter" -->
</td>
<td>
- <form action="<!-- TMPL_VAR name=action -->" method="post">
- <input type="hidden" name="op" value="edit" />
- <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name=value escape="HTML" -->" />
- <input type="submit" value="Edit" />
- </form>
+ <a href="<!-- TMPL_VAR name=action -->?op=edit&branchcode=<!-- TMPL_VAR name=value escape="HTML" -->">Edit</a>
</td>
<td>
- <form action="<!-- TMPL_VAR name=action -->" method="post">
- <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name=value escape="HTML" -->" />
-<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->">
- <input type="hidden" name="op" value="delete" /><input type="submit" value="Delete" />
+ <a href="<!-- TMPL_VAR name=action -->?branchcode=<!-- TMPL_VAR name=value escape="HTML" -->&branchname=<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->&op=delete">Delete</a>
</form>
</td>
</tr>
Index: includes/intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v
retrieving revision 1.7.2.14
retrieving revision 1.7.2.15
diff -u -b -r1.7.2.14 -r1.7.2.15
--- includes/intranet.css 15 Nov 2006 15:48:05 -0000 1.7.2.14
+++ includes/intranet.css 15 Nov 2006 16:04:12 -0000 1.7.2.15
@@ -318,7 +318,3 @@
.lineSelected {
background-color:yellow;
}
-
-.term {
- background-color:yellow;
-}
More information about the Koha-cvs
mailing list