Fix #732, make the sidebar floating ad add a "go to top" button

rism-digital · Nov 30, 2021 · bfc55b0 · bfc55b0
1 parent c801afa
commit bfc55b0
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 9 deletions.
diff --git a/app/admin/source.rb b/app/admin/source.rb
@@ -313,7 +313,7 @@ def new
     active_admin_comments if !is_selection_mode?
   end
 
-  sidebar :actions, :only => :show do
+  sidebar :actions, :class => "sidebar_tabs", :only => :show do
     render :partial => "activeadmin/section_sidebar_show", :locals => { :item => @arbre_context.assigns[:item] }
   end
 

diff --git a/app/assets/javascripts/marc_editor.js b/app/assets/javascripts/marc_editor.js
@@ -619,3 +619,6 @@ function marc_editor_get_model() {
 	return $("#marc_editor_panel").data("editor-model");
 }
 
+function marc_editor_go_to_top() {
+	$('html, body').animate({ scrollTop: 0 }, 'fast');
+}
diff --git a/app/views/activeadmin/_section_sidebar_show.html.erb b/app/views/activeadmin/_section_sidebar_show.html.erb
@@ -16,13 +16,20 @@
 			:class => "muscat_icon_link muscat_icon_link_list") %>
 		</li>
 
-	<%if @item && @item.id && @item.respond_to?(:allow_holding?) && @item.allow_holding? %>
-		<li class="muscat_icon_separator"></li>
-		<li class="muscat_icon_link">
-			<%= link_to("#{I18n.t :new_holding}", new_admin_holding_path(source_id: @item.id),
-				:class => "muscat_icon_link muscat_icon_link_new") %>
-		</li>
-	<%end%>
+		<% if item.is_a?(Source) %>
+			<li class="muscat_icon_link">
+			<%= link_to(I18n.t(:go_to_top), "javascript:marc_editor_go_to_top()",
+				:class => "muscat_icon_link muscat_icon_link_up") %>
+			</li>
+		<% end %>
+
+		<%if @item && @item.id && @item.respond_to?(:allow_holding?) && @item.allow_holding? %>
+			<li class="muscat_icon_separator"></li>
+			<li class="muscat_icon_link">
+				<%= link_to("#{I18n.t :new_holding}", new_admin_holding_path(source_id: @item.id),
+					:class => "muscat_icon_link muscat_icon_link_new") %>
+			</li>
+		<%end%>
 
 		<li class="muscat_icon_separator"></li>
 

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -350,6 +350,7 @@ de:
   # Sidebar
   delete: "Löschen"
   to_the_list: "Zurück zur Liste"
+  go_to_top:  "Zurück zum Anfang"
   edit: "Bearbeiten"
   new: "Erstellen"
   duplicate: "Kopieren"

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -350,6 +350,7 @@ en:
   # Sidebar
   delete: "Delete"
   to_the_list: "Return to the list"
+  go_to_top: "Back to the top"
   edit: "Edit"
   new: "Create"
   duplicate: "Duplicate"

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -351,6 +351,7 @@ es:
   # Sidebar
   delete: "Borrar"
   to_the_list: "Volver a la lista"
+  go_to_top: "Volver al principio"
   edit: "Editar"
   new: "Crear"
   duplicate: "Duplicar"

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -351,10 +351,11 @@ fr:
   # Sidebar
   delete: "Supprimer"
   to_the_list: "Retourner à la liste"
+  go_to_top: "Retour en haut de la page"
   edit: "Modifier"
   new: "Créer"
   duplicate: "Dupliquer"
-  merge: "MERGE"
+  merge: "Fusionner"
   no_action: "Aucune action possible"
   reindex: "Ré-indexer"
   resave: "Resauver"

diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -352,6 +352,7 @@ it:
   # Sidebar
   delete: "Cancella"
   to_the_list: "Ritorna all'indice"
+  go_to_top: "Ritorna in cima"
   edit: "Modifica"
   new: "Crea"
   duplicate: "Duplica"

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
@@ -351,6 +351,7 @@ pl:
   # Sidebar
   delete: Usuń
   to_the_list: Wróć do listy
+  go_to_top: Powrót na górę
   edit: Edytuj
   new: Utwórz
   duplicate: Powiel

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
@@ -347,6 +347,7 @@ pt:
   # Sidebar
   delete: "Apagar"
   to_the_list: "Retornar à lista"
+  go_to_top: "Voltar ao início"
   edit: "Editar"
   new: "Criar"
   duplicate: "Duplicar"

diff --git a/public/images/marc-icons/up_arrow.png b/public/images/marc-icons/up_arrow.png