Merge branch 'edge'

Author: mlm55

datastore/apps/sra/static/sra/templates/directory-display.html

@@ -37,6 +37,15 @@ <h3>{{model.metadata['Title'].value}}</h3>
     </div>
     <p ng-if="model.display.curatedOrCommunity == 'community'" class='italic'> This dataset is not stable or permanent and might change.</p>
 
+    <div class="actions-box">
+        <a ng-if="model.metadata['external_data_link'].value" ng-href="{{model.metadata['external_data_link'].value}}" class="btn btn-info" target="_blank">
+            External Data Link
+        </a>
+        <a id="analysis-tool" ng-if="model.metadata['Analysis_tool'].value" ng-href="{{model.metadata['Analysis_tool'].value}}" class="btn btn-info" target="_blank">
+          Analysis tool
+        </a>
+    </div>
+
     <div class="actions-box">
         <button type="button" class="btn btn-primary" ng-click="metadataToggle()">
             {{model.display.showMoreButton}}
@@ -144,4 +153,4 @@ <h3>{{model.metadata['Title'].value}}</h3>
 
 <div>
     Displaying {{model.pagination.item_start}}-{{model.pagination.item_end}} of {{model.collection.total}} items
-</div>
+</div>

datastore/static/css/main.css

@@ -127,11 +127,6 @@ footer .nav > li > a:hover {
     word-wrap: break-word;
 }
 
-#data-commons-icon {
-    height: 50px;
-    margin-left: 5px;
-}
-
 .page-logo-title {
     font-size: 18px;
     padding-right: 15px;
@@ -140,6 +135,15 @@ footer .nav > li > a:hover {
     font-weight:normal;
 }
 
+.btn-primary {
+  background-color: #0971ab;
+}
+
+#data-commons-icon {
+  height: 50px;
+  margin-left: 5px;
+}
+
 #data-commons-heading {
     display: inline-block;
     width: 100%
@@ -164,6 +168,10 @@ footer .nav > li > a:hover {
     float: right;
 }
 
+#analysis-tool {
+    float: right;
+}
+
 #folder-metadata-display dt{
     float: left;
     clear: left;
@@ -184,4 +192,4 @@ footer .nav > li > a:hover {
     background-color: #e2e2e2;
     border: 1px solid #0971ab;
     padding: 4px;
-}
+}