From 60e6baa9044343d0a17c2672fdf6f7d066428ee1 Mon Sep 17 00:00:00 2001
From: Bady <bady@disroot.org>
Date: Mon, 10 Jul 2017 01:12:53 +0530
Subject: [PATCH] Add navigation buttons for events

---
 css/events.css                          | 10 ++++++++++
 pug/templates/events.pug                | 17 ++++++++++++-----
 pug/templates/individual_event_page.pug | 15 +++++++++------
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/css/events.css b/css/events.css
index c3f9555..8cc113e 100644
--- a/css/events.css
+++ b/css/events.css
@@ -43,3 +43,13 @@
 a.list-group-item::before {
   display: none;
 }
+
+.list-group-item.events-list.separator:hover {
+  margin-right: 0;
+}
+
+.panel .panel-heading .pull-right {
+  margin-top: -36px;
+  margin-right: 10px;
+  padding: 6px 25px;
+}
diff --git a/pug/templates/events.pug b/pug/templates/events.pug
index b30d051..d75d77e 100644
--- a/pug/templates/events.pug
+++ b/pug/templates/events.pug
@@ -14,20 +14,27 @@ block content
           .panel-body
             .search-form
               .row
-                .col-xs-10
+                .col-xs-2.col-sm-8
                   | &nbsp;
                   //-.form-group
                     input.form-control(type='text', placeholder='Search Contacts...')
                     i.fa.fa-search
-                .col-xs-2
-                  a.btn.btn-primary.btn-block(href='#')
+                .col-xs-5.col-sm-2
+                  a.btn.btn-primary.btn-block(href='https://git.fosscommunity.in/community/fsci.org.in/tree/master/events/details' target='_blank')
                     i.fa.fa-plus
                     span Add
+                .col-xs-5.col-sm-2
+                  a.btn.btn-primary.btn-block(href='http://fsci.org.in')
+                    i.fa.fa-plus
+                    span Back
           // panel body
           .list-group
             // list of sample data
-            for event in events.events
+            for event in events.events 
               a.list-group-item.events-list.separator(href='/events/' + event.id + '.html')
                 img.img-rounded.pull-left(src=event.imgurl)
                 h4.list-group-item-heading= event.name
-                p.list-group-item-text!= event.locationame
+                p.list-group-item-text!= event.when
+          
+          //- for event in sortedEvents
+            h4.list-group-item-heading=event.id
diff --git a/pug/templates/individual_event_page.pug b/pug/templates/individual_event_page.pug
index fcdbe38..145ef41 100644
--- a/pug/templates/individual_event_page.pug
+++ b/pug/templates/individual_event_page.pug
@@ -27,7 +27,7 @@ block content
               a.list-group-item(href='/events/' + event.lat + '.' + event.lng + '.html')
                 img.img-rounded.pull-left(src=event.imgurl)
                 h4.list-group-item-heading= event.name
-                p.list-group-item-text!= event.locationame
+                p.list-group-item-text!= event.venue + ', ' + event.district
       .col-sm-12.bootcards-cards
         // contact details
         #contact-card.event-card.col-sm-4
@@ -46,23 +46,26 @@ block content
                 label= "LOCATION"
                 if (evt.lat != "" && evt.lng != "")
                   a(href="http://www.openstreetmap.org/?mlat=" + evt.lat + "&mlon=" + evt.lng + "&ref=FSCI")
-                    h4.list-group-item-heading= evt.locationame
+                    h4.list-group-item-heading= evt.venue + ', ' + evt.district
                 else
-                  h4.list-group-item-heading= evt.locationame
+                h4.list-group-item-heading= evt.venue + ', ' + evt.district
               .list-group-item.separator
                 label= "ORGANIZED BY"
                 h4.list-group-item-heading= evt.organizedby
               .list-group-item.separator
                 label= "DATETIME"
                 h4.list-group-item-heading= evt.when
-              .list-group-item.separator
-                label= "CONTACT INFO"
-                h4.list-group-item-heading= evt.contactinfo
+              if (evt.contactinfo != "")
+                .list-group-item.separator
+                    label= "CONTACT INFO"
+                    h4.list-group-item-heading= evt.contactinfo
 
         #description-card.event-card.col-sm-8
           .panel.panel-default.bootcards-richtext.event-details
             .panel-heading
               h3.panel-title Description
+              a.btn.btn-primary.pull-right(href='http://fsci.org.in/events')
+                span Back
             .panel-body!= evt.description
               p.lead
                 img(src=evt.imgurl, alt=evt.name)
-- 
GitLab