diff --git a/src/app/level2/WebControllerProvider.php b/src/app/level2/WebControllerProvider.php index f963679..a394cfb 100644 --- a/src/app/level2/WebControllerProvider.php +++ b/src/app/level2/WebControllerProvider.php @@ -37,7 +37,7 @@ ); return $app['twig']->render( - 'events.twig', + 'event-list.twig', array( 'page' => 'events', 'level2' => Level2::getStatus( $app ), @@ -72,7 +72,7 @@ } return $app['twig']->render( - 'events.twig', + 'event-list.twig', array( 'page' => 'events', 'level2' => Level2::getStatus( $app ), @@ -111,7 +111,7 @@ } return $app['twig']->render( - 'events.twig', + 'event-list.twig', array( 'page' => 'events', 'level2' => Level2::getStatus( $app ), diff --git a/src/app/views/base.twig b/src/app/views/base.twig index 4098ecb..09c25d6 100644 --- a/src/app/views/base.twig +++ b/src/app/views/base.twig @@ -12,7 +12,7 @@ Level2 - + @@ -57,24 +57,13 @@ {% block container %} {% endblock container %} -
-
- {{ level2.address }} -
-
- T: {{ level2.phone }} -
-
- {{ level2.address }} -
-
- + diff --git a/src/app/views/event-grid-split.twig b/src/app/views/event-grid-split.twig new file mode 100644 index 0000000..7e91575 --- /dev/null +++ b/src/app/views/event-grid-split.twig @@ -0,0 +1,20 @@ +{% block event %} + +
+ + +
+ + {% embed "event-info.twig" %} + {% endembed %} + +
+ +
+ +{% endblock %} diff --git a/src/app/views/event-grid-wide.twig b/src/app/views/event-grid-wide.twig new file mode 100644 index 0000000..6238a1d --- /dev/null +++ b/src/app/views/event-grid-wide.twig @@ -0,0 +1,20 @@ +{% block event %} + +
+ + +
+ + {% embed "event-info.twig" %} + {% endembed %} + +
+ +
+ +{% endblock %} diff --git a/src/app/views/event-info.twig b/src/app/views/event-info.twig new file mode 100644 index 0000000..bfe16c9 --- /dev/null +++ b/src/app/views/event-info.twig @@ -0,0 +1,18 @@ +

+ {% if event.url %} + + {{ event.name }} + + {% else %} + {{ event.name }} + {% endif %} +

+

+{{ event.date }} +{% if event.location is defined %} + - {{ event.location }} +{% endif %} +

+{% if event.description is defined %} +

{{ event.description|raw }}

+{% endif %} diff --git a/src/app/views/events.twig b/src/app/views/event-list.twig similarity index 85% rename from src/app/views/events.twig rename to src/app/views/event-list.twig index 35cc7b3..6524875 100644 --- a/src/app/views/events.twig +++ b/src/app/views/event-list.twig @@ -14,7 +14,7 @@ {% for event in events %} - {% embed "event.twig" %} + {% embed "event-grid-split.twig" %} {% endembed %} {% endfor %} diff --git a/src/app/views/event-meta.twig b/src/app/views/event-meta.twig new file mode 100644 index 0000000..eb6a508 --- /dev/null +++ b/src/app/views/event-meta.twig @@ -0,0 +1,23 @@ +{% if event.image %} +
+ {% if event.url %} + + + + {% else %} + + {% endif %} +
+{% else %} + {% if event.url %} + + + + {% else %} + + {% endif %} +{% endif %} +

{{ event.date }}

+{% if event.location is defined %} +

{{ event.location }}

+{% endif %} diff --git a/src/app/views/event.twig b/src/app/views/event.twig deleted file mode 100644 index 59e1dd9..0000000 --- a/src/app/views/event.twig +++ /dev/null @@ -1,53 +0,0 @@ -{% block event %} - -
- - -
-

- {% if event.url %} - - {{ event.name }} - - {% else %} - {{ event.name }} - {% endif %} -

-

- {{ event.date }} - {% if event.location is defined %} - - {{ event.location }} - {% endif %} -

- {% if event.description is defined %} -

{{ event.description|raw }}

- {% endif %} -
- -
- -{% endblock %} diff --git a/src/app/views/level2.twig b/src/app/views/level2.twig index dea0987..235b8f0 100644 --- a/src/app/views/level2.twig +++ b/src/app/views/level2.twig @@ -6,37 +6,95 @@
-

Map

+
- +

#openMonday

+

+ We hold open evenings every Monday from 8pm where members and non-members hang out, hack on projects, socialise, and collaborate. Learn more +

- - +
+ +
+ +

Location

+ +

+ Level2 is located in Bonnevoie, very close to Luxembourg city. We hold regular events (often free) which are open to everyone. +

+ +
+ + + +
+ +

+ Level2
+ 87, route de Thionville
+ L-2611 Luxembourg
+ T: +352 20 33 35 50 +

+ +
+ +
-
+
-

Membership

+
-
+
- Our members have a hand in the running of the organisation and 24/7 access to the space. We're a members-owned non-profit association. We need our members to pay for our rent and infrastructure. The minimum subscription is €9.50/month. +

Next Event

+ + {% for event in events %} + + {% embed "event-grid-split.twig" %} + {% endembed %} + + {% endfor %} + +
-
+
-
+
-

Next Event

+

Membership

+

+ Our members have a hand in the running of the organisation and 24/7 access to the space. We're a members-owned non-profit association. We need our members to pay for our rent and infrastructure. Join the community +

- {% for event in events %} +
- {% embed "event.twig" %} - {% endembed %} +
- {% endfor %} +
+ +
+ +

Sponsors

+

+ + + + + +

+ +
+ +
diff --git a/src/web/css/level2.css b/src/web/css/level2.css index af7e25f..e38e6aa 100755 --- a/src/web/css/level2.css +++ b/src/web/css/level2.css @@ -17,12 +17,15 @@ body { -moz-background-size: cover; -o-background-size: cover; background-size: cover; - font-family: 'Patrick Hand SC', sans-serif; - font-size: 18px; + font-family: 'Open Sans', sans-serif; + font-size: 14px; overflow-x: hidden; } +a { + text-decoration: none; +} .well { - padding: 0.3rem; + padding: 0.7rem; border: none; background: rgba( 255, 255, 255, 0.7 ); } @@ -79,13 +82,15 @@ body { img { max-width: 100%; - max-height: 150px; border-radius: 0.4rem; +} +.event img { + max-height: 150px; } @media (max-width: 992px) { - img { + .event img { max-height: 100px; } } @@ -103,16 +108,16 @@ img { */ h2, h3, h4 { - text-shadow: 1px 0px 6px rgba(255, 255, 255, 0.7); + text-shadow: 1px 0px 6px rgba( 255, 255, 255, 0.7 ); + margin: 0; } -.event h2, .event h3, .event h4, .event p { +p { margin: 0; } .event h2 { font-size: 2rem; } - .event h4 { color: #777; } @@ -127,11 +132,51 @@ h2, h3, h4 { .description h4 { margin-top: -0.5rem; } - -.well:hover { - background: rgba( 255, 255, 255, 0.8 ); -} - .well.map { padding: 0; } +.google-map { + width: 100%; + border-radius: 0; +} +.google-map-container { + width: 100%; +} +h2.well { + padding: auto 5rem; + background: rgba( 51, 51, 51, 0.7 ); + background: rgba( 0, 174, 201, 0.7 ); + margin-bottom: 0; + border-radius: 0.4rem 0.4rem 0 0; + color: #ffffff; + text-shadow: none; +} +.well.info { + border-radius: 0 0 0.4rem 0.4rem; +} +.no-top-radius { + border-radius: 0 0 0.4rem 0.4rem ; +} + +section:hover h2.well { + background: rgba( 51, 51, 51, 0.8 ); + background: rgba( 0, 174, 201, 0.8 ); +} + +section:hover .well { + background: rgba( 255, 255, 255, 0.8 ); +} +.sponsors img { + max-width: 49%; + border-radius: 0; + margin: 5px auto; +} +.no-bottom-margin { + margin-bottom: 0; +} +.no-bottom-rounded { + border-radius: 0; +} +.no-padding { + padding: 0; +} \ No newline at end of file diff --git a/src/web/img/1024.png b/src/web/img/1024.png new file mode 100644 index 0000000..4ce3618 Binary files /dev/null and b/src/web/img/1024.png differ diff --git a/src/web/js/level2.js b/src/web/js/level2.js index a042a2b..bb11ea0 100644 --- a/src/web/js/level2.js +++ b/src/web/js/level2.js @@ -12,24 +12,24 @@ var t = new Trianglify( ); window.onresize = function() { - redraw(); + redraw(); }; redraw(); function redraw() { - var pattern = t.generate(window.innerWidth, window.innerHeight); - document.body.setAttribute('style', 'background-image: '+pattern.dataUrl); + var pattern = t.generate(window.innerWidth, window.innerHeight); + document.body.setAttribute('style', 'background-image: '+pattern.dataUrl); } function height() { - return Math.max( - document.body.scrollHeight, document.documentElement.scrollHeight, - document.body.offsetHeight, document.documentElement.offsetHeight, - document.body.clientHeight, document.documentElement.clientHeight - ); + return Math.max( + document.body.scrollHeight, document.documentElement.scrollHeight, + document.body.offsetHeight, document.documentElement.offsetHeight, + document.body.clientHeight, document.documentElement.clientHeight + ); } /** * END Trianglify - */ \ No newline at end of file + */