| Summary: | Use Font Awesome icons on audio alerts page | ||
|---|---|---|---|
| Product: | Koha | Reporter: | Owen Leonard <oleonard> |
| Component: | Templates | Assignee: | Owen Leonard <oleonard> |
| Status: | CLOSED FIXED | QA Contact: | Testopia <testopia> |
| Severity: | minor | ||
| Priority: | P5 - low | CC: | brendan, julian.maurice, mtompset, testopia, veron |
| Version: | Main | ||
| Hardware: | All | ||
| OS: | All | ||
| URL: | /cgi-bin/koha/admin/audio_alerts.pl | ||
| Change sponsored?: | --- | Patch complexity: | Trivial patch |
| Documentation contact: | Documentation submission: | ||
| Text to go in the release notes: | Version(s) released in: | ||
| Circulation function: | |||
| Bug Depends on: | 15886 | ||
| Bug Blocks: | 16080 | ||
| Attachments: |
Bug 16023 - Use Font Awesome icons on audio alerts page
Bug 16023 - Use Font Awesome icons on audio alerts page Bug 16023 - Use Font Awesome icons on audio alerts page Bug 16023 - Use Font Awesome icons on audio alerts page [PASSED QA] Bug 16023 - Use Font Awesome icons on audio alerts page |
||
|
Description
Owen Leonard
2016-03-09 14:57:23 UTC
Created attachment 48877 [details] [review] Bug 16023 - Use Font Awesome icons on audio alerts page The audio alerts management page uses Glyphicons in a few places. This patch replaces them with Font Awesome icons. To test, apply the patch for Bug 15886 if necessary and enable the AudioAlerts system preference. - Go to Administration -> Audio alerts - Confirm that icons for "Edit" and "Delete selected" look correct. - Edit an existing alert and confirm that the "play" button looks correct and works correctly. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 16023 - Use Font Awesome icons on audio alerts page fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 16023 - Use Font Awesome icons on audio alerts page The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-16023---Use-Font-Awesome-icons-on-audio-alerts-wqIpkQ.patch The dependency (Bug 15886) has been pushed to master, so this should apply with no extra steps. Created attachment 49180 [details] [review] Bug 16023 - Use Font Awesome icons on audio alerts page The audio alerts management page uses Glyphicons in a few places. This patch replaces them with Font Awesome icons. To test, apply the patch for Bug 15886 if necessary and enable the AudioAlerts system preference. - Go to Administration -> Audio alerts - Confirm that icons for "Edit" and "Delete selected" look correct. - Edit an existing alert and confirm that the "play" button looks correct and works correctly. Signed-off-by: Marc Véron <veron@veron.ch> Created attachment 49207 [details] [review] Bug 16023 - Use Font Awesome icons on audio alerts page The audio alerts management page uses Glyphicons in a few places. This patch replaces them with Font Awesome icons. To test, apply the patch for Bug 15886 if necessary and enable the AudioAlerts system preference. - Go to Administration -> Audio alerts - Confirm that icons for "Edit" and "Delete selected" look correct. - Edit an existing alert and confirm that the "play" button looks correct and works correctly. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Hi Jonathan, you switched the bug back to Needs Signoff - is that intended? Created attachment 49369 [details] [review] Bug 16023 - Use Font Awesome icons on audio alerts page The audio alerts management page uses Glyphicons in a few places. This patch replaces them with Font Awesome icons. To test, apply the patch for Bug 15886 if necessary and enable the AudioAlerts system preference. - Go to Administration -> Audio alerts - Confirm that icons for "Edit" and "Delete selected" look correct. - Edit an existing alert and confirm that the "play" button looks correct and works correctly. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> (In reply to Marc Véron from comment #6) > Hi Jonathan, you switched the bug back to Needs Signoff - is that intended? I don't know. But, it looks like it is fine to me, hence my sign off. Created attachment 49380 [details] [review] [PASSED QA] Bug 16023 - Use Font Awesome icons on audio alerts page The audio alerts management page uses Glyphicons in a few places. This patch replaces them with Font Awesome icons. To test, apply the patch for Bug 15886 if necessary and enable the AudioAlerts system preference. - Go to Administration -> Audio alerts - Confirm that icons for "Edit" and "Delete selected" look correct. - Edit an existing alert and confirm that the "play" button looks correct and works correctly. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Pushed to Master - Should be in the May 2016 release. Thanks! Patch pushed to 3.22.x, will be in 3.22.6 |