From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Mon, 13 Jan 2014 14:05:51 +0000 (+0000)
Subject: Merge branch 'JAL-1422_srs' into Release_2_8_Branch
X-Git-Tag: Release_2_8_0b1~1^2~21^2
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=fe76692596c7d98452e2c93bcd934cb8c0dbf5b5

Merge branch 'JAL-1422_srs' into Release_2_8_Branch

Conflicts:
	examples/linkedapplets_ng.html
---

fe76692596c7d98452e2c93bcd934cb8c0dbf5b5
diff --cc examples/embeddedWJmol.html
index 24f7406,a3a7c3d..af15654
--- a/examples/embeddedWJmol.html
+++ b/examples/embeddedWJmol.html
@@@ -106,10 -101,9 +106,10 @@@ function genHref(
    ,
    linkLabel_2 : "Uniprot"
    ,
-   linkUrl_2 : "http://us.expasy.org/cgi-bin/niceprot.pl?$SEQUENCE_ID$",
+   linkUrl_2 : "http://www.uniprot.org/uniprot/$SEQUENCE_ID$",
    APPLICATION_URL : "http://www.jalview.org/services/launchApp",
 -  PDBfile : "1gaq.txt FER1_MAIZE"
 +  PDBfile : "1gaq.txt FER1_MAIZE",
 +  permissions : "sandbox"
   };
   jmolSetCallback("hoverCallback","_jmolhover");
    jmolSetCallback("pickCallback","_jmolpick");
diff --cc examples/linkedapplets_ng.html
index ef43184,3418068..c36f649
--- a/examples/linkedapplets_ng.html
+++ b/examples/linkedapplets_ng.html
@@@ -200,15 -196,12 +200,13 @@@ document.onclick = mclose
      embedded : "true",
      showFullId : "false",
      RGB : "F2F2FF",
-     linkLabel_1 : "SRS",
-     linkUrl_1 : "http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[uniprot-all:$SEQUENCE_ID$]+-vn+2"
-  
+     linkLabel_1 : "EMBL-EBI Search",
+     linkUrl_1 : "http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"
      ,
      linkLabel_2 : "Uniprot"
-  
      ,
-     linkUrl_2 : "http://us.expasy.org/cgi-bin/niceprot.pl?$SEQUENCE_ID$",
 +    permissions : 'sandbox',
+     linkUrl_2 : "http://www.uniprot.org/uniprot/$SEQUENCE_ID$",
      APPLICATION_URL : "http://www.jalview.org/services/launchApp"
    };
   
@@@ -235,16 -228,13 +233,14 @@@
      embedded : "true",
      showFullId : "false",
      RGB : "F2F2FF",
-     linkLabel_1 : "SRS",
-     linkUrl_1 : "http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[uniprot-all:$SEQUENCE_ID$]+-vn+2"
-  
+     linkLabel_1 : "EMBL-EBI Search",
+     linkUrl_1 : "http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"
      ,
      linkLabel_2 : "Uniprot"
-  
      ,
-     linkUrl_2 : "http://us.expasy.org/cgi-bin/niceprot.pl?$SEQUENCE_ID$",
 +    permissions : 'sandbox',
-     APPLICATION_URL : "http://www.jalview.org/services/launchApp"
+     linkUrl_2 : "http://www.uniprot.org/uniprot/$SEQUENCE_ID$",
+    APPLICATION_URL : "http://www.jalview.org/services/launchApp"
    };
    deployJava.runApplet(attributes, parameters, '1.6');
  </script>