http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #1 from Marc Véron <veron@veron.ch> --- Created attachment 27784 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27784&action=edit [Proof of concept] Bug 12162 - Add class="branchcode" to body tag to make OPAC CSS-styleable per branch This patch implements branch specific CSS for Opac Main page and OPAC Search. If the proof of concept works out, other Opac pages can be adapted. To test: Apply patch Edit system preference OPACUserCSS and insert something like /*Background for all branches*/ body { background-color: red; } /*Yellow background and pink border for branch with code CPL*/ body.CPL { background-color: yellow; border: 10px solid pink; } /*Green background and red border for branch with code FFL*/ body.FFL { background-color: green; border: 10px solid red; } Go to Opac. Switch between branches CPL and FFL, see how background color changes... -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 paxed <pasi.kallinen@pttk.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |pasi.kallinen@pttk.fi --- Comment #3 from paxed <pasi.kallinen@pttk.fi> --- Good idea, but perhaps it should be something like class="branch-FOO", just in case the branch short name FOO would match another css class. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #5 from Marc Véron <veron@veron.ch> --- Created attachment 27811 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27811&action=edit Bug 12162 - Add class="branchcode" to body tag to make OPAC CSS-styleable per branch This patch implements branch specific CSS for Opac Main page and OPAC Search. If the proof of concept works out, other Opac pages can be adapted. To test: Apply patch Edit system preference OPACUserCSS and insert something like /*Background for all branches*/ body { background-color: red; } /*Yellow background and pink border for branch with code CPL*/ body.branch-CPL { background-color: yellow; border: 10px solid pink; } /*Green background and red border for branch with code FFL*/ body.branch-FFL { background-color: green; border: 10px solid red; } Go to Opac. Switch between branches CPL and FFL, see how background color changes... Changes to previous patch: New version using branch-FOO as class name. Prog theme added for this proof of concept. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|oleonard@myacpl.org |veron@veron.ch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #7 from Marc Véron <veron@veron.ch> --- (In reply to paxed from comment #6)

Should this be "needs signoff"?

No, not yet. It's just a proof of concept (woudl appreciate tests, though). Many files are involved. So I think it would be good get it done in a short timeframe to prevent to much cases of "does not apply". And it should be done for bootstrap theme only, as prog theme is about to be depractated. Comments are welcome! -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #9 from paxed <pasi.kallinen@pttk.fi> --- Perhaps the body-tag should be generated in an include file, so it could be INCLUDEd or PROCESSed - like doc-head-open.inc and doc-head-close.inc are done. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #10 from Marc Véron <veron@veron.ch> --- (In reply to Katrin Fischer from comment #8)

(...) Additionally to the branchcode it would be nice to have the currently selected language. That would allow to trigger the visibility of text with CSS, while you have to use jQuery to do that right now.

We have already a language indicator in the html tag: lang="de-DE" This makes it possible to youse the :lang selector in your CSS. Example: body:lang(de-DE) {background-color: green;} -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27811|0 |1 is obsolete| | --- Comment #12 from Marc Véron <veron@veron.ch> --- Comment on attachment 27811 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27811 Bug 12162 - Add class="branchcode" to body tag to make OPAC CSS-styleable per branch Proof of concept obsoleted. New patch will follow. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl --- Comment #14 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- I like the idea, but it seems to be a problem with translation. See coding guidelines: HTML1: Template Toolkit markup inside HTML. When can we override this rule? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #16 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Marc Véron from comment #15)

Hi Marcel,

Thanks for the comment. I was not aware of the translation restriction.

What do you think about the following:

[% IF ( LoginBranchcode ) %] <body id="opac-main" class="branch-[%LoginBranchcode%]"> [% ELSE %] <body id="opac-main" class="branch-default"> [% END %]

Marc

You still have the branchcode var in a html tag. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #18 from Marc Véron <veron@veron.ch> --- The coding guidlines say: "Avoid [% IF %] inside tags because the translation tools try to read the templates as straight HTML and most TT comments inside tags probably confuse/break them." I will create a new patch for testing translation with the code from comment #15. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #19 from Marc Véron <veron@veron.ch> --- Created attachment 30536 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30536&action=edit Bug 12162 Add class="branchcode" to body tag to make OPAC CSS-styleable per branch New proof of concept, for testing translations, with if-construct outside of html tags. However, one var is inside. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #20 from Marc Véron <veron@veron.ch> --- Created attachment 30537 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30537&action=edit Bug 12162 Add class="branchcode" to body tag to make OPAC CSS-styleable per branch New proof of concept, for testing translations, with if-construct outside of html tags. However, one var is inside. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #22 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Marc Véron from comment #21)

The translation seems to work. I would appreciate if somebody could confirm.

I tested: [% IF ( branchFFL ) %] <body id="opac-main" class="[% branchFFL %]"> [% ELSE %] <body id="opac-main" class="default"> [% END %] And confirm that it works (tested under a 3.14.x) when translating. Although I am not sure if it is the most elegant way to address the problem? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #24 from paxed <pasi.kallinen@pttk.fi> --- (In reply to Marc Véron from comment #23)

Paxed proposed in comment #9 to work with an include similar to koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc ( BTW:I see there an if-else construct inside a html-tag? )

But the most of the .tt files have an individual ID inside the body tag, like en/modules/opac-addbybiblionumber.tt:<body id="addtolist" class="popup">

Any hint for an alternative to my solution is welcome :-)

Both PROCESS and INCLUDE allow for parameters, so perhaps something like [% PROCESS bodytag.inc bodyid="addtolist" %] and then use the bodyid variable as the id... -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #25 from Marc Véron <veron@veron.ch> --- Created attachment 30606 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30606&action=edit Bug 12162 - Add class="branchcode" to body tag to make OPAC CSS-styleable per branch This patch is still a proof of concept for testing. I followed paxed's hints. New: Include file for the head tag. It can handle different situations (head width additional class like scrollto, head wit and without id). For the test, the include is inserted in opac-main.tt and opac-user.tt If not logged in, opac-main.pl displays: <body ID="opac-main" class="branch-default" > If logged in at branch FFL, it displays: <body ID="opac-main" class="branch-FFL" > If you log in, opac-user.pl should display <body ID="opac-user" class="branch-FFL scrollto" > Comments are welcome... -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@biblibre.co | |m --- Comment #27 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- For some reason, this patch does not pass the QA tools script: FAIL koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt OK forbidden patterns OK tt_valid FAIL valid_template bodytag.inc: not found FAIL koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt OK forbidden patterns OK tt_valid FAIL valid_template bodytag.inc: not found My first idea here is that the qa tools script is still looking in prog for the include file instead of bootstrap. So it could be a false negative. Will add Jonathan to the CC list of this report. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #29 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Marc Véron from comment #28)

I installed QA tools and found the following in QohA/File/Template.pm, sub check_valid_template: (...) $self->path =~ /opac-tmpl/ ? 'opac' : 'intranet'; $template_dir = File::Spec->rel2abs("koha-tmpl/${tmpl_type}-tmpl/prog/en/modules"); $include_dir = File::Spec->rel2abs("koha-tmpl/${tmpl_type}-tmpl/prog/en/includes"); (...)

For OPAC, only prog is tested, not bootstrap.

In this case, it is a false positive... ...and missing includes won't be failed for bootstrap.

Yeah, saw those lines too and copied Jonathan on this report. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #32 from Marc Véron <veron@veron.ch> --- Thanks for updating the QA scripts, Jonathan. The patch passes now with "OK" for all files. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #33 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 31803 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31803&action=edit [SIGNED OFF] Bug 12162 - Add class="branchcode" to body tag to make OPAC CSS-styleable per branch This patch adds a branch sepecific class to all OPAC pages. Example: If not logged in, opac-main.pl displays: <body ID="opac-main" class="branch-default" > If logged in at branch FFL, it displays: <body ID="opac-main" class="branch-FFL" > If you log in, opac-user.pl should display <body ID="opac-user" class="branch-FFL scrollto" > To test: 1) Apply patch. 2) Add to syspref OPACUserCSS something highly visible, e.g. for branch FFL: .branch-FFL { background-color: yellow; border: 10px solid red; } 3) Go to OPAC and login in with a user with home branch FFL 4) Verify that colors change as appropriate. 5) Log out. Verify that colors display as before or as defined in class branch-default in OPACUserCSS 6) Display patch in patch diff view, verify that ids and classes in body tag are consistent with params bodyid and bodyclass in INCLUDE line 7) Search for regressions Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 --- Comment #34 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Works as expected and passes QA scripts. I'm happy this patch adds a useful feature and works as tested. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31803|0 |1 is obsolete| | --- Comment #35 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 31807 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31807&action=edit Bug 12162 - Add class="branchcode" to body tag to make OPAC CSS-styleable per branch This patch adds a branch sepecific class to all OPAC pages. Example: If not logged in, opac-main.pl displays: <body ID="opac-main" class="branch-default" > If logged in at branch FFL, it displays: <body ID="opac-main" class="branch-FFL" > If you log in, opac-user.pl should display <body ID="opac-user" class="branch-FFL scrollto" > To test: 1) Apply patch. 2) Add to syspref OPACUserCSS something highly visible, e.g. for branch FFL: .branch-FFL { background-color: yellow; border: 10px solid red; } 3) Go to OPAC and login in with a user with home branch FFL 4) Verify that colors change as appropriate. 5) Log out. Verify that colors display as before or as defined in class branch-default in OPACUserCSS 6) Display patch in patch diff view, verify that ids and classes in body tag are consistent with params bodyid and bodyclass in INCLUDE line 7) Search for regressions Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12162 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |tomascohen@gmail.com --- Comment #36 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Patch pushed to master. Thanks Marc! -- You are receiving this mail because: You are watching all bug changes.