Differences

This shows you the differences between two versions of the page.

--- welcome [2017/01/02 15:25]
marto events section link to events listing
+++ welcome [2019/11/01 09:41]
kenny [Where to find us] add pdf map
@@ Line 7: / Line 7: @@
 **The space also provides a location that not-for-profit community and discussion groups can use at no charge for meetings and to develop projects.**
+**If you any questions about the space, want to book it for your own use, or join one of our workshops, you can contact us [[Contact | here]].**
 **All are welcome.**
 {{gallery>gallery?random?nocache&=2&300x300}}
-**If you any questions about the space, want to book it for your own use, or join one of our workshops, you can contact us [[Contact | here]].**
 ====== Upcoming Events  ======
-Below is a list of events scheduled within the next 30 days. Certain events have their own listing in the [[events|events section]]. The information is taken from our [[howto:calendar|calendar]], and is also available as an [[http://electronclub.org/rss.php|rss]] feed.
+Below is a list of events scheduled within the next 30 days. Certain events have their own listing in the [[events|events section]]. The information is taken from our [[howto:calendar|calendar]], and is also available as an [[http://electronclub.org/rss.php|rss]] feed. More information about regular [[groups:|groups]] can be found within the [[groups:|groups]] section of the site.
 <sql>select
@@ Line 23: / Line 22: @@
 name as "Event Name",
 description as "Description",
-concat('<a href="http://www.electronclub.org/calendar/view_entry.php?id=', id, '" target="_blank">Click here</a>') as "Link"
+concat('<a href="http://www.electronclub.org/calendar/view_entry.php?id=', id, '" target="_blank">Click here</a>') as "Link",
+CASE
+  WHEN status = '0' THEN 'Confirmed'
+  WHEN status = '4' THEN 'Tentative'
+END as "Booking Status"
 from mrbs_entry
 where from_unixtime( floor(start_time)) >= curdate()
 and from_unixtime( floor(start_time)) < curdate() + interval 30 day
 and upper( description ) not like "%CCA BUILDING CLOSED%"
-order by Event_Date;</sql>
+order by start_time ;</sql>
 ====== Where to find us ======
@@ Line 39: / Line 42: @@
 Glasgow
-[[http://www.openstreetmap.org/?lat=55.865764&lon=-4.264938&zoom=18&layers=C| CCA on OpenStreetMap]] - [[https://maps.google.co.uk/maps?q=cca,+glasgow&hl=en&ll=55.865735,-4.264986&spn=0.000777,0.002411&geocode=+&hq=cca,+glasgow&t=h&z=19| CCA on Google Maps]]\\
+This {{ :electronclub-cca-map.pdf | map}} shows the location of the Electron Club in the CCA
+[[http://www.openstreetmap.org/#map=18/55.86596/-4.26599| CCA on OpenStreetMap]] - [[https://maps.google.co.uk/maps?q=cca,+glasgow&hl=en&ll=55.865735,-4.264986&spn=0.000777,0.002411&geocode=+&hq=cca,+glasgow&t=h&z=19| CCA on Google Maps]]\\
-See the CCA website for [[http://www.cca-glasgow.com/contact.html | opening hours]] or check the [[http://www.electronclub.org/calendar/ | calendar]] for Electron club related meeting/event times.
+See the CCA website for [[http://www.cca-glasgow.com/programme | opening hours]] or check the [[http://www.electronclub.org/calendar/ | calendar]] for Electron club related meeting/event times.
 ====== Who we are ======

Electron Club

User Tools

Site Tools

Differences

Page Tools