Bug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization
Summary: Add IDs to check-in message dialogs to facilitate CSS customization
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Circulation (show other bugs)
Version: 3.6
Hardware: All All
: P3 enhancement (vote)
Assignee: Chris Hall
QA Contact: Ian Walls
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-11-14 03:07 UTC by Chris Hall
Modified: 2013-12-05 19:57 UTC (History)
5 users (show)

See Also:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments
patch to add additional ids to message dialog's in returns.tt that did not already have an id (4.77 KB, patch)
2011-11-14 03:07 UTC, Chris Hall
Details | Diff | Splinter Review
patch against koha community master to add ids to return message dialogs (4.77 KB, patch)
2011-11-14 20:46 UTC, Chris Hall
Details | Diff | Splinter Review
Patch corrected to apply against current master (5.01 KB, patch)
2011-12-22 02:46 UTC, Chris Hall
Details | Diff | Splinter Review
Signed-off patch (5.14 KB, patch)
2011-12-29 18:53 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 7720 - Ambiguity in OPAC Details location - Followup - Add System Preference (8.08 KB, patch)
2012-03-16 16:59 UTC, Kyle M Hall
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Hall 2011-11-14 03:07:29 UTC Comment hidden (obsolete)
Comment 1 Owen Leonard 2011-11-14 13:40:31 UTC
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.
Comment 2 Owen Leonard 2011-11-14 13:46:17 UTC
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
Comment 3 Chris Hall 2011-11-14 19:56:19 UTC
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
Comment 4 Owen Leonard 2011-11-14 20:27:52 UTC
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.
Comment 5 Chris Hall 2011-11-14 20:46:09 UTC Comment hidden (obsolete)
Comment 6 Owen Leonard 2011-11-15 13:49:40 UTC
<<<<<<< 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?
Comment 7 Chris Cormack 2011-11-15 18:40:27 UTC
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.
Comment 8 Katrin Fischer 2011-12-21 06:37:59 UTC
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".
Comment 9 Chris Hall 2011-12-22 02:46:12 UTC Comment hidden (obsolete)
Comment 10 Owen Leonard 2011-12-29 18:53:16 UTC
Created attachment 6957 [details] [review]
Signed-off patch
Comment 11 Ian Walls 2012-01-05 13:30:35 UTC
Template only change, just adding IDs.  Easy to read, improves customizability.  Marking Passed QA
Comment 12 Paul Poulain 2012-01-06 14:54:18 UTC
patch pushed, please test
Comment 13 Kyle M Hall 2012-03-16 16:59:04 UTC Comment hidden (obsolete)