Summary: | Add IDs to check-in message dialogs to facilitate CSS customization | ||
---|---|---|---|
Product: | Koha | Reporter: | Chris Hall <chrish> |
Component: | Circulation | Assignee: | Chris Hall <chrish> |
Status: | CLOSED FIXED | QA Contact: | Ian Walls <koha.sekjal> |
Severity: | enhancement | ||
Priority: | P3 | CC: | chris, chrish, gmcharlt, paul.poulain |
Version: | 3.6 | ||
Hardware: | All | ||
OS: | All | ||
Change sponsored?: | --- | Patch complexity: | --- |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Circulation function: | |||
Attachments: |
patch to add additional ids to message dialog's in returns.tt that did not already have an id
patch against koha community master to add ids to return message dialogs Patch corrected to apply against current master Signed-off patch Bug 7720 - Ambiguity in OPAC Details location - Followup - Add System Preference |
Description
Chris Hall
2011-11-14 03:07:29 UTC
Comment hidden (obsolete)
I get a conflict when I try to apply this patch, either by git bz apply or git am -i3u. Viewing the conflict, it looks like there's an error in the changes made by this patch:
<<<<<<< HEAD
[% END %]
<div class="dialog message">
=======
[% END %]
<div id="hold-found1" class="dialog message">
>>>>>>> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151
This reverses the order of the [% END %] and the <div> which doesn't look correct.
Sorry, my description of the problem is clearly wrong, so pay no attention to that. The conflicts are there, however:
<<<<<<< HEAD
[% IF ( soundon ) %]
<audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
[% END %]
<div class="dialog message">
=======
[% IF ( soundon ) %]
<audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
[% END %]
<div id="hold-found2" class="dialog message">
>>>>>>> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151
Hey Owen
I did the patch against a different koha master to the koha community one (oops), so if there are any issues I can create a new patch.
However, isn't that conflict just a change in whitespace? unless I am missing something (which is a very real possibility).
<<<<<<< HEAD
[% IF ( soundon ) %]
<audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay"
autobuffer="autobuffer"></audio>
[% END %]
<div class="dialog message">
=======
[% IF ( soundon ) %]
<audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay"
autobuffer="autobuffer"></audio>
[% END %]
<div id="hold-found2" class="dialog message">
>>>>>>> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151
Would a patch conflict just because of whitespace? I don't know. But if the patch conflicts because it's not based on master then it should be resubmitted. Created attachment 6306 [details] [review] patch against koha community master to add ids to return message dialogs Yeah git will complain about a change in whitespace as it sees tabs and spaces as characters. Attached is patch against koha community master, hopefully this will make git happier :) <<<<<<< HEAD
[% IF ( soundon ) %]
<audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
[% END %]
<div class="dialog message">
=======
<div id="transfer-needed" class="dialog message">
>>>>>>> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151
Why does the patch remove the audio cues?
If you look at the patch, it doesn't. http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6306 doesn't even touch that line That is a git conflict. Not sure I get the problem from the comments above. Patch doesn't apply on master for me. Chris, can you perhaps fix and resubmit? Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: made appropriate changes so that user can customise the display of messages on the returns page as per wr87151 Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt Failed to merge in the changes. Patch failed at 0001 made appropriate changes so that user can customise the display of messages on the returns page as per wr87151 When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Created attachment 6918 [details] [review] Patch corrected to apply against current master The patch should now apply against master, and contains the bug number in its commit message :) Created attachment 6957 [details] [review] Signed-off patch Template only change, just adding IDs. Easy to read, improves customizability. Marking Passed QA patch pushed, please test Created attachment 8236 [details] [review] Bug 7720 - Ambiguity in OPAC Details location - Followup - Add System Preference This commit adds the system preference OpacLocationBranchToDisplay which allows a library to control whether to display the holding library, the home library, or both for the opac details page. |