From e77c9dc2a84588df80e9ee9cb5e4fdfd66082768 Mon Sep 17 00:00:00 2001
From: naelstrof <naelstrof@gmail.com>
Date: Fri, 18 Mar 2016 23:30:40 -0600
Subject: [PATCH] Some polish

---
 public/images/beaker.png      | Bin 248 -> 295 bytes
 public/scripts/get.js         |  22 +++++++++++++---------
 public/styles/application.css |  14 ++++++++++++++
 source/chemAPI.d              |  18 +++++++++++++++---
 views/get.dt                  |   4 +++-
 5 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/public/images/beaker.png b/public/images/beaker.png
index dab2f468d8d6b14adeda0ff4b3498e0463f57c31..047cd55645cb4662f74d63ba075d7c0532891fe9 100644
GIT binary patch
delta 268
zcmeytxSVN%N<CYWx4R1i82ohJT@Pe%7I;J!Gca%qgD@k*tT_@uLG}_)Usv`A%)-pv
zCi1fuECC8_@pN$vi8!46=l}oz^=*tSK0M4kZn6fi8UopStP-v;>KxJ7Wc7DmBM>Zf
zah{;zT%G4|Mc!C+i64i8^pf-4vAuTsO!dOqmKPNrcy|1l*%s))b3oMSur^E6PYFr?
z|Nr-E&FDAeiGBCw|Nqq!b}TI6XAE|0S*+u~_qV?>yFzq}Hp{04H>YWQnD4>xSu`pj
znRVLodxF_-{xkA3x&=iY4Rew5$x(FK#O#)R80w@g3=A*!_Zm$+Xnq6aV^3E<R+n{7
G2~7YhyJ0y1

delta 220
zcmV<203-jW0{8)tB!9n2L_t(og=6%|EMyo+z%-z?k2+w~0izBWb-<_t7#J8>h*7j9
zsPY&C0|P^=q39E0)K{N>EyKXTz~Hm4-HMP}qCx=KAU9#`YTSeom{`jh7>Eo3V!*Dq
z<mscD1CT?edLSG?mk>B!TNLItt#8%w+M+OYx%z2+t6=N_2~~l{EF?!ka}7-#fMO96
zKn{T|dtMW59?1@<pVqeun<Iv72r!b;D&9h*&xkFANOk}%z<^gqqYfB#z^DTT+yMYX
WCphrsLAiwh0000<MNUMnLSTX%l3T?9

diff --git a/public/scripts/get.js b/public/scripts/get.js
index 9bf80cf..0be71f3 100644
--- a/public/scripts/get.js
+++ b/public/scripts/get.js
@@ -20,8 +20,10 @@ $(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" ) {
@@ -29,15 +31,17 @@ $(document).ready(function() {
         } 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
index 066e414..85f62e0 100644
--- 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
index 87bc3d3..a6d95c7 100644
--- a/source/chemAPI.d
+++ b/source/chemAPI.d
@@ -57,7 +57,13 @@ 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 ) {
@@ -65,7 +71,13 @@ class ChemAPI : IChemAPI {
             }
             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
index 67ec770..0eabc20 100644
--- 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