Added read more link to popups. Fix/improvements of earlier steps (refs

#353)

app/assets/javascripts/helpers/popup.js

@@ -40,7 +40,7 @@ function PopupFullContent(place) {
     }
     content += '<div class="leaflet-popup-content-text">';
 
-    content += "<p class='label' style='background-color: "+place.color+"; color: #444;'>" + place.layer_title + "</p>";
+    content += "<p class='label' style='background-color: "+place.layer_color+"; color: #444;'>" + place.layer_title + "</p>";
     if (place.date_with_qualifier) {
         content += "<p>" + place.date_with_qualifier;
         if (place.address) {
@@ -73,6 +73,9 @@ function PopupFullContent(place) {
         }
         content += "<p>" + teaser + "</p>";
     }
+    if (place.url) {
+        content += "<p><a href='" + place.url + "'>Read more</a></p>";
+    }    
     if (place.edit_link) {
         content += "<p class='text-right'>" + place.edit_link + "</p>";
     }

app/assets/stylesheets/4_map.css.scss

@@ -65,12 +65,14 @@
 #map.leaflet-container a {
   color: darken(#c6c600,10%);
 }
+
+/* this is not design guide conform, needs adapation for all UI links and buttons */
+/*
 #map.leaflet-container h4 a {
   text-decoration: underline;
 }
-
+  */
 #map.leaflet-container a:hover {
-  text-decoration: underline;
   color: darken(#c6c600,20%);
 }
 .leaflet-bar a, .leaflet-bar a:hover {

app/helpers/places_helper.rb

@@ -11,6 +11,12 @@ def qualifier_for_select
     [['Exact date', 'exact'], ['Approx. date', 'circa']]
   end
 
+  def url(map_id, layer_id, id)
+    map = Map.friendly.find(map_id)
+    layer = Layer.friendly.find(layer_id)
+    "#{Rails.application.config_for(:settings).app_host_protocol}://#{Rails.application.config_for(:settings).app_host}/maps/#{map.slug}/layers/#{layer.slug}/places/#{id}"
+  end
+
   def show_link(title, map_id, layer_id, id)
     " <a href=\"/maps/#{map_id}/layers/#{layer_id}/places/#{id}\">#{title}</a>"
   end

app/models/place.rb

@@ -124,6 +124,10 @@ def color
     layer.color
   end
 
+  def layer_color
+    layer.color
+  end
+
   def date
     ApplicationController.helpers.smart_date_display(startdate, enddate)
   end
@@ -136,6 +140,10 @@ def date_with_qualifier
     end
   end
 
+  def url
+    ApplicationController.helpers.url(layer.map.id, layer.id, id)
+  end
+
   def show_link
     ApplicationController.helpers.show_link(title, layer.map.id, layer.id, id)
   end
@@ -144,10 +152,6 @@ def edit_link
     ApplicationController.helpers.edit_link(layer.map.id, layer.id, id)
   end
 
-  def layer_color
-    layer.color
-  end
-
   def icon_name
     icon ? ApplicationController.helpers.icon_name(icon.title) : ''
   end

app/views/layers/_layer.json.jbuilder

@@ -4,7 +4,7 @@ json.extract! layer, :id, :title, :subtitle, :text, :credits, :image_link, :publ
 json.url map_layer_url(layer, format: :json)
 json.iconset layer.map.iconset, :title, :icon_anchor, :icon_size, :popup_anchor, :class_name if layer.map.iconset
 json.places layer.places do |place|
-  json.extract! place, :id, :title, :subtitle, :teaser, :text, :sources, :link, :startdate, :enddate, :full_address, :location, :address, :zip, :city, :country, :published, :featured, :layer_id, :layer_type, :layer_title, :color, :created_at, :updated_at, :date, :date_with_qualifier, :edit_link, :show_link, :imagelink2, :imagelink, :icon_link, :icon_class, :icon_name
+  json.extract! place, :id, :title, :subtitle, :teaser, :text, :sources, :link, :startdate, :enddate, :full_address, :location, :address, :zip, :city, :country, :published, :featured, :layer_id, :layer_type, :layer_title, :layer_color, :color, :created_at, :updated_at, :date, :date_with_qualifier, :url, :edit_link, :show_link, :imagelink2, :imagelink, :icon_link, :icon_class, :icon_name
   json.lat place.public_lat
   json.lon place.public_lon
   json.annotations place.annotations do |annotation|

app/views/maps/_map.json.jbuilder

@@ -6,7 +6,7 @@ json.layers map.layers do |layer|
   json.extract! layer, :id, :title, :subtitle, :text, :credits, :image_link, :published, :map_id, :color, :relations_bending, :relations_coloring, :image_alt, :image_licence, :image_source, :image_creator, :image_caption, :created_at, :updated_at, :ltype
   json.iconset layer.map.iconset, :title, :icon_anchor, :icon_size, :popup_anchor, :class_name if layer.map.iconset
   json.places layer.places do |place|
-    json.extract! place, :id, :title, :subtitle, :teaser, :text, :sources, :link, :startdate, :enddate, :full_address, :location, :address, :zip, :city, :country, :published, :featured, :shy, :layer_id, :layer_title, :layer_color, :layer_type, :created_at, :updated_at, :date, :edit_link, :show_link, :imagelink2, :imagelink, :icon_link, :icon_class, :icon_name
+    json.extract! place, :id, :title, :subtitle, :teaser, :text, :sources, :link, :startdate, :enddate, :full_address, :location, :address, :zip, :city, :country, :published, :featured, :shy, :layer_id, :layer_title, :layer_color, :layer_type, :created_at, :updated_at, :date, :url, :edit_link, :show_link, :imagelink2, :imagelink, :icon_link, :icon_class, :icon_name
     json.lat place.public_lat
     json.lon place.public_lon
     json.annotations place.annotations do |annotation|