Fix CSS formatting error, improve place display in listing

a-thousand-channels · Feb 27, 2024 · 7c6e555 · 7c6e555
1 parent 3528e4d
commit 7c6e555
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 25 deletions.
diff --git a/app/assets/stylesheets/1_basics.css.scss b/app/assets/stylesheets/1_basics.css.scss
@@ -139,6 +139,8 @@ a.button {
 }
 a.button.small {
   margin: 0 0.25rem 0.25rem;
+  padding: 0.45em 0.7em;
+  white-space: nowrap;
 }
 .close-button.small {
     right: 0.66rem;
@@ -323,6 +325,7 @@ body .top-bar.action-bar {
       display: inline;
       font-weight:  bold;
       font-size:  14px;
+
       opacity:  1;
       transition: 3s all;
       svg {

diff --git a/app/assets/stylesheets/6_timeline.css.scss b/app/assets/stylesheets/6_timeline.css.scss
@@ -1,20 +1,22 @@
+
 %td.nobr {
     white-space: nowrap;
-
 }
-.time
-{
-  border-top: 1px dashed #555;
-  border-bottom: 1px dashed #555;
-  line-height: 0;
-  padding: 0;
-  width: 8px;
-  display: inline-block;
-  color: transparent;
-  margin-right: 0;
+#timeline {
+  .time
+  {
+    border-top: 1px dashed #555;
+    border-bottom: 1px dashed #555;
+    line-height: 0;
+    padding: 0;
+    width: 8px;
+    display: inline-block;
+    color: transparent;
+    margin-right: 0;
+  }
+  .time.time-first,
+  .time.time-on {
+    border-top: 4px solid #c6c600;
+    border-bottom: 4px solid #c6c600;
+  }
 }
-.time.time-first,
-.time.time-on {
-  border-top: 4px solid #c6c600;
-  border-bottom: 4px solid #c6c600;
-}
diff --git a/app/views/places/index.html.haml b/app/views/places/index.html.haml
@@ -62,7 +62,7 @@
   %p
     &nbsp;
 
-  %table
+  %table#timeline
     %thead
       %tr
         %th 
@@ -160,17 +160,22 @@
                 %i.fi-star.fi-21{title: 'Feature'}
             - if place.subtitle.present?
               %p= place.subtitle
-            %p
-              = link_to place.link do
-                = place.link
+
             %p
               = place.location
               %br
-              = place.address
-              %br
-              = place.zip
-              = place.city
+              - if place.address.present?              
+                - if place.zip.present? && place.city.present?
+                  #{place.address}, #{place.zip} #{place.city}
+                - elsif place.city.present?
+                  #{place.address}, #{place.zip}
+                - else  
+                  #{place.address}
 
+            %p
+              = link_to place.link, {target: '_blank'} do
+                %i.fi-link.fi-21
+                Weblink
             - if place.annotations && place.annotations.count > 0
               %p
                 = link_to map_layer_place_path(place.layer.map,place.layer,place) do
@@ -219,7 +224,7 @@
               Video
             - if admin? && current_user.group.title == 'Admins'
               %br
-              = link_to clone_map_layer_place_path(place.layer.map,place.layer,place), :class => 'button small secondary', :title=>'Make a copy of this place and change it' do
+              = link_to clone_map_layer_place_path(place.layer.map,place.layer,place), :class => 'button small secondary', :title=>'Make a copy of this place and edit' do
                 %i.fi-page-copy.fi-21
                 Copy
             %br