Merge pull request OBOFoundry#160 from jamesaoverton/sort-ont-table

Sort ontology list: Foundry, Library, Obsolete
pporrasebi · Nov 4, 2015 · 682a0f0 · 682a0f0
2 parents 818bfc2 + 3e731ac
commit 682a0f0
Show file tree

Hide file tree

Showing 8 changed files with 2,691 additions and 2,670 deletions.
diff --git a/_config.yml b/_config.yml
diff --git a/_includes/ontology_table.html b/_includes/ontology_table.html
@@ -1,9 +1,8 @@
 Download table as: [ <a href="/registry/ontologies.yml">YAML</a> | <a href="/registry/ontologies.jsonld">JSON-LD</a> | <a href="/registry/ontologies.ttl">RDF/Turtle</a>  ]
 <table class="table">
   <tbody>
-    {% assign sorted_ontologies = site.ontologies | sort: 'in_foundry_order', 'last'  %}
-    {% for ont in sorted_ontologies %}
-    <tr>
+    {% for ont in site.ontologies %}
+    <tr class="{% if ont.in_foundry_order %}foundry{% elsif ont.is_obsolete %}obsolete{% endif %}">
       <td>
          <a href="ontology/{{ ont.id }}.html" >
            {% if ont.is_obsolete %}

diff --git a/_includes/themes/bootstrap-3/default.html b/_includes/themes/bootstrap-3/default.html
@@ -19,7 +19,7 @@
     <link href="{{ ASSET_PATH }}/bootstrap/css/bs-sticky-footer.css" rel="stylesheet">
 
     <!-- Custom styles -->
-    <link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
+    <link href="/css/custom.css" rel="stylesheet" type="text/css" media="all">
 
     <style>
 @media (min-width: 768px) {

diff --git a/css/custom.css b/css/custom.css
@@ -0,0 +1,7 @@
+.foundry {
+  background-color: #f0fbff;
+}
+
+.obsolete {
+  background-color: #f6f6f6;
+}
diff --git a/registry/ontologies.jsonld b/registry/ontologies.jsonld
diff --git a/registry/ontologies.ttl b/registry/ontologies.ttl
diff --git a/registry/ontologies.yml b/registry/ontologies.yml
diff --git a/util/extract-metadata.py b/util/extract-metadata.py
@@ -87,17 +87,32 @@ def validate_structure(obj,md):
     return errs
 
 def concat_ont_yaml(args):
+    """
+    Given arguments with files and ouput,
+    read YAML files into an array, decorate the objects, and write an output YAML file.
+    Output will be Foundry ontologies first, Library ontologies second, and obsolete last.
+    Assumes that args.files is already sorted alphabetically.
+    """
     objs = []
+    foundry = []
+    library = []
+    obsolete = []
     cfg = {}
     if (args.include):
-        f = open(args.include, 'r') 
+        f = open(args.include, 'r')
         cfg = yaml.load(f.read())
     for fn in args.files:
         (obj, md) = load_md(fn)
-        objs.append(obj)
+        if 'is_obsolete' in obj and obj['is_obsolete'] == True:
+          obsolete.append(obj)
+        elif 'in_foundry_order' in obj:
+          foundry.append(obj)
+        else:
+          library.append(obj)
+    objs = foundry + library + obsolete
     cfg['ontologies'] = objs
     decorate_metadata(objs)
-    f = open(args.output, 'w') 
+    f = open(args.output, 'w')
     f.write(yaml.dump(cfg))
     return cfg