diff --git a/app/admin/source.rb b/app/admin/source.rb index 07c62ea82..95acf2b78 100644 --- 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 index 8de2b06e9..081e955a1 100644 --- 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'); +} \ No newline at end of file diff --git a/app/views/activeadmin/_section_sidebar_show.html.erb b/app/views/activeadmin/_section_sidebar_show.html.erb index 918a72b79..e610cf1fe 100644 --- 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") %> - <%if @item && @item.id && @item.respond_to?(:allow_holding?) && @item.allow_holding? %> -
  • - - <%end%> + <% if item.is_a?(Source) %> + + <% end %> + + <%if @item && @item.id && @item.respond_to?(:allow_holding?) && @item.allow_holding? %> +
  • + + <%end%>
  • diff --git a/config/locales/de.yml b/config/locales/de.yml index dfde7a148..defdaa2ea 100644 --- 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 index c4a5c44ea..f2d59a5ba 100644 --- 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 index 85971af84..69e0cdc1c 100644 --- 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 index a27e15ed7..109aaac6f 100644 --- 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 index c71c6c0ec..18bb750f5 100644 --- 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 index af9d559eb..48aefff4b 100644 --- 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 index 4f0b80950..9194d3d2b 100644 --- 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 new file mode 100644 index 000000000..4ea9312da Binary files /dev/null and b/public/images/marc-icons/up_arrow.png differ