Merge pull request #557 from hpi-swt2/flexibus/#380/events-view-as-tiles

Flexibus/#380/events view as tiles
hpi-swt2 · Feb 8, 2018 · e165c14 · e165c14
2 parents 718a7bf + b4be760
commit e165c14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/assets/stylesheets/tile.css b/app/assets/stylesheets/tile.css
@@ -5,7 +5,7 @@
     }
 }
 
-@media screen and (max-width : 899px) and (min-width: 400px){
+@media screen and (max-width : 899px) and (min-width: 400px) {
     .tile-wrapper {
         display: grid;
         grid-template-columns: 1fr 1fr
@@ -14,11 +14,13 @@
     .tile-description {
         width: 300px;
     }
+
     .tile-title {
         width: 300px;
     }
 }
 
+
 @media screen and (max-width : 480px){
     .tile-wrapper {
         display: grid;

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -186,11 +186,10 @@ def human_game_mode
   end
 
   def build_description_string
-    if self.type == 'Rankinglist'
-      "#{I18n.t('events.index.registration_until')}: #{self.deadline} <br> #{I18n.t('events.index.start_date')}: #{self.startdate}"
-    else
-      "#{I18n.t('events.index.max_players')}: #{self.max_teams}"
-    end
+    registration_until = "#{I18n.t('events.index.registration_until')}: #{self.deadline}" if self.deadline.present?
+    start_date = "#{I18n.t('events.index.start_date')}: #{self.startdate}" if self.startdate.present?
+    return ("#{registration_until} <br> #{start_date}").html_safe if registration_until.present?
+    "#{I18n.t('events.index.max_players')}: #{self.max_teams}" if self.max_teams.present?
   end
 
   def fitting_teams(user)