Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JavaScripts/CSS Integration and Cleanup #1520

Merged
merged 13 commits into from
Feb 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Changelog

**Added**

- #1520 JavaScripts/CSS Integration and Cleanup
- #1517 Integrate senaite.core.spotlight
- #1516 Consider analyses with result options or string in duplicate valid range
- #1515 Moved Setup View into Core
Expand Down
3 changes: 2 additions & 1 deletion bika/lims/browser/analysisrequest/templates/ar_add2.pt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<!-- AR Add form -->
<script type="text/javascript"
src="handlebars.js"
tal:attributes="src string:${portal/absolute_url}/++resource++bika.lims.js/thirdparty/handlebars/handlebars.js"></script>
tal:attributes="src string:${portal/absolute_url}/++resource++bika.lims.js/thirdparty/handlebars.min-v4.7.2.js"></script>

<script type="text/javascript"
src="bika.lims.analysisrequest.add.js"
tal:attributes="src string:${portal/absolute_url}/++resource++bika.lims.js/bika.lims.analysisrequest.add.js"></script>
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,10 @@
permission="zope2.View"
layer="bika.lims.interfaces.IBikaLIMS"/>

<!-- Register static directory for STATIC files-->
<browser:resourceDirectory
name="senaite.core.bootstrap.static"
directory="static"
layer="bika.lims.interfaces.IBikaLIMS"/>

</configure>
Loading