diff --git a/Dockerfile b/Dockerfile index e207a68b2..c1924d6b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ ENTRYPOINT ["bash","./docker-entrypoint.sh"] ADD https://github.com/CSCfi/rems/releases/download/v2.38.1/rems.jar /rems/rems.jar COPY config.edn.template /rems/config/config.edn.template -COPY example-theme/extra-styles.css /rems/example-theme/extra-styles.css -COPY theme/extra-translations/en.edn /rems/theme/extra-translations/en.edn +COPY theme/ /rems/theme + COPY docker-entrypoint.sh /rems/docker-entrypoint.sh RUN chmod 664 /opt/java/openjdk/lib/security/cacerts diff --git a/config.edn.template b/config.edn.template index 430686fcf..0ac6c3bb1 100644 --- a/config.edn.template +++ b/config.edn.template @@ -28,6 +28,6 @@ :extra-stylesheets {:root "./" :files ["/theme/styles.css"]} :smtp {:host "${SMTP_HOST}" :user "${SMTP_USER}" :pass "${SMTP_PASSWORD}" :port 587 :tls true} :mail-from "${SMTP_SENDER}" - ;; :theme-path "/rems/theme/theme.edn" - ;; :extra-pages-path "/rems/extra-pages" + :theme-path "/rems/theme/theme.edn" + :extra-pages-path "/rems/extra-pages" } \ No newline at end of file diff --git a/resources/translations/en.edn b/resources/translations/en.edn index 198d0f9c5..27240b08c 100644 --- a/resources/translations/en.edn +++ b/resources/translations/en.edn @@ -663,7 +663,7 @@ :unknown "There was a problem logging you in. Please check your identity provider."} :fake-text "" :fake-title "" - :intro [:div [:h1 "Welcome to REMS"] [:p "This is a demo environment for testing the REMS software. The demo environment has a couple of fictional datasets to which you can apply for access. More information is available on " [:a {:href "/extra-pages/about"} "About"] " page."]] + :intro [:div [:h1 "Dataset Permission Management"] [:p "REMS is a service for managing dataset permissions." [:a {:href "/extra-pages/about"} "About"] " page."]] :intro2 "" :login "Login" :oidc-text "" diff --git a/theme/extra-translations/en.edn b/theme/extra-translations/en.edn index 588ebcce3..418eb86d8 100644 --- a/theme/extra-translations/en.edn +++ b/theme/extra-translations/en.edn @@ -1 +1,5 @@ -{:t {:footer "Australian Cardiovascular disease Data Commons" }} \ No newline at end of file +{:t {:footer "Australian BioCommons" + :header {:title "BioCommons REMS"} + :login {:login [:img {:src "img/login.png" :height "50px"}] + :intro [:div [:h5 "Dataset Permission Management"] [:p "REMS is a service for managing dataset permissions."]] + :intro2 "" :text ""}}} \ No newline at end of file diff --git a/theme/public/img/login.png b/theme/public/img/login.png new file mode 100644 index 000000000..b8edb683a Binary files /dev/null and b/theme/public/img/login.png differ diff --git a/theme/public/img/logo_medium.png b/theme/public/img/logo_medium.png new file mode 100644 index 000000000..666a1daeb Binary files /dev/null and b/theme/public/img/logo_medium.png differ diff --git a/theme/public/img/logo_small.png b/theme/public/img/logo_small.png new file mode 100644 index 000000000..a541c1027 Binary files /dev/null and b/theme/public/img/logo_small.png differ diff --git a/theme/style.css b/theme/style.css new file mode 100644 index 000000000..0d0595705 --- /dev/null +++ b/theme/style.css @@ -0,0 +1,16 @@ +.logo { + margin-top: 50px; +} + +.login-btn { + max-height: initial !important; + padding: 0; + background-color: #fff; + border-color: #fff; + border-radius: 25px; +} + +.login-btn:hover { + background-color: #fff; + border-color: #fff; +} diff --git a/theme/theme.edn b/theme/theme.edn new file mode 100644 index 000000000..2e8527f37 --- /dev/null +++ b/theme/theme.edn @@ -0,0 +1,59 @@ +{;; This styling is from the original REMS project + ;; https://github.com/CSCfi/rems/blob/master/example-theme/theme.edn + :font-family "'Lato', sans-serif" + :color1 "#cbd0d5" + :color2 "#008278" + :color3 "#64727e" + :color4 "#830051" + :nav-color "#595959" + :nav-active-color "#830051" + + :alert-success-color "#3c763d" + :alert-success-bgcolor "#dff0d8" + :alert-success-bordercolor "#3c763d" + :text-success "#28a745!important" ; .text and .bg colors need !important to take hold + :bg-success "#28a745!important" + + :alert-danger-color "#a94442" + :alert-danger-bgcolor "#f2dede" + :alert-danger-bordercolor "#a94442" + :text-danger "#dc3545!important" + :bg-danger "#dc3545!important" + + :alert-warning-color "#8a6d3b" + :alert-warning-bgcolor "#fcf8e3" + :alert-warning-bordercolor "#8a6d3b" + :bg-warning "#ffc107!important" + + :alert-info-color "#31708f" + :alert-info-bgcolor "#d9edf7" + :alert-info-bordercolor "#31708f" + :text-info "#17a2b8!important" + :bg-info "#17a2b8!important" + + :img-path "/img/" + :logo-bgcolor nil + :logo-name-en "logo_medium.png" + :logo-name-sm-en "logo_small.png" + :logo-content-origin "initial" + + :navbar-logo-name "logo_small.png" + :navbar-logo-name-en "logo_small.png" + + :phase-color "#111" + :phase-bgcolor "#f8f8f8" + :phase-bgcolor-active "#e8e8e8" + :phase-bgcolor-completed "#dff0d8" + :collapse-bgcolor "#fff" + :collapse-heading-color "#008278" + :table-bgcolor "#f8f8f8" + :table-heading-color "#fff" + :table-heading-bgcolor "#008278" ;"#006778" ;"#006fb1"; "#008278" "#eef2f8" + :table-hover-bgcolor "#b7dddb"; "#eef2f8"; "#c9e2ae" ; "#f2f2f2" + :table-text-color "#111" + :header-border "4px solid #ccc" + :table-shadow "10px -12px 21px -14px rgba(0,0,0,0.75)" + :link-color "#025b96" + :footer-color "#595959" + :footer-bgcolor "#dfe1e3" + :button-navbar-font-weight 400} \ No newline at end of file