diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index fae5a96b..9781e036 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -37,7 +37,7 @@ jobs: run: | mkdir ../CRISPResso2_copy cp -r * ../CRISPResso2_copy - + - name: Copy C2_tests repo uses: actions/checkout@master with: diff --git a/CRISPResso2/CRISPRessoReports/README.md b/CRISPResso2/CRISPRessoReports/README.md index b31cff80..39487ca6 100644 --- a/CRISPResso2/CRISPRessoReports/README.md +++ b/CRISPResso2/CRISPRessoReports/README.md @@ -86,10 +86,16 @@ Also, note that the default commit message may have a summary of all commits, pl 1. In the parent repo, switch to (or create) the branch on `CRISPRessoReports` that will have the changes you push. -If you are creating a new branch based off of `CRISPRessoReports` master, run this: +If you are creating a new branch based off of `CRISPRessoReports` master, run this to switch to the reports master branch: ``` shell -git checkout -b -reports reports/master +git checkout reports/master +``` + +Then, run to actually create (and switch to) the branch that you will be working with: + +``` shell +git checkout -b -reports ``` Or if you would like to push to an existing branch on `CRISPRessoReports`, run this: @@ -106,6 +112,18 @@ git merge --squash -Xsubtree="CRISPResso2/CRISPRessoReports" --no-commit --allow *Note:* `` is the branch of the parent repo that contains the changes inside the `CRISPRessoReports` sub-directory. +3. Push to `CRISPRessoReports`. + +``` shell +git push +``` + +4. Switch back to your branch on `CRISPResso` or `C2Web`. + +``` shell +git checkout +``` + ### I am working on a feature that requires changing `CRISPRessoReports`, what do I do? If a feature that you are working on requires changes to CRISPRessoReports, you will need to perform a few steps to get setup. @@ -113,7 +131,7 @@ If a feature that you are working on requires changes to CRISPRessoReports, you 1. Create a feature branch in the parent repo, based on the parent repo master. ``` shell -git checkout -b origin/master +git checkout -b ``` 2. Create a feature branch on `CRISPRessoReports`. diff --git a/CRISPResso2/CRISPRessoReports/templates/batchReport.html b/CRISPResso2/CRISPRessoReports/templates/batchReport.html index 1255424c..49a6c9ea 100644 --- a/CRISPResso2/CRISPRessoReports/templates/batchReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/batchReport.html @@ -45,7 +45,6 @@ {% endblock %} {% block content %} -
diff --git a/CRISPResso2/CRISPRessoReports/templates/multiReport.html b/CRISPResso2/CRISPRessoReports/templates/multiReport.html index 10d30063..2831d9fc 100644 --- a/CRISPResso2/CRISPRessoReports/templates/multiReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/multiReport.html @@ -46,7 +46,7 @@ {% endblock %} {% block content %} - +
@@ -61,7 +61,7 @@
{{report_name}}
{% for run_name in run_names %} - {{run_name}} + {{run_name}} {% endfor %}
@@ -162,6 +162,7 @@
Summary Plots
{# column #}
+
{% endblock %} {% block foot %} diff --git a/CRISPResso2/CRISPRessoReports/templates/pooledReport.html b/CRISPResso2/CRISPRessoReports/templates/pooledReport.html index ba944d90..899f39c1 100644 --- a/CRISPResso2/CRISPRessoReports/templates/pooledReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/pooledReport.html @@ -44,7 +44,6 @@ {% endblock %} {% block content %} -
@@ -60,8 +59,8 @@
{{report_name}}
{% for region_name in run_names %} - {{region_name}} - {% endfor %} + {{region_name}} + {% endfor %}
diff --git a/CRISPResso2/CRISPRessoReports/templates/wgsReport.html b/CRISPResso2/CRISPRessoReports/templates/wgsReport.html index 5f2008a4..47ab9002 100644 --- a/CRISPResso2/CRISPRessoReports/templates/wgsReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/wgsReport.html @@ -45,7 +45,6 @@ {% endblock %} {% block content %} -
@@ -60,8 +59,8 @@
{{report_name}}
{% for region_name in run_names %} - {{region_name}} - {% endfor %} + {{region_name}} + {% endfor %}