From ecad301ec9a8316cc28c7639cd3773e3c20fd6d6 Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Tue, 17 Sep 2024 14:50:32 +0300 Subject: Refactor: Fix word for editor UI e.g commit to Save. --- gn2/wqflask/templates/gn_editor.html | 4 +-- gn2/wqflask/templates/gn_editor_commit.html | 8 +++--- gn2/wqflask/templates/gn_editor_results_page.html | 31 ++++++++++++----------- 3 files changed, 22 insertions(+), 21 deletions(-) (limited to 'gn2') diff --git a/gn2/wqflask/templates/gn_editor.html b/gn2/wqflask/templates/gn_editor.html index d89aaf0a..6f4685ac 100644 --- a/gn2/wqflask/templates/gn_editor.html +++ b/gn2/wqflask/templates/gn_editor.html @@ -29,10 +29,10 @@ hx-get="/editor/commit" hx-target="#output" hx-trigger="click" - hx-swap="innerHTML">Commit + hx-swap="innerHTML">Save
  • - Diff + Show Diff

  • - Commit your Changes + Save your Changes

    @@ -11,7 +11,7 @@

    @@ -24,9 +24,9 @@
    + class="btn btn-primary col-lg-3 col-lg-offset-1 col-sm-4 col-sm-offset-1">Save + class="btn col-lg-3 col-lg-offset-1 col-sm-4 col-sm-offset-1">Show Edit Diff

    diff --git a/gn2/wqflask/templates/gn_editor_results_page.html b/gn2/wqflask/templates/gn_editor_results_page.html index 6eaeb941..4f169a66 100644 --- a/gn2/wqflask/templates/gn_editor_results_page.html +++ b/gn2/wqflask/templates/gn_editor_results_page.html @@ -1,13 +1,5 @@
    -
    -
    -

    - Results status - {{ status }} -

    -
    -
    -
    {% if error %}

    Error-type: {{ error }} @@ -18,18 +10,27 @@

    {% else %}
    +
    +

    + Save results message: + + {% if status == '200' %} + Everything is up to date; No changes to Save + {% elif status == '201' %} + Saved your changes Successfully + {% else %} + {{ message }} + {% endif %} + +

    +
    +

    - New Commit Sha: + New Edit Sha: {{ commit_sha }}


    -
    -

    - Commit Message: - {{ message }} -

    -
    {% endif %}
    -- cgit v1.2.3 From 282e863fe4dbd1b382d0e3c00ee7d1aa4b7a296c Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Tue, 17 Sep 2024 15:00:04 +0300 Subject: Replace underscore with hyphen for gn docs url prefix. --- gn2/wqflask/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gn2') diff --git a/gn2/wqflask/__init__.py b/gn2/wqflask/__init__.py index d959598d..af386317 100644 --- a/gn2/wqflask/__init__.py +++ b/gn2/wqflask/__init__.py @@ -110,7 +110,7 @@ app.jinja_env.globals.update( # Registering blueprints -app.register_blueprint(gn_docs_blueprint, url_prefix="/gn_docs") +app.register_blueprint(gn_docs_blueprint, url_prefix="/gn-docs") app.register_blueprint(glossary_blueprint, url_prefix="/glossary") app.register_blueprint(references_blueprint, url_prefix="/references") app.register_blueprint(links_blueprint, url_prefix="/links") -- cgit v1.2.3 From 5c71ead0411b834b51bf084c147543208390c310 Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Tue, 17 Sep 2024 15:13:57 +0300 Subject: Refactor: remove hardcoded links and fix bug for path. --- gn2/wqflask/static/new/javascript/show_trait.js | 2 +- gn2/wqflask/templates/mapping_results.html | 10 +++++----- gn2/wqflask/templates/show_trait_calculate_correlations.html | 2 +- gn2/wqflask/templates/show_trait_statistics.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gn2') diff --git a/gn2/wqflask/static/new/javascript/show_trait.js b/gn2/wqflask/static/new/javascript/show_trait.js index edb2cfab..6d77e130 100644 --- a/gn2/wqflask/static/new/javascript/show_trait.js +++ b/gn2/wqflask/static/new/javascript/show_trait.js @@ -68,7 +68,7 @@ statTableRows.push( }, { vn: "interquartile", pretty: "Interquartile Range", - url: "http://www.genenetwork.org/glossary.html#Interquartile", + url: "{{ url_for('gn_docs_blueprint.glossary') }}#Interquartile", digits: 3 }, { vn: "skewness", diff --git a/gn2/wqflask/templates/mapping_results.html b/gn2/wqflask/templates/mapping_results.html index 2fed79c1..2b1660fd 100644 --- a/gn2/wqflask/templates/mapping_results.html +++ b/gn2/wqflask/templates/mapping_results.html @@ -116,7 +116,7 @@ -     + ? @@ -158,27 +158,27 @@
    {% if (mapping_method == "reaper" or mapping_method == "rqtl_geno") and nperm > 0 %} Permutation Test - + ?
    {% endif %} {% if mapping_method == "reaper" and nboot > 0 %} Bootstrap Test - + ?
    {% endif %} {% if mapping_method == "reaper" %} Allele Effects - + ?
    {% endif %} SNP Track - + ? * diff --git a/gn2/wqflask/templates/show_trait_calculate_correlations.html b/gn2/wqflask/templates/show_trait_calculate_correlations.html index d2e6624e..2f78a095 100644 --- a/gn2/wqflask/templates/show_trait_calculate_correlations.html +++ b/gn2/wqflask/templates/show_trait_calculate_correlations.html @@ -148,7 +148,7 @@ Semantic Gene Organizer     and human, rat, and mouse data from PubMed. Values are ranked by Lit r, but Sample r and Tissue r are also displayed.
    - More on using Lit r + More on using Lit r
    Tissue Correlation
    The Tissue Correlation (Tissue r) diff --git a/gn2/wqflask/templates/show_trait_statistics.html b/gn2/wqflask/templates/show_trait_statistics.html index 9ee0de5c..d16835e7 100644 --- a/gn2/wqflask/templates/show_trait_statistics.html +++ b/gn2/wqflask/templates/show_trait_statistics.html @@ -87,7 +87,7 @@
    More about Normal Probability Plots and more - about interpreting these plots from the glossary + about interpreting these plots from the glossary
    -- cgit v1.2.3