Bugzilla – Attachment 51592 Details for
Bug 16511
Make contracts actions buttons
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16511: Making contracts actions buttons
Bug-16511-Making-contracts-actions-buttons.patch (text/plain), 5.43 KB, created by
Jonathan Druart
on 2016-05-18 13:26:08 UTC
(
hide
)
Description:
Bug 16511: Making contracts actions buttons
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-05-18 13:26:08 UTC
Size:
5.43 KB
patch
obsolete
>From 05f448c64e089c0a25ce98487e61d11636016ab8 Mon Sep 17 00:00:00 2001 >From: Aleisha <aleishaamohia@hotmail.com> >Date: Fri, 13 May 2016 00:46:40 +0000 >Subject: [PATCH] Bug 16511: Making contracts actions buttons > >To test: >1) Go to Acqui -> find a vendor >2) On Vendor details page (supplier.pl) confirm that Contracts table now > has one column called Actions >3) Confirm that Edit and Delete show as buttons >4) Confirm that buttons don't wrap on a narrower browser >5) Click Contracts tab >6) Confirm Actions column, Edit and Delete buttons, and button's don't > wrap > >Sponsored-by: Catalyst IT >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt | 11 ++++++----- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt | 8 +++++--- > 2 files changed, 11 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 2a62288..d36d789 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -117,7 +117,7 @@ function delete_contact(ev) { > $(document).ready(function() { > var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >- { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, >+ { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, > { "sType": "title-string", "aTargets" : [ "title-string" ] } > ], > 'sDom': 't' >@@ -369,8 +369,7 @@ function delete_contact(ev) { > <th scope="col">Description</th> > <th scope="col" class="title-string">Start date</th> > <th scope="col" class="title-string">End date</th> >- <th scope="col"> </th> >- <th scope="col"> </th> >+ <th scope="col">Actions</th> > </tr> > </thead> > <tbody> >@@ -382,8 +381,10 @@ function delete_contact(ev) { > <td>[% contract.contractdescription %]</td> > <td><span title="[% contract.contractstartdate %]">[% contract.contractstartdate | $KohaDates %]</span></td> > <td><span title="[% contract.contractenddate %]">[% contract.contractenddate | $KohaDates %]</span></td> >- <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]">Edit</a></td> >- <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]">Delete</a></td> >+ <td class="actions"> >+ <a class="btn btn-mini" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-mini" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]"><i class="fa fa-trash"></i> Delete</a> >+ </td> > </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index da8c08a..304688a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -181,7 +181,7 @@ function Check(ff) { > <th scope="col">Description</th> > <th scope="col">Start date</th> > <th scope="col">End date</th> >- <th scope="col" colspan="2"> </th> >+ <th scope="col">Actions</th> > </tr> > [% FOREACH loo IN loop %] > <tr> >@@ -191,8 +191,10 @@ function Check(ff) { > <td>[% loo.contractdescription %]</td> > <td>[% loo.contractstartdate %]</td> > <td>[% loo.contractenddate %]</td> >- <td><a href="[% loo.script_name %]?op=add_form&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]">Edit</a></td> >- <td><a href="[% loo.script_name %]?op=delete_confirm&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]">Delete</a></td> >+ <td class="actions"> >+ <a href="[% loo.script_name %]?op=add_form&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="[% loo.script_name %]?op=delete_confirm&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]" class="btn btn-mini"><i class="fa fa-trash"></i> Delete</a> >+ </td> > </tr> > [% END %] > </table> >-- >2.7.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16511
:
51461
|
51591
| 51592