bugfix: make sure the relative link to the schema diagram PNG works in version/2.2

687d1d26 · Leo Gordon · 04164599 · 687d1d26 · 687d1d26 · 687d1d26
Commit 687d1d26 authored Jun 02, 2015 by Leo Gordon
Showing with 21 additions and 23 deletions

README.md README.md +1 -1

docs/hive_schema.hdr docs/hive_schema.hdr +0 -1

docs/hive_schema.html docs/hive_schema.html +19 -20

scripts/make_docs.pl scripts/make_docs.pl +1 -1

No files found.
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ etc.

 Available documentation
 -----------------------
-The main entry point is in [**docs/index.html**](https://rawgit.com/Ensembl/ensembl-hive/HEAD/docs/index.html) and can also be browsed offline.
+The main entry point is in [**docs/index.html**](https://rawgit.com/Ensembl/ensembl-hive/version/2.2/docs/index.html) and can also be browsed offline.

 Contact us (mailing list)
 -------------------------

--- a/docs/hive_schema.hdr
+++ b/docs/hive_schema.hdr

 <link rel="stylesheet" type="text/css" media="all" href="ehive_doc.css" />
-<base href="http://www.ensembl.org/"/>
 <script src="https://code.jquery.com/jquery-1.11.1.min.js"></script>

--- a/docs/hive_schema.html
+++ b/docs/hive_schema.html
@@ -3,15 +3,14 @@
 <head>

 <link rel="stylesheet" type="text/css" media="all" href="ehive_doc.css" />
-<base href="http://www.ensembl.org/"/>
 <script src="https://code.jquery.com/jquery-1.11.1.min.js"></script>

 <title>Schema Documentation</title>
 <meta name="order" content="2" />

 <script language="Javascript" type="text/javascript">
-  var img_plus   = '<img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/>';
-  var img_minus  = '<img src="/i/16/minus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="hide"/>';
+  var img_plus   = '<img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/>';
+  var img_minus  = '<img src="http://www.ensembl.org/i/16/minus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="hide"/>';

  // Function to show/hide the columns table
  function show_hide (param, a_text) {
@@ -175,7 +174,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_hive_meta" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('hive_meta','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -198,7 +197,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_pipeline_wide_parameters" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('pipeline_wide_parameters','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -221,7 +220,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_analysis_base" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('analysis_base','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -253,7 +252,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_analysis_stats" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('analysis_stats','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -294,7 +293,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_dataflow_rule" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('dataflow_rule','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -321,7 +320,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_analysis_ctrl_rule" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('analysis_ctrl_rule','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -350,7 +349,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_resource_class" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('resource_class','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -373,7 +372,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_resource_description" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('resource_description','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -404,7 +403,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_job" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('job','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -439,7 +438,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_job_file" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('job_file','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -465,7 +464,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_accu" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('accu','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -491,7 +490,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_analysis_data" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('analysis_data','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -520,7 +519,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_worker" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('worker','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -554,7 +553,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_role" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('role','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -588,7 +587,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_worker_resource_usage" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('worker_resource_usage','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -617,7 +616,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_log_message" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('log_message','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>
@@ -647,7 +646,7 @@ You can toggle the display of individual columns using [Show/Hide columns] butto
    <div style="float:right;text-align:right;padding:2px 1px">
  
  <a id="a_analysis_stats_monitor" class="help-header" style="cursor:pointer;font-weight:bold;border-radius:5px;background-color:#FFF;border:1px solid #667aa6;padding:1px 2px;margin-right:5px" onclick="show_hide('analysis_stats_monitor','columns')">
-    <img src="/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
+    <img src="http://www.ensembl.org/i/16/plus-button.png" style="width:12px;height:12px;position:relative;top:2px" alt="show"/> Show columns
  </a>
      <span style="margin-right:5px;border-right:1px solid #000"> </span> <a href="#top" style="text-decoration:none">[Back to top]</a>
    </div>

--- a/scripts/make_docs.pl
+++ b/scripts/make_docs.pl
@@ -33,7 +33,7 @@ sub generate_hive_schema_desc {

    my @cmds = (
        "perl $sql2html -i $ehrd/sql/tables.mysql -d Hive -intro $ehrd/docs/hive_schema.inc -sort_headers 0 -sort_tables 0 -o $ehrd/docs/tmp_hive_schema.html",
-        "(head -n 3 $ehrd/docs/tmp_hive_schema.html ; cat $ehrd/docs/hive_schema.hdr ; tail -n +4 $ehrd/docs/tmp_hive_schema.html) > $ehrd/docs/hive_schema.html",
+        "(head -n 3 $ehrd/docs/tmp_hive_schema.html ; cat $ehrd/docs/hive_schema.hdr ; tail -n +4 $ehrd/docs/tmp_hive_schema.html) | sed 's/\\/i\\/16\\//http:\\/\\/www.ensembl.org\\/i\\/16\\//' > $ehrd/docs/hive_schema.html",
        "rm $ehrd/docs/tmp_hive_schema.html",       # remove the non-patched version
    );