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

Fix/compose page issues #36

Merged
merged 20 commits into from
Jun 21, 2019
Merged

Fix/compose page issues #36

merged 20 commits into from
Jun 21, 2019

Conversation

eheinrich
Copy link
Member

Things in this PR:

  • Added text to the compose page buttons, and removed their tooltips
  • Always set the acquire modes in the compose page, even for imagers. If a camera does not have any acquire modes, set to OFF.
  • Comments from Nikolaus- updated some help text, fixed a bug in how configdb compiles optical elements.
  • Worked through how bootstrap and javascript libraries are loaded in the django templates.
  • In the instrumentconfig, update the binning even when the readout mode code does not change to account for the case where two different modes have the same code, but different binnings.
  • Fix target lookup service, a leftover from the target type change.
  • Move ajax setup out of global entrypoint and into specific entry points where the setup is used. The jquery docs warned against the way we were doing it, and now the global bundle is a bit smaller.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.0008%) to 96.137% when pulling 528dc34 on fix/compose-page-issues into ef13db5 on master.

@coveralls
Copy link

coveralls commented Jun 20, 2019

Coverage Status

Coverage increased (+0.0008%) to 96.137% when pulling b0f4d32 on fix/compose-page-issues into ef13db5 on master.

@eheinrich eheinrich merged commit 31b2d37 into master Jun 21, 2019
@eheinrich eheinrich deleted the fix/compose-page-issues branch June 21, 2019 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants