Merge pull request #286 from AjitPS/master

alter api_url in genepage endpoint to use external/redirected URL
Rothamsted · Jul 23, 2018 · 9095ee0 · 9095ee0
2 parents c62aef9 + e3137f6
commit 9095ee0
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 6 deletions.
diff --git a/common/client-base/src/main/webapp/html/GeneView/summariseLegend.js b/common/client-base/src/main/webapp/html/GeneView/summariseLegend.js
@@ -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;
  }
 

diff --git a/common/client-base/src/main/webapp/html/image/reset_filter.png b/common/client-base/src/main/webapp/html/image/reset_filter.png
diff --git a/common/client-base/src/main/webapp/html/image/reset_filter_hover.png b/common/client-base/src/main/webapp/html/image/reset_filter_hover.png
diff --git a/common/client-base/src/main/webapp/html/image/reset_filter_hover_old.png b/common/client-base/src/main/webapp/html/image/reset_filter_hover_old.png
diff --git a/common/client-base/src/main/webapp/html/image/reset_filter_old.png b/common/client-base/src/main/webapp/html/image/reset_filter_old.png
diff --git a/common/client-base/src/main/webapp/html/javascript/utils.js b/common/client-base/src/main/webapp/html/javascript/utils.js
@@ -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">';

diff --git a/common/server-base/src/main/webapp/WEB-INF/views/genepage.jsp b/common/server-base/src/main/webapp/WEB-INF/views/genepage.jsp
@@ -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",

diff --git a/wheat/client/src/main/webapp/html/release.html b/wheat/client/src/main/webapp/html/release.html
@@ -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>