Squashed 'CRISPResso2/CRISPRessoReports/' changes from e18807d..e9da7bf

e9da7bf Merge pull request #9 from edilytics/origin/master
599c2f1 Update sizing on graphs
df047ad Merge commit 'b8c11d51d65ab8e0cbe0a37cfd00389aa84edbf8' as 'CRISPRessoWEB/CRISPRessoReports'
00c56be Reset subtree
de11bc5 Merge pull request #8 from edilytics/web_report_refactor
3cc2269 Cup script and if htmls statement
2e743fb Add report_data object to render templates
7f76c1f Merge remote-tracking branch 'origin/master' into Reports_refactor
9c14ce8 Upgrade to python 3.9
c556218 Merge pull request #7 from edilytics/fig_name_fix
53e27eb Improved status page (#60)
0cede60 Don't add styles to the database if they already exist
577d4ec Add back in deleted report.html
8c2a19e Merge branch 'master' into Reports_refactor
c4fe8cc Add two prime editing parameters to web interface (#59)
28839fd Cole/bug fixes (#58)
72fa172 Spacing fix for empty page problem
a7472e4 Restore block statement
b0467bc Remove some page breaks
3c9be5f Increase the size of the center column when printing
1f92afd Working in docker
0ef612a Switch reports branch
b88b6b5 Squashed 'CRISPRessoWEB/CRISPRessoReports/' changes from 21f63d0..418d811
78c3153 Merge branch 'master' into Reports_refactor
bed7230 Merge pull request #53 from edilytics/updating-crispresso2-version
16e4f6f Updating Crispresso2 Version to avoid numpy float error
aa3c3a7 Merge branch 'master' into Reports_refactor
fe1a352 Merge pull request #43 from edilytics/fix-crispresso-cup
efea5d9 Merge pull request #36 from edilytics/admin-user
15a87dc https redirect fix (#50)
7640e7d Update README.md
d16f63e Fix README on running Docker using Apple Silicon (#48)
19786e0 Merge pull request #47 from edilytics/cole/readme-updates
521e750 Add details on how to build Docker image using Apple silicon
33befb7 Add more information about debugging and error locations
d64a52b Fix the CRISPResso cup animation to look more like an espresso
d373422 Semi-colon to README
fbfdfd5 Indentation and parenthesis
74a15b8 Squashed 'CRISPRessoWEB/CRISPRessoReports/' changes from ba01a8f..21f63d0
9f9c725 Merge commit '74a15b8616493514a9a7941c0255639f7f113a76' into Reports_refactor
62801bb Update README.md with git alias and subtree information
bb18a8e Replace tabs with spaces and reindent template files
b507c34 Clean up old files and comments
66e8892 Fix indentation and convert tabs to spaces in many templates
c0dd67c Add an authentication check before exposing server_files in submission.js
7c07fd0 Use string interpolation instead of concatenation in submission.js
16bfdbf Convert tabs to spaces in style_selection.html
a464a46 Reformat style in submit_routes.py and update docs
dac662b Remove jinja loader from report_routes
f05abfb Remove ALLOW_USER_STYLE_UPLOAD parameter
1754051 Format reset link display
222fa06 Make input labels in the forms the same width
a529c5e Fix Pooled layout
ebdf676 Fix the vertical span of the input labels in WGS, Pooled and Batch
6994eef Fix plot window size spacing in Pooled
d37d497 Fix hamburger menu and add -bs- to data-target and data-toggle
00c25e1 Increase size of Submit buttons
2cffa38 Add padding around pegRNA radio buttons and plot window size
96f2d51 Base editing partial
be69d9a Hide base editing if checkbox unchecked
70e01b9 Resize images and fix filepath
47580dc Replace spacing utilities classes with Bootstrap 5 versions
8f05200 Add spacing around body and footer tags
5a78175 Logout on password reset if logged in
112f70e Remove escape char
3595fa0 ResetPassword db table up and logic working
3f3ddc8 Final style fixes, color circles for style files
a988703 Fix for updating labels
904e724 Change style to styles
eaf65f1 Removing unecessary logic from submission_compare
90392b4 Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit ba01a8f
2a9a371 Merge commit '90392b44c4bf86da0940887f85401072f4190428' as 'CRISPRessoWEB/CRISPRessoReports'
e90a7d2 Add clipboard copy button to registration link flash message
4522110 Add messages for when the reset password link will expire
206d362 Add logic for correct grammar (referring to plural words) on admin index
710d01a Implement extra row action to reset a password for users in admin
36162b8 Extract reset password logic into standalone functions
d19bcd0 Update AWS EB instructions.docx
3154a5c Make users edittable from admin view and add ability to reset password

git-subtree-dir: CRISPResso2/CRISPRessoReports
git-subtree-split: e9da7bff794058e1fcdb3dc9ced79871c6a30e18

templates/layout.html

@@ -23,6 +23,7 @@
 
     <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
     <script src="https://cdn.plot.ly/plotly-2.11.1.min.js"></script>
+    <script src="/static/js/htmx-1.9.1.min.js"></script>
     <style>
       body {
         font-family: 'Montserrat', sans-serif !important;

templates/shared/partials/fig_reports.html

@@ -3,8 +3,10 @@
         {% if 'htmls' in report_data['figures'] and fig_name in report_data['figures']['htmls'][amplicon_name] %}
             {{report_data['figures']['htmls'][amplicon_name][fig_name]|safe}}
         {% else %}
-        {% if fig_name in ['plot_1a', 'plot_1b', 'plot_1c', 'plot_3a', 'plot_4a', 'plot_4b', 'plot_4c'] %}
+            {% if fig_name in ['plot_1a', 'plot_1b', 'plot_1c', 'plot_3a', 'plot_4a', 'plot_4b', 'plot_4c'] %}
             <a href="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][amplicon_name][fig_name]}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][amplicon_name][fig_name]}}.png" width='40%' height='40%' ></a>
+            {% elif fig_name in ['plot_10b', 'plot_10c'] %}
+            <a href="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][amplicon_name][fig_name]}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][amplicon_name][fig_name]}}.png" width='70%' height='70%' ></a>
             {% else %}
             <a href="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][amplicon_name][fig_name]}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][amplicon_name][fig_name]}}.png" width='100%' height='100%' ></a>
             {% endif %} 
@@ -19,6 +21,8 @@
         {% else %}
             {% if fig_name in ['plot_1a', 'plot_1b', 'plot_1c', 'plot_3a', 'plot_4a', 'plot_4b', 'plot_4c'] %}
             <a href="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][fig_name]}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][fig_name]}}.png" width='40%' height='40%' ></a>
+            {% elif fig_name in ['plot_10b', 'plot_10c'] %}
+            <a href="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][fig_name]}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][fig_name]}}.png" width='70%' height='70%' ></a>
             {% else %}
             <a href="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][fig_name]}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{report_data['figures']['locs'][fig_name]}}.png" width='100%' height='100%' ></a>
             {% endif %}        

templates/shared/partials/fig_summaries.html

@@ -1,11 +1,15 @@
-<div id="fig_summary_{{plot_name}}">
-    {% if report_data['htmls'][plot_name] %}
-        {{report_data['htmls'][plot_name]|safe}}
-    {% else %}
-        <a href="{{report_data['crispresso_data_path']}}{{plot_name}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{plot_name}}.png" width='70%'></a>
-    {% endif %}
-    <label class="labelpadding">{{report_data['labels'][plot_name]}}</label>
-    {% for (data_label,data_path) in report_data['datas'][plot_name] %}
-        <p class="m-0"><small>Data: <a href="{{report_data['crispresso_data_path']}}{{data_path}}">{{data_label}}</a></small></p>
-    {% endfor %}
-</div>
+<div id="fig_summary_{{plot_name}}">
+    {% if report_data['htmls'] and report_data['htmls'][plot_name]%}
+        {{report_data['htmls'][plot_name]|safe}}
+    {% else %}
+        {% if plot_name in ['Nucleotide_conversion_map', 'Nucleotide_percentage_quilt'] %}
+            <a href="{{report_data['crispresso_data_path']}}{{plot_name}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{plot_name}}.png" width='100%'></a>
+        {% else %}
+            <a href="{{report_data['crispresso_data_path']}}{{plot_name}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{plot_name}}.png" width='70%'></a>
+        {% endif %}
+    {% endif %}
+    <label class="labelpadding">{{report_data['labels'][plot_name]}}</label>
+    {% for (data_label,data_path) in report_data['datas'][plot_name] %}
+        <p class="m-0"><small>Data: <a href="{{report_data['crispresso_data_path']}}{{data_path}}">{{data_label}}</a></small></p>
+    {% endfor %}
+</div>