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.

Sign up for GitHub

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

alter api_url in genepage endpoint to use external/redirected URL #286

Merged
merged 3 commits into from
Jul 23, 2018
Merged

alter api_url in genepage endpoint to use external/redirected URL #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41fcd16
alter api_url in genepage endpoint to use external/redirected URL cli…
Jul 23, 2018
f35460b
gene view filter legend tweaked
Jul 23, 2018
e3137f6
edit
Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions common/client-base/src/main/webapp/html/GeneView/summariseLegend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
}
}

// legend= legend + summaryText +'</div>' +'<input id="revertGeneView" type="button" value="Undo All" onclick="revertGeneViewTable(\''+GeneView_fullText.trim()+'\');" title= "Revert all filtering changes"></div>';
legend= legend + summaryText +'</div>';
legend= legend + summaryText + '<input id="revertGeneView" type="button" value="" class="unhover" title= "Revert all filtering/sorting changes">'+'</div>';
return legend;
}

Expand Down
Binary file modified common/client-base/src/main/webapp/html/image/reset_filter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified common/client-base/src/main/webapp/html/image/reset_filter_hover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/client-base/src/main/webapp/html/image/reset_filter_hover_old.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/client-base/src/main/webapp/html/image/reset_filter_old.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions common/client-base/src/main/webapp/html/javascript/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,8 +954,7 @@ var table = "";
table = table +'<br>';
// dynamic Evidence Summary to be displayed above Gene View table
// table = table + interactive_summary_Legend;
table = table + '<div id="evidence_Summary_Legend" class="evidenceSummary">'+ interactive_summary_Legend +
'<input id="revertGeneView" type="button" value="" class="unhover" title= "Revert all filtering/sorting changes">'+'</div>';
table = table + '<div id="evidence_Summary_Legend" class="evidenceSummary">'+ interactive_summary_Legend +'</div>';

table = table + '<div id= "geneViewTable" class = "scrollTable">';
table = table + '<table id = "tablesorter" class="tablesorter">';
Expand Down
3 changes: 2 additions & 1 deletion common/server-base/src/main/webapp/WEB-INF/views/genepage.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<div id="knetmap"></div>
<script type="text/javascript">
$.ajax({
url: "${apiUrl}/network",
//url: "${apiUrl}/network",
url: "http://knetminer.rothamsted.ac.uk/Wheat_api/network",
type: "post",
headers: {
"Accept": "application/json; charset=utf-8",
Expand Down
2 changes: 1 addition & 1 deletion wheat/client/src/main/webapp/html/release.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<div id="release-content">
<h1 class="release-title">Release Notes</h1>
<p id="network_stats">Wheat (<i>Triticum aestivum</i>) knowledge network is based on IWGSC RefSeq v1.0 genome annotation<!--version 1.0 of the chromosome survey sequence for Triticum aestivum cv. Chinese Spring generated by the International Wheat Genome Sequencing Consortium--> and contains:<!-- <strong>446,400 concepts</strong> and <strong>1,664,053 relations</strong>.--></p>
<p id="network_stats">The Wheat (<i>Triticum aestivum</i>) knowledge network is based on IWGSC RefSeq v1.0 genome annotation<!--version 1.0 of the chromosome survey sequence for Triticum aestivum cv. Chinese Spring generated by the International Wheat Genome Sequencing Consortium--> and contains:<!-- <strong>446,400 concepts</strong> and <strong>1,664,053 relations</strong>.--></p>

<hr>
<p id="knetminer-archived"><i>Old</i> KnetMiner Wheat (using <b>TGACv1.0</b> reference) archived and available: <strong><a href="http://knetminer.rothamsted.ac.uk/archive/Triticum_aestivum/" title="KnetMiner Wheat (archive)">HERE</a></strong>.</p>
Expand Down