Bug 16242

Summary: Move staff client JavaScript out of language directory
Product: Koha Reporter: Owen Leonard <oleonard>
Component: TemplatesAssignee: Owen Leonard <oleonard>
Status: CLOSED FIXED QA Contact: Testopia <testopia>
Severity: enhancement    
Priority: P5 - low CC: hector.hecaxmmx, katrin.fischer, kyle, testopia
Version: Main   
Hardware: All   
OS: All   
Change sponsored?: --- Patch complexity: Large patch
Documentation contact: Documentation submission:
Text to go in the release notes:
Version(s) released in:
Bug Depends on: 16241    
Bug Blocks: 21029, 21030    
Attachments: Bug 16242 - Move staff client JavaScript out of language directory
Bug 16242 - Move staff client JavaScript out of language directory
[SIGNED-OFF] Bug 16242 - Move staff client JavaScript out of language directory
Bug 16242 [Follow-up] Move staff client JavaScript out of language directory
Bug 16242 [Follow-up] Move staff client JavaScript out of language directory
[PASSED QA] Bug 16242 - Move staff client JavaScript out of language directory
[PASSED QA] Bug 16242 [Follow-up] Move staff client JavaScript out of language directory

Description Owen Leonard 2016-04-11 18:29:30 UTC
In the staff client, the prog/en/js directory doesn't need to be duplicated for each translation since JavaScript files are not translated. These files should be moved to prog/js.
Comment 1 Owen Leonard 2016-04-11 18:51:57 UTC Comment hidden (obsolete)
Comment 2 Owen Leonard 2016-04-12 18:15:18 UTC Comment hidden (obsolete)
Comment 3 Bernardo Gonzalez Kriegel 2016-04-20 16:34:14 UTC Comment hidden (obsolete)
Comment 4 Katrin Fischer 2016-04-25 10:42:33 UTC
Hi Owen,
I found a broken page:
koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt:<script type="text/javascript" src="[% interface %]/prog/en/js/offlinecirc.js"></script>

Can you please provide a follow-up?
Comment 5 Owen Leonard 2016-04-25 12:19:27 UTC Comment hidden (obsolete)
Comment 6 Héctor Eduardo Castro Avalos 2016-04-25 14:52:34 UTC
Hi Owen

Please rebase patches

Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 16242 - Move staff client JavaScript out of language directory
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".
Comment 7 Katrin Fischer 2016-04-25 15:04:29 UTC
Hi, did you apply the dependent bug first?
Comment 8 Héctor Eduardo Castro Avalos 2016-04-25 15:05:36 UTC
Ohh Uppss noup

Sorry for my mistake
Comment 9 Héctor Eduardo Castro Avalos 2016-04-25 15:15:39 UTC Comment hidden (obsolete)
Comment 10 Katrin Fischer 2016-04-25 17:09:52 UTC
Created attachment 50661 [details] [review]
[PASSED QA] Bug 16242 - Move staff client JavaScript out of language directory

This patch moves the JavaScript files in prog/en/js to prog/js.
JavaScript files do not need to be in the directory which is processed
by the translator.

To test, apply the patch and visit various pages in the staff client to
confirm that JavaScript files are still loading correctly.

Revised: I intended for this to be built on top of Bug 15883 as well as
Bug 16242. Now it is.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
On top of 15883 and 16241
All seems to work, js files pulled from new dir.
No errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Comment 11 Katrin Fischer 2016-04-25 17:10:23 UTC
Created attachment 50664 [details] [review]
[PASSED QA] Bug 16242 [Follow-up] Move staff client JavaScript out of language directory

Correcting to a file I missed: circ/offline.tt. This patch corrects the
path to offlinecirc.js.

To test, go to Circulation -> Built-in offline circulation interface.
There should be no errors in the console warning of missing files. The
"Check out" link should work correctly.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
File missed was fixed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Comment 12 Kyle M Hall 2016-04-29 14:34:07 UTC
Pushed to master for the 16.05 release. Thanks Owen!