Skip to content

Commit

Permalink
Bootstrap 5 and partials changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Snicker7
Snicker7 committed Sep 13, 2022
1 parent 8f5d8a1 commit 3aaca48
Show file tree
Hide file tree
Showing 7 changed files with 508 additions and 515 deletions.
12 changes: 6 additions & 6 deletions templates/batchReport.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "layout.html" %}
{% extends "CRISPRessoReports/templates/layout.html" %}
{% block head %}
<style>
.nav-tabs.amp-header {
Expand Down Expand Up @@ -74,7 +74,7 @@ <h5>Nucleotide percentages around guides</h5>
<div class='card-body'>
{% for plot_name in window_nuc_pct_quilts %}
<h5>{{report_data['titles'][plot_name]}}</h5>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{% endfor %}
</div>
</div>
Expand All @@ -88,7 +88,7 @@ <h5>Nucleotide percentages in the entire amplicon</h5>
<div class='card-body'>
{% for plot_name in nuc_pct_quilts %}
<h5>{{report_data['titles'][plot_name]}}</h5>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{% endfor %}
</div>
</div>
Expand All @@ -102,7 +102,7 @@ <h5>Conversion of target bases around guides</h5>
<div class='card-body'>
{% for plot_name in window_nuc_conv_plots %}
<h5>{{report_data['titles'][plot_name]}}</h5>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{% endfor %}
</div>
</div>
Expand All @@ -116,7 +116,7 @@ <h5>Conversion of target bases in the entire amplicon</h5>
<div class='card-body'>
{% for plot_name in nuc_conv_plots %}
<h5>{{report_data['titles'][plot_name]}}</h5>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{% endfor %}
</div>
</div>
Expand All @@ -129,7 +129,7 @@ <h5>{{report_data['titles'][plot_name]}}</h5>
<h5>{{report_data['titles'][plot_name]}}</h5>
</div>
<div class='card-body'>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
</div>
</div>
{% endfor %}
Expand Down
25 changes: 10 additions & 15 deletions templates/layout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<meta name="description" content="CRISPResso2: Analysis of genome editing outcomes from deep sequencing data">
<meta name="author" content="Kendell Clement and Luca Pinello">
<link href='https://fonts.googleapis.com/css?family=Montserrat|Ranga:700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.3.5/jquery.fancybox.min.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css" integrity="sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==" crossorigin="anonymous" referrerpolicy="no-referrer" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.3.5/jquery.fancybox.min.css" />
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
<link rel="stylesheet" href="/static/css/main.css">

Expand Down Expand Up @@ -98,18 +97,14 @@
{% if messages %}
{% for category, message in messages %}
{% if category == "error" %}
<div class="alert alert-danger alert-dismissible fade show m-2" role="alert">
{{ message }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<div class="alert alert-danger alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% else %}
<div class="alert alert-warning alert-dismissible fade show m-2" role="alert">
{{ message }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<div class="alert alert-warning alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% endif %}
{% endfor %}
Expand All @@ -124,7 +119,7 @@
<div class="row pb-2">
<div class="col-sm-1"></div>
{% if current_user is defined %}
<div class="col-sm-3 crispresso_cup"> <a href='/'><img class='img-fluid' src="/static/imgs/CRISPResso_justcup.png" width="80%"></a>
<div class="col-sm-3 crispresso_cup"> <a href='/'><img class='img-fluid' src="../../../static/imgs/CRISPResso_justcup.png" width="80%"></a>
{% else %}
<div class="col-sm-3 crispresso_cup"> <a href='https://crispresso2.pinellolab.org'><img class='img-fluid' src="https://crispresso.pinellolab.partners.org/static/imgs/CRISPResso_justcup.png" width="80%"></a>
{% endif %}
Expand All @@ -143,7 +138,7 @@ <h3 style="margin-top: -0.5em;padding-right: 2em;">Analysis of genome editing ou
<nav class="navbar fixed-top navbar-expand-md bg-light navbar-light">
<!-- Brand -->
<a class="navbar-brand" href="/">
{# <img src="/static/imgs/CRISPResso_justcup.png" width="30" height="30" class="d-inline-block align-top" alt=""> #}
{# <img src="../../../static/imgs/CRISPResso_justcup.png" width="30" height="30" class="d-inline-block align-top" alt="" style="margin-left: 1em;"> #}
{# <span style="font-family:'Ranga'">CRISPResso2</span></a> #}
{{config['BANNER_TEXT']}}</a>

Expand All @@ -153,7 +148,7 @@ <h3 style="margin-top: -0.5em;padding-right: 2em;">Analysis of genome editing ou
</button>
<!-- Navbar links -->
<div class="collapse navbar-collapse" id="collapsibleNavbar">
<ul class="navbar-nav ml-auto">
<ul class="navbar-nav ms-auto">
{% if not current_user.is_anonymous %}
<li class="nav-item">
<a class="nav-link" href="{{url_for('home')}}">
Expand Down
12 changes: 6 additions & 6 deletions templates/multiReport.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "layout.html" %}
{% extends "CRISPRessoReports/templates/layout.html" %}
{% block head %}
<style>
.nav-tabs.amp-header {
Expand Down Expand Up @@ -73,7 +73,7 @@ <h5>Nucleotide percentages around guides</h5>
<div class='card-body'>
{% for plot_name in window_nuc_pct_quilts %}
<h5>{{report_data['titles'][plot_name]}}</h5>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{% endfor %}
</div>
</div>
Expand All @@ -87,7 +87,7 @@ <h5>Nucleotide percentages in the entire amplicon</h5>
<div class='card-body'>
{% for plot_name in nuc_pct_quilts %}
<h5>{{report_data['titles'][plot_name]}}</h5>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{% endfor %}
</div>
</div>
Expand All @@ -101,7 +101,7 @@ <h5>Conversion of target bases around guides</h5>
<div class='card-body'>
{% for plot_name in window_nuc_conv_plots %}
<h5>{{report_data['titles'][plot_name]}}</h5>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{% endfor %}
</div>
</div>
Expand All @@ -115,7 +115,7 @@ <h5>Conversion of target bases in the entire amplicon</h5>
<div class='card-body'>
{% for plot_name in nuc_conv_plots %}
<h5>{{report_data['titles'][plot_name]}}</h5>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{% endfor %}
</div>
</div>
Expand All @@ -128,7 +128,7 @@ <h5>{{report_data['titles'][plot_name]}}</h5>
<h5>{{report_data['titles'][plot_name]}}</h5>
</div>
<div class='card-body' style='max-height:80vh;overflow-y:auto'>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
</div>
</div>
{% endfor %}
Expand Down
4 changes: 2 additions & 2 deletions templates/pooledReport.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "layout.html" %}
{% extends "CRISPRessoReports/templates/layout.html" %}
{% block head %}
<style>
.nav-tabs.amp-header {
Expand Down Expand Up @@ -73,7 +73,7 @@ <h5>{{report_name}}</h5>
<h5>{{report_data['titles'][plot_name]}}</h5>
</div>
<div class='card-body' style='max-height:80vh;overflow-y:auto'>
{{ render_partial('shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
{{ render_partial('CRISPRessoReports/templates/shared/partials/fig_summaries.html', report_data=report_data, plot_name=plot_name) }}
</div>
</div>
{% endfor %}
Expand Down
Loading

0 comments on commit 3aaca48

Please sign in to comment.