Some polish

naelstrof · Mar 19, 2016 · e77c9dc · e77c9dc
1 parent ce703ab
commit e77c9dc
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 13 deletions.
diff --git a/public/images/beaker.png b/public/images/beaker.png
diff --git a/public/scripts/get.js b/public/scripts/get.js
@@ -20,24 +20,28 @@ $(document).ready(function() {
         shape = r.set().
             push(ellipse).
             push(r.text(0, 30, node.label || node.id));
+        shape.translate( $("#content").width()/2, 300 );
         return shape;
     }
+    $('.beaker-image').css( "background-color", $('color').text() );
     $('edge').each( function( index ) {
         var strings = $(this).text().split(",");
         if ( $(this).attr("color_d") == "#333" ) {
             g.addNode( strings[1], { color : getRandomColor(), render : render } );
         } else {
             g.addNode( strings[1], { color : $(this).attr("color_d"), render : render } );
         }
-        if ( $(this).attr("color_s") == "#333" ) {
-            g.addNode( strings[0], { color : getRandomColor(), render : render } );
-        } else {
-            g.addNode( strings[0], { color : $(this).attr("color_s"), render : render } );
-        }
-        if ( $(this).attr("weight") != "1" ) {
-            g.addEdge( strings[1], strings[0], { directed: true, label: $(this).attr("weight") } );
-        } else {
-            g.addEdge( strings[1], strings[0], { directed: true } );
+        if ( strings[0] != strings[1] ) {
+            if ( $(this).attr("color_s") == "#333" ) {
+                g.addNode( strings[0], { color : getRandomColor(), render : render } );
+            } else {
+                g.addNode( strings[0], { color : $(this).attr("color_s"), render : render } );
+            }
+            if ( $(this).attr("weight") != "1" ) {
+                g.addEdge( strings[1], strings[0], { directed: true, label: $(this).attr("weight") } );
+            } else {
+                g.addEdge( strings[1], strings[0], { directed: true } );
+            }
         }
     } );
     for(e in g.edges) {

diff --git a/public/styles/application.css b/public/styles/application.css
@@ -38,6 +38,20 @@ svg {
     padding-top: 15px;
 }
 
+.beaker-image {
+    background: url(../images/beaker.png) left top;
+    display: block;
+    float: left;
+    margin-top: 5px;
+    width: 32px;
+    height: 32px;
+}
+
+.beaker-text {
+    display: block;
+    float: left;
+}
+
 .brand-image {
     background: url(../images/mixer.gif) left top;
     width: 32px;

diff --git a/source/chemAPI.d b/source/chemAPI.d
@@ -57,15 +57,27 @@ class ChemAPI : IChemAPI {
             }
             if ( reagents[id].object.keys.canFind( "parents" ) ) {
                 foreach( j ; reagents[id]["parents"].array ) {
-                    parents ~= `<a href="/reagent?id=` ~ reagents[j.str]["id"].str ~ `">` ~ reagents[j.str]["name"].str ~ `</a>`;
+                    string rname;
+                    if ( reagents[j.str].object.keys.canFind("name") ) {
+                        rname = reagents[j.str]["name"].str;
+                    } else {
+                        rname = reagents[j.str]["id"].str;
+                    }
+                    parents ~= `<a href="/reagent?id=` ~ reagents[j.str]["id"].str ~ `">` ~ rname ~ `</a>`;
                 }
             }
             if ( parents.length <= 0 ) {
                 parents ~= "None!";
             }
             if ( reagents[id].object.keys.canFind( "required_reagents" ) ) {
                 foreach( j ; reagents[id]["required_reagents"].object.keys ) {
-                    children ~= `<a href="/reagent?id=` ~ reagents[j]["id"].str ~ `">` ~ reagents[j]["name"].str ~ `</a>`;
+                    string rname;
+                    if ( reagents[j].object.keys.canFind("name") ) {
+                        rname = reagents[j]["name"].str;
+                    } else {
+                        rname = reagents[j]["id"].str;
+                    }
+                    children ~= `<a href="/reagent?id=` ~ reagents[j]["id"].str ~ `">` ~ rname ~ `</a>`;
                 }
             }
             if ( children.length <= 0 ) {
@@ -84,7 +96,7 @@ class ChemAPI : IChemAPI {
             children = ["Unknown"];
             color = "#FFF";
         }
-        render!("get.dt", html, name, description, parents, children );
+        render!("get.dt", html, name, description, parents, children, color );
     }
     void index() {
         render!("index.dt", sorted_reagents);

diff --git a/views/get.dt b/views/get.dt
@@ -1,7 +1,8 @@
 extends layout
 
 block body
-    h1!= name
+    .beaker-image
+    h1.beaker-name != name
     p!= description
     hr
     #canvas.canvas
@@ -18,6 +19,7 @@ block body
             - foreach( str ; parents )
                 tr
                     td!= str
+    color(hidden)!= color
     |!= html
 
 block after