view grant link

core · Jun 8, 2016 · ea0e451 · ea0e451
1 parent 988105e
commit ea0e451
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/src/cljs/ulysses/components/misc.cljs b/src/cljs/ulysses/components/misc.cljs
@@ -1,6 +1,6 @@
 (ns ulysses.components.misc
   (:require [ulysses.utils :refer [classes mechanism-to-contextual]]
-            [ulysses.components.basic :refer [label tooltip]]
+            [ulysses.components.basic :refer [link label tooltip]]
             [ulysses.lib.moment :as m]))
 
 ;; ----------------------------------------------------------------------------
@@ -18,10 +18,12 @@
   [label (-> name keyword mechanism-to-contextual) name])
 
 (defn grant-op-meta
-  [{:keys [funding-mechanism due-date]}]
+  [{:keys [funding-mechanism due-date url]}]
   [:div.grant-op-meta
     [grant-op-fm-label funding-mechanism]
-    [grant-op-time-left-label due-date]])
+    [grant-op-time-left-label due-date]
+    [link url {:target "_blank"}
+      [label :default "view grant"]]])
 
 ;; ----------------------------------------------------------------------------
 ;; modal dialog

diff --git a/src/cljs/ulysses/pages/builder.cljs b/src/cljs/ulysses/pages/builder.cljs
@@ -72,6 +72,14 @@
     [:h4 title]
     (into [:div] body)])
 
+(defn sidebar-slider-section
+  [filters title filter-name]
+  [sidebar-section
+    title
+    [metric-slider
+      filter-name
+      filters]])
+
 (defn sidebar
   [faculty-titles filters]
   [:div.builder-panel-sidebar
@@ -85,31 +93,26 @@
       "Years at UConn"
       [faculty-years-uconn
         filters]]
-    [sidebar-section
+    [sidebar-slider-section
+      filters
       "Publication Count"
-      [metric-slider
-        :publicationCount
-        filters]]
-    [sidebar-section
+      :publicationCount]
+    [sidebar-slider-section
+      filters
       "Grant Count"
-      [metric-slider
-        :grantCount
-        filters]]
-    [sidebar-section
+      :grantCount]
+    [sidebar-slider-section
+      filters
       "Grant Funds"
-      [metric-slider
-        :grantFunds
-        filters]]
-    [sidebar-section
+      :grantFunds]
+    [sidebar-slider-section
+      filters
       "Recent Grant Count"
-      [metric-slider
-        :recentGrantCount
-        filters]]
-    [sidebar-section
+      :recentGrantCount]
+    [sidebar-slider-section
+      filters
       "Recent Grant Funds"
-      [metric-slider
-        :recentGrantFunds
-        filters]]
+      :recentGrantFunds]
     [:br]])
 
 

diff --git a/src/sass/_common.scss b/src/sass/_common.scss
@@ -141,12 +141,8 @@ a.fancy-switch {
 .grant-op-meta {
   margin-bottom: 10px;
 
-  .label {
+  > .label {
     margin-right: 5px;
-
-    &:last-of-type {
-      margin-right: 0;
-    }
   }
 }