Merge pull request #120 from scientist-softserv/fixes07-27

Fixes07 27
scientist-softserv · Aug 2, 2023 · d8df909 · d8df909
2 parents 7e5f82b + 0ac9e45
commit d8df909
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/app/assets/stylesheets/themes/cultural_show.scss b/app/assets/stylesheets/themes/cultural_show.scss
@@ -1,5 +1,13 @@
 .cultural_show {
 
+     .show-actions {
+         margin-bottom: 0.5em;
+     }
+
+     .centered-media.text-center img.canonical-image {
+          max-width: 300px;
+          }
+
   dl.work-show dd {
     border-bottom: 1px solid #ddd;
 

diff --git a/app/views/themes/cultural_show/hyrax/base/show.html.erb b/app/views/themes/cultural_show/hyrax/base/show.html.erb
@@ -27,14 +27,15 @@
               </div>
             <% end %>
           <% end %>
-          <div class="<%= @presenter.universal_viewer? ? 'col-sm-6' : 'col-sm-6' %>">
+          <div class="<%= @presenter.universal_viewer? ? 'col-sm-8' : 'col-sm-8' %>">
             <%= render 'work_description', presenter: @presenter %>
             <%= render 'metadata', presenter: @presenter %>
           </div>
-          <div class="col-xs-12 relationships-container">
+          <div class="col-sm-12 col-md-4 relationships-container">
             <div class='relationships-box'>
               <%= render 'relationships', presenter: @presenter %>
             </div>
+            <%= render 'citations', presenter: @presenter %>
           </div>
           <div class="col-sm-12 work-show-items">
             <%= render 'items', presenter: @presenter %>

diff --git a/app/views/themes/scholarly_show/hyrax/base/show.html.erb b/app/views/themes/scholarly_show/hyrax/base/show.html.erb
@@ -20,7 +20,7 @@
             <%= render 'video_embed_viewer', presenter: @presenter %>
             <div class="col-sm-12">
               <div class="image-show-description">
-                <%= render 'work_description', presenter: @presenter %>
+                <%# render 'work_description', presenter: @presenter %>
               </div>
             </div>
           <% else %>
@@ -30,23 +30,27 @@
               </div>
               <div class="col-sm-12">
                 <div class="image-show-description">
-                  <%= render 'work_description', presenter: @presenter %>
+                  <%# render 'work_description', presenter: @presenter %>
                 </div>
               </div>
             <% else %>
               <div class="col-sm-3 mb-1">
                 <%= render 'representative_media', presenter: @presenter, viewer: false %>
               </div>
               <div class="col-sm-9">
-                <%= render 'work_description', presenter: @presenter %>
+                <%# render 'work_description', presenter: @presenter %>
               </div>
             <% end %>
           <% end %>
         </div>
         <div class="row">
-          <div class="col-sm-12 image-show-metadata">
+          <div class="col-sm-8 image-show-metadata">
+            <%= render 'work_description', presenter: @presenter %>
             <%= render 'metadata', presenter: @presenter %>
           </div>
+          <div class="col-sm-12 col-md-4">
+               <%= render 'citations', presenter: @presenter %>
+          </div>
           <div class="col-sm-12">
             <%= render 'relationships', presenter: @presenter %>
             <%= render 'items', presenter: @presenter %>

diff --git a/config/tinymce.yml b/config/tinymce.yml
@@ -3,11 +3,15 @@ default: &default
 content_block:
   <<: *default
   menubar: false
-  toolbar1: styleselect | bold italic | undo redo
-  toolbar2: table | fullscreen | image
+  image_uploadtab: true
+  toolbar1: styleselect | bold italic underline | link hr | undo redo | image | code
+  toolbar2: indent outdent | alignleft aligncenter alignright | table | fullscreen
   plugins:
     - table
     - fullscreen
+    - link
+    - autolink
     - image
+    - code
 custom:
   <<: *default