fixed share ayah

app/javascript/stylesheets/organism/_translation.scss

@@ -55,7 +55,7 @@
       //     left: 0;
       //   }
     }
-    .surah-ayah-link {
+    .ayah-badge-link {
       //   @include sm {
       //     position: absolute;
       //     top: 0px;

app/presenters/advance_copy_presenter.rb

@@ -1,4 +1,4 @@
-class AdvanceCopyPresenter < BasePresenter
+class AdvanceCopyPresenter < QuranPresenter
   FOOT_NOTE_REG = /<sup foot_note=\d+>(\d+)<\/sup>/
 
   def cache_key(action_name:)

app/presenters/quran_presenter.rb

@@ -26,6 +26,10 @@ def initialize(context)
     params[:reading] = 'true' == params[:reading]
   end
 
+  def verse_actions_heading(verse)
+    "#{chapter_name_simple(verse)} - #{verse.verse_key}"
+  end
+
   def show_chapter_name?(verse)
     1 == verse.verse_number
   end
@@ -48,12 +52,6 @@ def params_for_copy(verse)
     #"#{params_for_verse_link}&range=#{range}&from=#{verse.verse_number}"
   end
 
-  def render_translations?
-    strong_memoize :render_translation do
-      valid_translations.present?
-    end
-  end
-
   def reading_mode?
     strong_memoize :reading_mode do
       reading = params[:reading].presence
@@ -101,14 +99,13 @@ def font_method
 
   def params_for_verse_link
     strong_memoize :verse_link_params do
+      query = {font: font_type}
       if (translation = valid_translations).present?
-        "?translations=#{translation.join(',')}"
+        query[:translations] = translation.join(',')
       end
-    end
-  end
 
-  def params_for_copy(verse)
-    #"#{params_for_verse_link}&range=#{range}&from=#{verse.verse_number}"
+      "?#{query.to_param}"
+    end
   end
 
   def render_translations?
@@ -154,4 +151,10 @@ def saved_translations(load_stored: true)
       from_params
     end
   end
+
+  def chapter_name_simple(verse)
+    strong_memoize "chapter_#{verse.chapter_id}_name" do
+      verse.chapter.name_simple
+    end
+  end
 end

app/presenters/verse_presenter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class VersePresenter < BasePresenter
+class VersePresenter < QuranPresenter
   def verse
     if params[:id].to_s.include?(':')
       Verse.find_by(verse_key: params[:id])
@@ -13,6 +13,10 @@ def approved_tafsirs
     ResourceContent.tafsirs.approved
   end
 
+  def verse_key
+    verse.verse_key
+  end
+
   def tafsir_languages
     list = Language
            .eager_load(:translated_name)
@@ -41,9 +45,9 @@ def share_url
     translations = valid_translations
 
     if translations.present?
-      "https://www.quran.com/#{verse.verse_key.sub(':', '/')}?translations=#{translations.join(',')}"
+      "https://www.quran.com/#{verse.verse_key}?translations=#{translations.join(',')}"
     else
-      "https://www.quran.com/#{verse.verse_key.sub(':', '/')}"
+      "https://www.quran.com/#{verse.verse_key}"
     end
   end
 

app/views/reader/_verse.html.erb

@@ -5,7 +5,7 @@
      data-text="<%= verse.text_uthmani %>">
   <div>
     <div class="translation__icons">
-      <a class="translation__icon surah-ayah-link"
+      <a class="translation__icon ayah-badge-link"
          href="/<%= verse.verse_key %><%= @presenter.params_for_verse_link %>"
          data-controller='track'
          data-name='ayah-key'
@@ -38,7 +38,7 @@
           <div class="actions-items">
             <div class="actions-header">
               <p class="text text--darkgrey text--medium text--regular">
-                <%= verse.chapter.name_simple %> - <%= verse.verse_key %>
+                <%= @presenter.verse_actions_heading(verse) %>
               </p>
               <span class="quran-icon icon-x" id=close-actions></span>
             </div>
@@ -55,11 +55,11 @@
 
             <a class="translation__icon"
                data-controller="ajax-modal"
-               data-url="/<%= verse.chapter_id %>/copy_options<%= @presenter.params_for_copy(verse) %>"
+               data-url="/advance_copy/copy_options<%= @presenter.params_for_copy(verse) %>"
                data-controller="track"
                data-name='ayah-action'>
               <i class="icon-copy"></i>
-              Copy advanced
+              <%= _t('action.copy.advance', default: 'Copy advanced') %>
             </a>
 
             <a class="translation__icon"
@@ -100,7 +100,8 @@
 
   <div class="translation__text">
     <div class="translation__arabic">
-      <div class="arabic <%= @presenter.font_method %>" data-verse="<%= verse.id %>">
+      <div class="arabic <%= @presenter.font_method %>"
+           data-verse="<%= verse.verse_key %>">
         <% if @presenter.render_verse_words? %>
           <%= render partial: 'reader/word', collection: verse.words %>
         <% else %>

app/views/verses/share.html.erb

@@ -4,7 +4,11 @@
 
 <div id="modal">
   <div class="modal-body">
-    <div data-controller="share" data-url="<%= @presenter.share_url %>" data-title="<%= @presenter.share_title %>" data-text="<%= @presenter.share_text %>" data-versek-key="<%= @presenter.verse.verse_key %>">
+    <div data-controller="share"
+         data-url="<%= @presenter.share_url %>"
+         data-title="<%= @presenter.share_title %>"
+         data-text="<%= @presenter.share_text %>"
+         data-versek-key="<%= @presenter.verse_key %>">
       <div id="share-buttons" class="row justify-content-center flex-wrap">
       </div>
     </div>

config/locales/en.yml

@@ -86,6 +86,7 @@ en:
     copy:
       label: Copy
       done: Copied!
+      advance: Advance Copy
   search:
     label: Search
     placeholder: Search "Noah"

config/routes.rb

@@ -99,8 +99,8 @@
   get '/page/:page_number', to: 'quran#page', as: :quran_page
   get '/juz/:juz_number', to: 'quran#juz', as: :quran_juz
 
-  get '/:chapter_id/copy_options', to: 'advance_copy#copy_options'
-  get '/:chapter_id/copy_text', to: 'advance_copy#copy_text'
+  get '/advance_copy/copy_options', to: 'advance_copy#copy_options', as: :advance_copy_options
+  get '/advance_copy/copy_text', to: 'advance_copy#copy_text'
 
   get '/:id/load_verses', to: 'chapters#load_verses'