Merge branch 'apply-logo-and-styling' into 'develop'

apply initial logo and styling

See merge request FDM/rdm-system/rdms!20

hyrax/app/assets/stylesheets/theme.scss

+@import "bootstrap-sprockets";
+@import "bootstrap-default-overrides";
+@import "bootstrap";
+
+//---------- colours to be used --------
+$rub-blue: #17365c;
+$rub-green: #8dae10;
+$rub-grey-0: #f6f6f6;
+$rub-grey-1: white;
+
+$mdr-grey: #17365c;
+$mdr-black: #1E2022;
+
+//-------------- Fonts -----------------
+
+body {
+  background-color: $rub-grey-0;
+  color: $mdr-black;
+//  font-family: RUB-Neu Scala,Times,serif;
+//  font-size: 62.5%;
+  font-weight: normal;
+//  position: relative;
+}
+
+
+//-------------- Headings --------------
+h1, .h1 {
+  font-family: Montserrat,Meiryo,sans-serif;
+  font-size: 32px;
+}
+
+h2, .modal-title, .h2 {
+  font-family: Montserrat,Meiryo,sans-serif;
+  font-size: 20px;
+  color: $mdr-black;
+  font-weight: bold;
+}
+
+.work-title, .item-title, .collection-title {
+  font-family: Montserrat,Meiryo,sans-serif;
+  font-size: 28px;
+  font-weight: bold;
+  color: $mdr-black;
+}
+
+h3, .h3 {
+  font-family: Montserrat,Meiryo,sans-serif;
+  font-weight: bold;
+  font-size: 14px;
+  color: $mdr-black;
+}
+
+#content-wrapper > div.home-share-work.text-center > a {
+  background-color: $rub-blue;
+}
+
+#search-form-header > div > div > div > button.btn.btn-default.dropdown-toggle {
+  color: white;
+  background-color: $rub-blue;
+}
+
+//------------- anchor -----------------
+a, a:focus, a:hover, a:active {
+  color: white;
+}
+
+// --------------- buttons -------------
+.btn {
+  border-radius: 0px;
+}
+
+.btn-primary, .btn-primary:focus, .btn-primary:hover, .btn-primary:active
+{
+  background-color: $rub-blue;
+  border-color: $rub-blue;
+  color: white;
+  text-transform: uppercase;
+  font-weight: bold;
+  border-radius: 0px;
+}
+
+.btn-default, .btn-default:focus, .btn-default:hover, .btn-default:active,
+.btn-success, .btn-success:focus, .btn-success:hover, .btn-success:active {
+  background-color: $mdr-black;
+  border-color: $mdr-black;
+  color: white;
+  text-transform: uppercase;
+  border-radius: 0px;
+}
+
+a.btn-primary,
+a.btn-primary:focus,
+a.btn-primary:hover,
+a.btn-primary:active {
+  color: white;
+}
+
+.glyphicon-search {
+  color: white;
+}
+
+.facets-toggle, td.toggle input[type="submit"] {
+  border-radius: 0px;
+}
+
+// ------------- label -----------------
+.label {
+  border: none;
+  border-radius: 0em;
+}
+
+.label-title label {
+  font-size: 14px;
+}
+
+.label-row label {
+  color: #000000;
+  font-style: italic;
+}
+
+.status-labels {
+  padding: 15px 0;
+}
+
+.status-labels > span.label {
+  font-size: 14px;
+}
+
+// ------------- dropdown --------------
+#sort-dropdown .dropdown-toggle, #per_page-dropdown .dropdown-toggle {
+  color: white;
+}
+
+//-------------- Header ----------------
+
+// .recent-field-fluid > .navbar-header, .recent-field-fluid > .navbar-collapse {
+//    margin-top: 15px;
+// }
+
+#masthead > div > div.navbar-header > button {
+  background-color: #fff0;
+}
+
+#masthead {
+  background-color: $rub-blue;
+}
+
+.navbar-inverse .navbar-nav > li.dropdown > a {
+  color: white;
+  font-weight: bold;
+}
+
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+  color: white;
+}
+
+.navbar {
+  min-height: 80px;
+}
+
+.navbar + .navbar {
+  margin-top: 0px;
+}
+
+.navbar-brand {
+  height: 80px;
+}
+
+.navbar-right {
+  margin-top: 15px;
+}
+
+.navbar-inverse .navbar-nav > .active > a,
+.navbar-inverse .navbar-nav > .active > a:hover,
+
+// selected tab
+.navbar-inverse .navbar-nav > .active > a:focus {
+  color: #fff;
+  background-color: $rub-blue;
+  font-weight: bold;
+  border-bottom: 10px solid $rub-green;
+}
+
+// hovered tab
+.navbar-right > li > a:hover {
+  color: #fff;
+  background-color: $rub-blue;
+  border-bottom: 10px solid $rub-green;
+}
+
+nav.searchbar {
+  margin-bottom: 0px;
+  background-color: white;
+}
+
+.searchbar > .recent-field-fluid {
+  margin-bottom: 0px;
+}
+
+.searchbar-left {
+  padding-top: 15px;
+}
+
+.navbar-left {
+  // margin-top: 15px;
+  float: left !important;
+}
+
+//share you work button
+.btn btn-primary btn-lg {
+  background: $rub-blue;
+}
+
+.btn-lg, .btn-group-lg > .btn {
+  background-color: #FF0000;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.3333333;
+  border-radius: 6px;
+}
+
+
+// ------------- footer ----------------
+// Some lines taken from Hyrax's _variables.scss and _footer.scss.
+// Declaring these properties in advance to use a custom footer-height value.
+$footer-top-margin: 3 * $padding-small-vertical;
+$footer-height: 170px;
+
+body {
+  margin-bottom: $footer-height + $footer-top-margin;
+}
+
+.site-footer {
+  padding: 20px;
+  background-color: $rub-blue;
+  color: #fff;
+  position: absolute;
+  bottom: 0;
+  height: $footer-height;
+}
+
+@media (max-width: $screen-sm) {
+  body {
+    margin-bottom: 2 * $footer-height + $footer-top-margin;
+  }
+  .site-footer {
+    height: 2 * $footer-height;
+  }
+}
+
+.site-footer h2 {
+  margin: 0;
+  color: #fff;
+  font-weight: bold;
+}
+
+.site-footer a,
+.site-footer a:hover,
+.site-footer a:focus {
+  color: #fff;
+}
+
+#button-to-top {
+  background-color: #e6e4e4;
+  border: 0 !important;
+  color: #17365c;
+  display: inline-block;
+  font-weight: bold;
+  margin-top: -0.5em;
+  padding: 0.5em 1em 0.5em 1em;
+}
+
+#button-to-top:hover {
+  background-color: white;
+  border: 0 !important;
+  color: #17365c;
+  display: inline-block;
+  font-weight: bold;
+  margin-top: -0.5em;
+  padding: 0.5em 1em 0.5em 1em;
+}
+
+#button-to-top .arrow-up {
+  color: $rub-green;
+  font-family: RUB Nepo Icons;
+  font-size: 1.133em;
+}
+
+// ------------- homepage -----------------
+.homepage-icon {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+
+.homepage-row {
+  padding-bottom: 30px;
+}
+
+.homepage-row:first-child {
+  padding-top: 30px;
+}
+
+.homepage-row:nth-child(odd) {
+  background: $mdr-grey;
+}
+
+.homepage-row:nth-child(even) {
+  background: #FFF;
+}
+
+.home-recently-uploaded,
+.home-featured-works,
+.home-featured-researcher {
+  max-width: 80%;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.home-browse {
+  text-transform: uppercase;
+}
+
+//--------------- dashboard -----------
+body.dashboard {
+  padding-top: 80px;
+}
+
+//--------------- work show ------------
+.work-type-tag {
+  color: white;
+}
+
+//-------------- Search ----------------
+.facet-field-heading {
+  font-weight: normal;
+  font-size: 14px;
+}
+
+.facet_select {
+  color: $mdr-black;
+}
+
+.facet-values li .selected {
+  color: #FF0000;
+}
+
+.facet-values .remove {
+  color: #FF0000;
+}
+
+#search-submit-header {
+  color: white;
+  background-color: $rub-blue;
+}
+
+.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus  {
+  background-color: #a94442;
+}
+
+.panel-title > a.btn-default {
+  color: white;
+}
\ No newline at end of file

hyrax/app/views/_logo.html.erb

+<a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>">
+  <%= image_tag 'rublogo.png', style:'height: 50px;' %>
+</a>

hyrax/app/views/_masthead.html.erb

+<header>
+  <nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation">
+    <div class="container-fluid">
+      <!-- Brand and toggle get grouped for better mobile display -->
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <%= render '/logo' %>
+      </div>
+
+      <div class="collapse navbar-collapse" id="top-navbar-collapse">
+        <%= render '/user_util_links' %>
+      </div>
+    </div>
+  </nav>
+  <%= render '/searchbar' %>
+</header>

hyrax/app/views/_searchbar.html.erb

+<nav class="searchbar navbar navbar-default navbar-static-top" role="navigation">
+  <div class="container-fluid">
+    <div class="row">
+      <div class="searchbar-left navbar-left col-sm-7 col-sm-offset-2">
+        <%= render partial: 'catalog/search_form' %>
+      </div>
+    </div>
+  </div>
+</nav><!-- /.navbar -->

hyrax/app/views/_user_util_links.html.erb

+<ul id="user_utility_links" class="nav navbar-nav navbar-right">
+  <!-- Nav controls -->
+  <li <%= 'class=active' if current_page?(hyrax.root_path) %>>
+    <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
+  <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
+    <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
+  <li <%= 'class=active' if current_page?(hyrax.help_path) %>>
+    <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
+  <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
+    <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
+  <%= render 'shared/locale_picker' if available_translations.size > 1 %>
+
+  <% if user_signed_in? %>
+    <li>
+      <%= render_notifications(user: current_user) %>
+    </li>
+    <li class="dropdown">
+      <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false, controls: 'user-util-links' } do %>
+        <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
+        <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+        <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
+        <span class="fa fa-user" aria-hidden="true"></span>
+        <span class="caret"></span>
+      <% end %>
+      <ul id="user-util-links" class="dropdown-menu dropdown-menu-right" role="menu">
+        <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
+        <li class="divider"></li>
+        <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path%></li>
+      </ul>
+    </li><!-- /.btn-group -->
+  <% else %>
+    <li>
+      <%= link_to main_app.new_user_session_path do %>
+        <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
+      <% end %>
+    </li>
+  <% end %>
+</ul>

hyrax/app/views/layouts/homepage.html.erb

+<% content_for(:navbar) do %>
+<% end %>
+
+<% content_for(:precontainer_content) do %>
+  <%= render 'hyrax/homepage/announcement' if controller_name == 'homepage' %>
+<% end %>
+
+<%= render template: 'layouts/hyrax' %>

hyrax/app/views/layouts/hyrax/1_column.html.erb

+<% content_for(:navbar) do %>
+  <%#= render '/controls' %>
+<% end %>
+
+<%= render template: 'layouts/hyrax' %>

hyrax/app/views/shared/_footer.html.erb

+<footer class="site-footer">
+  <div class="row">
+    <div class="col-sm-4 text-left">
+      <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>">
+        <%= image_tag 'rublogo.png', style:'height: 50px;' %>
+      </a>
+    </div>
+    <div class="col-sm-2 text-left">
+      <strong>Ruhr-University Bochum</strong><br>
+      Universitätsstraße 150<br>
+      44801 Bochum<br>
+    </div>
+    <div class="col-sm-2 text-left">
+      <ul class="list-unstyled">
+        <li>
+          <a href="https://www.ruhr-uni-bochum.de/de/datenschutz">
+            Data Protection
+          </a>
+        </li>
+        <li>
+          <a href="https://www.ruhr-uni-bochum.de/de/impressum">
+            Imprint
+          </a>
+        </li>
+        <li>
+          <a href=#>
+            Terms of Usage
+          </a>
+        </li>
+      </ul>
+    </div>
+    <div class="col-sm-4 text-left">
+      <a href="#" id="button-to-top">
+        <font style="vertical-align: inherit;">
+          <font style="vertical-align: inherit;">
+            <strong>top of page</strong>
+          </font>
+        </font>
+        <span class="arrow-up">
+          <font style="vertical-align: inherit;">
+<!--            this symbol should be a 'y' character; but we need the RUB Nepo Icons from RUB. Using '⬆' in place.-->
+            <font style="vertical-align: inherit;">
+              ⬆
+            </font>
+          </font>
+        </span></a>
+    </div>
+  </div>
+</footer>
+

hyrax/config/locales/crc_dataset.en.yml

@@ -6,6 +6,9 @@ en:
       crc_dataset:
         description:        "CRC dataset works"
         name:               "CRC Dataset"
+    crc_datasets:
+      attribute_rows:
+        edit:               "Edit"
   simple_form:
     labels:
       dataset: