Bugzilla – Attachment 60521 Details for
Bug 12461
Add patron clubs feature
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12461 [QA Followup] - Changes based on Koha standard interface pattern
Bug-12461-QA-Followup---Changes-based-on-Koha-stan.patch (text/plain), 10.80 KB, created by
Kyle M Hall (khall)
on 2017-02-21 14:16:56 UTC
(
hide
)
Description:
Bug 12461 [QA Followup] - Changes based on Koha standard interface pattern
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2017-02-21 14:16:56 UTC
Size:
10.80 KB
patch
obsolete
>From 3224cdf4077fafcd786846181c855d29f79ebba3 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 21 Feb 2017 14:15:24 +0000 >Subject: [PATCH] Bug 12461 [QA Followup] - Changes based on Koha standard > interface pattern > >--- > .../intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt | 10 +++++----- > .../intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt | 2 +- > .../prog/en/modules/clubs/templates-add-modify.tt | 6 +++--- > koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt | 2 +- > 7 files changed, 15 insertions(+), 15 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >index 4bc5134..e7230bd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >@@ -122,7 +122,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" class="btn" value="Save" /> >+ <input type="submit" class="btn btn-default" value="Save" /> > <a href="clubs.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index 34fb75b..cd69780 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -83,7 +83,7 @@ > [% IF CAN_user_clubs_edit_templates %] > <div class="btn-toolbar"> > <div class="btn-group"> >- <a class="btn" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a> >+ <a class="btn btn-default" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a> > </div> > </div> > [% END %] >@@ -124,14 +124,14 @@ > <td>[% Branches.GetName( t.branchcode ) %]</td> > <td> > [% IF CAN_user_clubs_edit_templates %] >- <a class="btn" style="white-space:nowrap" href="templates-add-modify.pl?id=[% t.id %]"> >+ <a class="btn btn-default" style="white-space:nowrap" href="templates-add-modify.pl?id=[% t.id %]"> > <i class="fa fa-edit"></i> Edit > </a> > [% END %] > </td> > <td> > [% IF CAN_user_clubs_edit_templates %] >- <a class="btn" href="#" onclick='ConfirmDeleteTemplate([% t.id %], "[% t.name | html %]", $(this) ); return false;'> >+ <a class="btn btn-default" href="#" onclick='ConfirmDeleteTemplate([% t.id %], "[% t.name | html %]", $(this) ); return false;'> > <i class="fa fa-trash"></i> Delete > </a> > [% END %] >@@ -201,14 +201,14 @@ > <td>[% Branches.GetName( c.branchcode ) %]</td> > <td> > [% IF CAN_user_clubs_edit_clubs %] >- <a class="btn" style="white-space:nowrap" href="clubs-add-modify.pl?id=[% c.id %]"> >+ <a class="btn btn-default" style="white-space:nowrap" href="clubs-add-modify.pl?id=[% c.id %]"> > <i class="fa fa-edit"></i> Edit > </a> > [% END %] > </td> > <td> > [% IF CAN_user_clubs_edit_clubs %] >- <a class="btn" href="#" onclick='ConfirmDeleteClub([% c.id %], "[% c.name | html %]", $(this) ); return false;'> >+ <a class="btn btn-default" href="#" onclick='ConfirmDeleteClub([% c.id %], "[% c.name | html %]", $(this) ); return false;'> > <i class="fa fa-trash"></i> Delete > </a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >index 60ea541..30cb710 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >@@ -24,7 +24,7 @@ > <td>[% e.date_enrolled | $KohaDates %]</td> > [% IF CAN_user_clubs_enroll %] > <td> >- <a class="btn btn-mini" onclick="cancelEnrollment( [% e.id %] )"> >+ <a class="btn btn-xs" onclick="cancelEnrollment( [% e.id %] )"> > <i class="fa fa-remove"></i> Cancel > </a> > </td> >@@ -57,7 +57,7 @@ > <td>[% c.description %]</td> > [% IF CAN_user_clubs_enroll %] > <td> >- <a class="btn btn-mini" onclick="loadEnrollmentForm([% c.id %])"> >+ <a class="btn btn-xs" onclick="loadEnrollmentForm([% c.id %])"> > <i class="fa fa-plus"></i> Enroll > </a> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >index 9086451..25ee4ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >@@ -28,7 +28,7 @@ > [% END %] > > <li> >- <a href="#" class="btn" onclick="addEnrollment(); return false;"><i class="fa fa-plus"></i> Enroll</a> >+ <a href="#" class="btn btn-default" onclick="addEnrollment(); return false;"><i class="fa fa-plus"></i> Enroll</a> > <a href="#" onclick="showClubs(); return false;">Cancel</a> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >index 967c76e..b311ff4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >@@ -122,7 +122,7 @@ > [% END %] > </span> > <div class="btn-toolbar"> >- <a href="#" class="btn" onclick="$('#new-field-template').clone().attr('id','').show().appendTo('#club-template-fields'); return false;"> >+ <a href="#" class="btn btn-default" onclick="$('#new-field-template').clone().attr('id','').show().appendTo('#club-template-fields'); return false;"> > <i class="fa fa-plus"></i> Add new field > </a> > </div> >@@ -167,7 +167,7 @@ > [% END %] > </span> > <div class="btn-toolbar"> >- <a href="#" class="btn" onclick="$('#new-enrollment-field-template').clone().attr('id','').show().appendTo('#club-template-enrollment-fields'); return false;"> >+ <a href="#" class="btn btn-default" onclick="$('#new-enrollment-field-template').clone().attr('id','').show().appendTo('#club-template-enrollment-fields'); return false;"> > <i class="fa fa-plus"></i> Add new field > </a> > </div> >@@ -176,7 +176,7 @@ > > <fieldset class="action"> > <input type="hidden" name="id" value="[% club_template.id %]" /> >- <input type="submit" class="btn" value="Save" /> >+ <input type="submit" class="btn btn-default" value="Save" /> > <a href="clubs.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt >index 94baab0..76ed1fc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt >@@ -24,7 +24,7 @@ > <td>[% e.date_enrolled | $KohaDates %]</td> > [% IF e.club.club_template.is_enrollable_from_opac %] > <td> >- <a class="btn btn-mini" onclick="cancelEnrollment( [% e.id %] )"> >+ <a class="btn btn-xs" onclick="cancelEnrollment( [% e.id %] )"> > <i class="icon-remove"></i> Cancel > </a> > </td> >@@ -57,7 +57,7 @@ > <td>[% c.description %]</td> > <td> > [% IF !c.club_template.is_email_required || ( c.club_template.is_email_required && borrower.FirstValidEmailAddress ) %] >- <a class="btn btn-mini" onclick="loadEnrollmentForm([% c.id %])"> >+ <a class="btn btn-xs" onclick="loadEnrollmentForm([% c.id %])"> > <i class="icon-plus"></i> Enroll > </a> > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt >index 559abd8..6ea5094 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt >@@ -28,7 +28,7 @@ > [% END %] > > <li> >- <a href="#" class="btn" onclick="addEnrollment(); return false;"><i class="fa fa-plus"></i> Enroll</a> >+ <a href="#" class="btn btn-default" onclick="addEnrollment(); return false;"><i class="fa fa-plus"></i> Enroll</a> > <a href="#" onclick="showClubs(); return false;">Cancel</a> > </li> > </ol> >-- >2.1.4
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 12461
:
29105
|
30456
|
31567
|
35104
|
36098
|
36099
|
36192
|
38748
|
39181
|
43428
|
47821
|
47824
|
47825
|
47856
|
49110
|
49121
|
50422
|
50423
|
50426
|
50427
|
58818
|
58819
|
58820
|
59272
|
59273
|
60519
|
60520
|
60521
|
60610
|
60611
|
60612
|
60613
|
60614
|
60615
|
60616
|
60617
|
60618
|
60624
|
62778
|
62779
|
62813
|
62814
|
62815