lots of name fixes to get views to work in the app

app/views/merged/images/index.haml

@@ -10,7 +10,7 @@
         = submit_tag 'Submit'
   -@images.each do |name , image|
     .relative.block.border.border-gray-100
-      =image_tag("merge/#{name}" , class: "h-56 w-full object-contain lg:h-72")
+      =image_tag("cms/#{name}" , class: "h-56 w-full object-contain lg:h-72")
       .p-3
       %strong.inline-block.bg-yellow-400.px-3.py-1.text-md.font-medium
         = "#{image.size}k"

app/views/merged/pages/show.haml

@@ -21,4 +21,4 @@
         %button.mt-4.rounded-lg.bg-red-400.p-4
           =link_to "Delete" , "/index"
     -section.content.each do |key , value|
-      = render "merge/sections/overview/#{key}", section: section , key: key , value: value
+      = render "merged/sections/overview/#{key}", section: section , key: key , value: value

app/views/merged/sections/editors/_card_template.haml

@@ -4,4 +4,4 @@
   %p #{section.content['cards'].length} cards
   %p view cards (index)
 .relative.block.border.border-gray-100
-  =image_tag("merge/card_preview/#{value}" , class: "w-full object-contain")
+  =image_tag("merged/card_preview/#{value}" , class: "w-full object-contain")

app/views/merged/sections/editors/_image.haml

@@ -10,4 +10,4 @@
   -if( value.blank? )
     No image
   -else
-    = image_tag( "merge/" + value)
+    = image_tag( "cms/" + value)

app/views/merged/sections/editors/_template.haml

@@ -2,4 +2,4 @@
   %h3.mt-4.text-lg.font-bold= key.upcase
   %p= value
 .relative.block.border.border-gray-100
-  =image_tag("merge/section_preview/#{section.template}" , class: "w-full object-contain")
+  =image_tag("merged/section_preview/#{section.template}" , class: "w-full object-contain")

app/views/merged/sections/overview/_card_template.haml

@@ -1,5 +1,5 @@
 .p-6
   %h3.mt-4.text-lg.font-bold= key.upcase
   %p= value
-  =image_tag("merge/card_preview/#{value}" , class: "w-full object-contain")
+  =image_tag("merged/card_preview/#{value}" , class: "w-full object-contain")
   %p #{section.content['cards'].length} cards

app/views/merged/sections/overview/_image.haml

@@ -1,6 +1,6 @@
 .p-6
   %h3.mt-4.text-lg.font-bold= key.upcase
   -if value
-    = image_tag "merge/" + value
+    = image_tag "cms/" + value
   -else
     No image

app/views/merged/sections/overview/_template.haml

@@ -1,4 +1,4 @@
 .p-6
   %h3.mt-4.text-lg.font-bold= key.upcase
   %p= value
-  =image_tag("merge/section_preview/#{section.template}" , class: "w-full object-contain")
+  =image_tag("merged/section_preview/#{section.template}" , class: "w-full object-contain")

app/views/merged/sections/select_image.haml

@@ -12,4 +12,4 @@
   -@images.each do |name , image|
     .relative.block.border.border-gray-100
       = link_to( merge_page_section_set_image_path( image: name)) do
-        =image_tag("merge/#{name}" , class: "h-56 w-full object-contain lg:h-72")
+        =image_tag("cms/#{name}" , class: "h-56 w-full object-contain lg:h-72")

app/views/merged/sections/show.html.haml

@@ -11,7 +11,7 @@
 
 .grid.grid-cols-2.gap-2.m-8
   - @section.content.each do |key , value|
-    = render "merge/sections/editors/#{key}", section: @section , key: key , value: value
+    = render "merged/sections/editors/#{key}", section: @section , key: key , value: value
 
 = #link_to 'Edit', edit_merge_section_path(@merge_section)
 \|

app/views/merged/view/_section_2_col.haml

@@ -5,7 +5,7 @@
         = section["header"]
       %p.mt-4.text-gray-500
         = section["text"]
-  - template = "cards/" + section["card_template"]
+  - template = "merged/view/cards/" + section["card_template"]
   .grid.grid-cols-1.md:grid-cols-2
     - section["cards"].each do |element|
       = render( template , element: element)

app/views/merged/view/_section_half_left.haml

@@ -8,4 +8,4 @@
         = section["text"]
       .mt-4.md:mt-8
         -if section["button"]
-          = render 'elements/button' , button: section["button"]
+          = render 'merged/view/elements/button' , button: section["button"]

app/views/merged/view/_section_half_right.haml

@@ -7,5 +7,5 @@
         = section["text"]
       .mt-4.md:mt-8
         -if section["button"]
-          = render 'elements/button' , button: section["button"]
+          = render 'merged/view/elements/button' , button: section["button"]
   = image_for( section , "p-5 h-56 w-full object-cover sm:h-full")

app/views/merged/view/elements/_button.haml

@@ -0,0 +1,2 @@
+%a.inline-block.rounded.bg-emerald-600.px-12.py-3.text-sm.font-medium.text-white.transition.hover:bg-emerald-700.focus:outline-none.focus:ring.focus:ring-yellow-400{:href => button["link"]}
+  =button['text']