Merge pull request #89 from amywieliczka/es-banner

Es banner
amywieliczka · Apr 13, 2023 · a9feb5e · a9feb5e
2 parents 99dbf85 + ae20a7a
commit a9feb5e
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,6 @@ backstop_data/uilib/bitmaps_reference/
 backstop_data/ci_report/
 backstop_data/backstop_tests/prod-vs-local-as-prod-ui.js
 media_root/
-ucldc-*.zip
+deployments/ucldc-*.zip
 exhibits
 .pa11yci/screencaptures/
diff --git a/app/styles/_rikolti.scss b/app/styles/_rikolti.scss
@@ -0,0 +1,35 @@
+.rikolti-bar {
+    background-color: lightgray; 
+    position: fixed;
+    padding: 10px 20px !important;
+    z-index: 20;
+    width: 100%;
+}
+
+.rikolti-bar a {
+    color: #8A0E45;
+}
+
+.rikolti-highlight {
+    background-color: #8A0E45;
+    color: white;
+    margin-left: 10px;
+    border-radius: 0;
+    cursor: text;
+}
+.rikolti-highlight:hover {
+    color: white;
+    cursor: text;
+}
+
+.rikolti-btn {
+    margin-left: 10px; 
+    background-color: white; 
+    border-radius: 0; 
+    color: #8A0E45;
+}
+.rikolti-btn:hover{
+    background-color: white; 
+    color: #8A0E45;
+    border: 1px solid black;
+}
diff --git a/app/styles/main.scss b/app/styles/main.scss
@@ -19,6 +19,10 @@
 
 // @import "testing";
 
+// ***** Rikolti Nav Bar ***** //
+
+@import "rikolti";
+
 // ***** Elements ***** //
 
 @import "buttons";

diff --git a/calisphere/facet_filter_type.py b/calisphere/facet_filter_type.py
@@ -242,9 +242,12 @@ def repo_from_id(self, repo_id):
 
         parent = repo_details['campus']
         pslug = ''
+        pname = ''
         if len(parent):
-            pslug = '{0}-'.format(parent[0].get('slug', None))
+            pslug = f"{parent[0].get('slug', None)}-"
+            pname = f"{parent[0].get('name', '')} "
         repo['slug'] = pslug + repo_details.get('slug', None)
+        repo['name'] = pname + repo_details.get('name', None)
 
         return repo
 

diff --git a/calisphere/templates/calisphere/base.html b/calisphere/templates/calisphere/base.html
@@ -34,20 +34,31 @@
   </head>
   <body>
     {% if multiple_indexes %}
-    <div class="container-fluid" 
-         style="background-color: lightgray; padding: 10px 20px">
+    <div class="container-fluid rikolti-bar">
       <i class="fa fa-exclamation-circle"></i>
-      This is a development feature for <a href="https://github.com/ucldc/rikolti/wiki">Rikolti</a>, Calisphere's new harvesting infrastructure - Currently Viewing Results From: <b><i>{{ request.session.index }}</i></b>
+      This is a development feature for <a href="https://github.com/ucldc/rikolti/wiki">Rikolti</a>, Calisphere's new harvesting infrastructure.
+      <span class="btn rikolti-highlight">
+        Currently Viewing Results From: 
+        <b><i>
+          {% if request.session.index == "es" %}
+            New Index
+          {% else %}
+            Legacy index
+          {% endif %}
+        </i></b>
+      </span>
       <a 
         href="{% url 'calisphere:select_index' 'solr' %}?next={{ request.get_full_path }}" 
-        class="btn" 
-        style="border-color: black; margin-left: 10px;">Legacy Solr Index</a>
+        class="btn rikolti-btn">
+        View Legacy Index
+      </a>
       <a 
         href="{% url 'calisphere:select_index' 'es' %}?next={{ request.get_full_path }}" 
-        class="btn" 
-        style="border-color: black; margin-left: 10px;">New ElasticSearch Index</a>
-
+        class="btn rikolti-btn">
+        Preview New Index
+      </a>
     </div>
+    <div class="container-fluid"></div>
     {% endif %}
     <div class="container-fluid">
       <a href="#js-pageContent" class="skipnav">Skip to main content</a>

diff --git a/calisphere/templates/calisphere/collections/collectionView.html b/calisphere/templates/calisphere/collections/collectionView.html
@@ -58,7 +58,7 @@ <h2 class="collection-intro__institution-heading">Owning Institution{{ collectio
       {% if 'description' in collection %}
       <h3 class="collection-intro__about-heading">About this Collection</h3>
         <span class="collection-intro__about-description">
-          {{ collection.description|urlize }}
+          {{ collection.description|linebreaksbr|urlize }}
         </span>
       {% endif %}
       {% if collection.url_local|length > 0 %}

diff --git a/calisphere/templates/calisphere/institutionView.html b/calisphere/templates/calisphere/institutionView.html
@@ -27,7 +27,7 @@
   </nav>
 
   <h1 id="js-institution" {%if campus_slug%}data-campus="{{ campus_slug }}"{% else %}data-institution="{{ repository_id }}"{% endif %} data-referralName="{{ institution.name }}">
-    {{ institution.name }}
+    {% if uc_institution %}{{ uc_institution.0.name }} {% endif %}{{ institution.name }}
   </h1>
 {% endblock %}
 
@@ -102,7 +102,7 @@ <h2 class="institution-intro__heading" itemprop="name">{{ institution.name }} <b
       <div class="col-md-6">
         {% if contact_information.description %}
           <p class="institution-intro__description" itemprop="description">
-            {{ contact_information.description|urlize }}
+            {{ contact_information.description|linebreaksbr|urlize }}
             <!-- <a class="institution-intro__web-link" href="">Read More</a> -->
           </p>
         {% endif %}
@@ -142,7 +142,7 @@ <h2 class="institution-intro__heading" itemprop="name">{{ institution.name }}</h
       <div class="col-md-6">
         {% if contact_information.description %}
           <p class="institution-intro__description" itemprop="description">
-            {{ contact_information.description }}
+            {{ contact_information.description|linebreaksbr|urlize }}
             <!-- <a class="institution-intro__web-link" href="">Read More</a> -->
           </p>
         {% endif %}
@@ -174,7 +174,7 @@ <h2 class="institution-intro__heading" itemprop="name">{{ institution.name }}</h
       <div class="col-md-6">
         {% if contact_information.description %}
           <p class="institution-intro__description" itemprop="description">
-            {{ contact_information.description }}
+            {{ contact_information.description|linebreaksbr|urlize }}
             <!-- <a class="institution-intro__web-link" href="">Read More</a> -->
           </p>
         {% endif %}

diff --git a/deploy-version.sh b/deploy-version.sh
@@ -54,6 +54,8 @@ aws elasticbeanstalk create-application-version \
   --source-bundle S3Bucket=$BUCKET,S3Key=$DIR/$ZIP \
   --version-label "$1"
 
+mv $ZIP deployments/$ZIP
+
 # deploy app to a running environment
 aws elasticbeanstalk update-environment \
   --environment-name "$2" \