Merge ccfaeee into 4cb5740

publiclab · Sep 2, 2020 · 436485a · 436485a
2 parents 4cb5740 + ccfaeee
commit 436485a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
@@ -167,10 +167,16 @@ def edit
         else
           if @node.main_image
             @main_image = @node.main_image.path(:default)
+            @node.main_image.photo_text = params[:photo_text]
+            @node.save!
           elsif params[:main_image] && Image.find_by(id: params[:main_image])
             @main_image = Image.find_by(id: params[:main_image]).path
+            Image.find_by(id: params[:main_image]).photo_text = params[:photo_text]
+            Image.find_by(id: params[:main_image]).save!
           elsif @image
             @main_image = @image.path(:default)
+            @image.photo_text = params[:photo_text]
+            @image.save!
           end
           flash.now[:notice] = "This is the new rich editor. For the legacy editor, <a href='/notes/edit/#{@node.id}?#{request.env['QUERY_STRING']}&legacy=true'>click here</a>."
           render template: 'editor/rich'

diff --git a/app/views/editor/rich.html.erb b/app/views/editor/rich.html.erb
@@ -112,6 +112,12 @@
               >Select an optional main image for your post.</span
             >
           </p>
+          <p>
+            <input class="form-control input-lg"  type="text" id="alt-text" placeholder="Add alternate text for image" value="<% if @node && @node.main_image.photo_text %><%= @node.main_image.photo_text %><% else %><%= params[:photo_text] %><% end %>"/>
+          </p>
+          <p>
+            <input class="form-control input-lg"  type="text" id="alt-text" placeholder="Add alternate text for image" value="<% if @node && @node.main_image.photo_text %><%= @node.main_image.photo_text %><% else %><%= params[:photo_text] %><% end %>"/>
+          </p>
         </div>
       </div>
     </div>

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
@@ -14,7 +14,7 @@
 
   <% if @node.main_image %>
     <a class="main-image" style="max-width:100%;width:800px;" href="<%= @node.main_image.path(:original) %>">
-      <%= image_tag(@node.main_image.path(:large), class:"rounded d-none d-lg-inline", style:'max-height:600px;max-width:100%;') %>
+      <%= image_tag(@node.main_image.path(:large), class:"rounded d-none d-lg-inline", style:'max-height:600px;max-width:100%;', alt:@node.main_image.photo_text) %>
       <%= image_tag(@node.main_image.path(:large), class:"rounded d-lg-none", style:'width:100%;') %>
     </a>
     <!--<div class="expand"><a onClick="$('.main-image').toggleClass('compressed');"><i class="fa fa-angle-down"></i></a></div>-->

diff --git a/db/migrate/20200629163837_add_photo_text_to_images.rb b/db/migrate/20200629163837_add_photo_text_to_images.rb
@@ -0,0 +1,5 @@
+class AddPhotoTextToImages < ActiveRecord::Migration[5.2]
+  def change
+    add_column :images, :photo_text, :string
+  end
+end