From 3017f588ba7b9e78dd6d0fcd0f3c2f778f5a3411 Mon Sep 17 00:00:00 2001 From: Simon Diemert Date: Wed, 29 Jul 2015 15:49:21 -0700 Subject: [PATCH] finishing touches on links and element positions. --- assets/css/auxilary.css | 85 +++++++++++++++++++++---------------- lib/routes.js | 11 +++++ views/auth.hbs | 4 +- views/error.hbs | 2 +- views/partials/rightbar.hbs | 3 +- views/partials/topbar.hbs | 10 ++--- views/partials/welcome.hbs | 4 +- views/population-health.hbs | 18 ++++++++ 8 files changed, 90 insertions(+), 47 deletions(-) diff --git a/assets/css/auxilary.css b/assets/css/auxilary.css index 21b362e..1b7f90c 100644 --- a/assets/css/auxilary.css +++ b/assets/css/auxilary.css @@ -13,7 +13,7 @@ span { font-size: 16px; } -h1, h2, h3, h4, h5, h6{ +h1, h2, h3, h4, h5, h6 { font-weight: 200; } @@ -62,11 +62,11 @@ h1, h2, h3, h4, h5, h6{ display: inline-block; } -.login-wrapper{ - margin-left:auto; - margin-right:auto; - max-width:900px; - min-width:750px; +.login-wrapper { + margin-left: auto; + margin-right: auto; + max-width: 900px; + min-width: 750px; } .left-logo { @@ -86,20 +86,19 @@ h1, h2, h3, h4, h5, h6{ .login-row { margin-top: 10px; - width:100%; + width: 100%; background-color: #F0F0F0; border-radius: 5px; } .wrapper { - margin-left:auto; - margin-right:auto; - min-width:900px; - margin-top:10px; + margin-left: auto; + margin-right: auto; + min-width: 900px; + margin-top: 10px; } - .welcome-message { font-size: 36px; @@ -108,58 +107,72 @@ h1, h2, h3, h4, h5, h6{ } -.user-dropdown{ - margin-top:10px; +.user-dropdown { + margin-top: 10px; + text-align: right; +} + +.user-dropdown-item { + text-align: left; + +} + +#userDropdown { + min-width: 120px; + text-align: left; + } .initiative-title-wrap { - padding-left:0px; - margin-top:10px; + padding-left: 0px; + margin-top: 10px; } .initiative-logo-wrap { - padding-right:0; + padding-right: 0; opacity: 0.5; } -.initiative-logo-wrap:hover{ - opacity:1; +.initiative-logo-wrap:hover { + opacity: 1; } -.navbar-box > img{ - width:30px; - height:30px; +.navbar-box > img { + width: 30px; + height: 30px; } -.navbar-box{ - border-right:1px solid dimgray; - padding:10px; +.navbar-box { + border-right: 1px solid dimgray; + padding: 10px; text-align: center; } -.navbar-box:hover{ - background-color:#e6e6e6; +.navbar-box:hover { + background-color: #e6e6e6; } -.navbar-box > span{ - margin-top:1px; - margin-left:5px; +.navbar-box > span { + margin-top: 1px; + margin-left: 5px; text-decoration: none; - color:black; /** remove color from the hyperlinking */ + color: black; /** remove color from the hyperlinking */ } .navbar-outer { - margin-top:20px; - border:1px solid dimgray; + margin-top: 20px; + border: 1px solid dimgray; border-radius: 5px; } -.navbar-box.far-right{ +.navbar-box.far-right { - border-right:none; + border-right: none; } -svg { text-algin:center } +svg { + text-algin: center +} diff --git a/lib/routes.js b/lib/routes.js index b7224c8..b177b7a 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -41,6 +41,17 @@ function routes(next, data) { } ); + router.get("/amcare", + data.middleware.checkAuthentication, + function render(req, res) { + res.status(200); + return res.render('error', { + message : "AMCARE Export is currently not supported, we are working on it!", redirect:"/population-health" + } + ); + } + ); + router.get("/attachment", data.middleware.checkAuthentication, function render(req, res) { diff --git a/views/auth.hbs b/views/auth.hbs index dbf6fd5..1f4f008 100644 --- a/views/auth.hbs +++ b/views/auth.hbs @@ -44,7 +44,7 @@

If you have an account, please log in.

-

You can go to our website or contact +

You can go to our website or contact us for more information.

@@ -84,7 +84,7 @@
-

Forgot your username or password?

+

Forgot your username or password?

diff --git a/views/error.hbs b/views/error.hbs index eabfcef..8d44720 100644 --- a/views/error.hbs +++ b/views/error.hbs @@ -11,7 +11,7 @@

Opps, looks like there was an error! Sorry for the inconvenience.

-

It is likely that we do not have data for your account for this query.

+

It is likely that we do not have data for your account for this feature.


diff --git a/views/partials/rightbar.hbs b/views/partials/rightbar.hbs index c994899..a79ba14 100644 --- a/views/partials/rightbar.hbs +++ b/views/partials/rightbar.hbs @@ -4,7 +4,8 @@
-

+

+

diff --git a/views/partials/topbar.hbs b/views/partials/topbar.hbs index 8cad05a..a447d8c 100644 --- a/views/partials/topbar.hbs +++ b/views/partials/topbar.hbs @@ -3,17 +3,17 @@
-
+
-
+
-
+
-
diff --git a/views/partials/welcome.hbs b/views/partials/welcome.hbs index d14262c..9385872 100644 --- a/views/partials/welcome.hbs +++ b/views/partials/welcome.hbs @@ -4,7 +4,7 @@

Please click a link above to see your reports for the project(s) you are part of. For more information on how the Physicians Data Collaborative network follow the links below.

-

How to use this website

-

What is the PDC network

+

How to use this website

+

What is the PDC network

{{/if}} diff --git a/views/population-health.hbs b/views/population-health.hbs index 43c6eb6..7025fd3 100644 --- a/views/population-health.hbs +++ b/views/population-health.hbs @@ -131,6 +131,24 @@
+
+
+
+ +
+ +
+ +

The queries above can be exported to the AMCARE network. To get your AMCARE file for today, please click the button below then upload to AMCARE

+
+ + +
+ +
+ +
+