Adds small info to the meetup if the location is Google+. Closes #7

pygraz_website/static/s/src/frontpage.scss

@@ -48,6 +48,10 @@
         margin-top: 10px;
         border: 1px solid #444;
     }
+    p {
+        margin-top: 10px;
+        line-height: 1.5em;
+    }
 }
 
 h2 {

pygraz_website/static/s/src/screen.scss

@@ -387,3 +387,7 @@ form {
 .email-status-bounded, .email-status-not_verified {
     color: red;
 }
+.locationinfo {
+    line-height: 1.5em;
+    margin-top: 10px;
+}

pygraz_website/templates/account/edit_profile.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
-{% import "forms.html" as forms %}
-{% import "base.html" as base with context %}
+{% import "helpers/forms.html" as forms %}
+{% import "helpers/base.html" as base with context %}
 {% block title %}Profil ändern{% endblock %}
 {% block bodyclass %}editprofile{% endblock %}
 {% block body %}

pygraz_website/templates/account/login.html

@@ -1,5 +1,5 @@
 {% extends "base.html"%}
-{% import "forms.html" as forms %}
+{% import "helpers/forms.html" as forms %}
 {% block bodyclass %}loginpage nosidebar{% endblock %}
 {% block title %}Anmelden{% endblock %}
 {% block body %}

pygraz_website/templates/account/register.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% import "forms.html" as forms %}
+{% import "helpers/forms.html" as forms %}
 {% block body %}
 <form method="post">
     <div>

pygraz_website/templates/base.html

@@ -76,8 +76,3 @@
         </div>
     </body>
 </html>
-{% macro email_status(status) -%}
-    {% if status == 'not_verified' %}Noch nicht aktiviert{% endif %}
-    {% if status == 'active' %}Aktiviert{% endif %}
-    {% if status == 'bounced' %}Nicht erreichbar{% endif %}
-{%- endmacro %}

pygraz_website/templates/companies/edit.html

@@ -1,6 +1,6 @@
 {% extends "companies/base.html" %}
 {% block title %}Firmenprofil von {{ doc.name }} ändern{% endblock %}
-{% import "forms.html" as forms %}
+{% import "helpers/forms.html" as forms %}
 {% block body %}
 <h1>Firmenprofil von {{ doc.name }} ändern</h1>
 <form method="post">

pygraz_website/templates/helpers/base.html

@@ -0,0 +1,15 @@
+{% macro email_status(status) -%}
+    {% if status == 'not_verified' %}Noch nicht aktiviert{% endif %}
+    {% if status == 'active' %}Aktiviert{% endif %}
+    {% if status == 'bounced' %}Nicht erreichbar{% endif %}
+{%- endmacro %}
+
+{% macro location_info(location) -%}
+    <div class="locationinfo">
+    {% if location == 'Google+' %}
+        <p>Dieses Treffen findet als Google+ Hangout auf unserer <a href="https://plus.google.com/101185345132127945047/posts">Google+ Page</a> statt.
+        Mehr Information zu Hangouts und wie du daran teilnehmen kannst, findest du <a href="http://support.google.com/plus/bin/answer.py?hl=de&answer=1349254&topic=1651547&ctx=topic">hier</a>.
+        </p>
+    {% endif %}
+    </div>
+{%- endmacro %}

pygraz_website/templates/index.html

@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block nav_start %}active{% endblock %}
 {% block bodyclass %}frontpage{% endblock %}
+{% import "helpers/base.html" as base with context %}
 {% block head %}
 <link rel="stylesheet" href="/static/s/frontpage.css" type="text/css" media="screen" />
 {% endblock %}
@@ -36,16 +37,23 @@ <h2>Nächstes Treffen</h2>
         <p><a href="{{ url_for('meetups.meetup', date=next_meetup.start|datecode)}}">{{ next_meetup.start|date }}</a>,
         {{ next_meetup.start|time }} - {{ next_meetup.end|time }}
         {% if next_meetup.location %}
-        <br />{{ next_meetup.location.name }}
-        {% if next_meetup.location.address %}
-        , {{ next_meetup.location.address }}
-        {% endif %}
+            {% if next_meetup.location == 'Google+' %}
+                {{ base.location_info(next_meetup.location) }}
+            {% else %}
+                <br />{{ next_meetup.location }}
+                {% if next_meetup.address %}
+                , {{ next_meetup.address }}
+                {% endif %}
+            {% endif %}
         {% endif %}
         </p>
         {% if next_meetup and next_meetup.address %}
             <iframe id="map" width="423" height="350" frameborder="0" scrolling="no" 
                 marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q={{ next_meetup.address|urlencode }}&amp;output=embed"></iframe>
         {% endif %}
+        {% else %}
+        <p>Derzeit ist kein Treffen geplant. In der Regel findet aber so etwas einmal im Monat statt, weshalb sich
+        dieser leere Fleck sicher bald füllen sollte :-)</p>
         {% endif %}
     </div>
     <div id="news">

pygraz_website/templates/meetup.html

@@ -1,4 +1,5 @@
 {% extends "meetups/base.html" %}
+{% import "helpers/base.html" as base with context %}
 {% block title %}Treffen vom {{ meetup.start|date }}{% endblock %}
 {% block body %}
     <h1>Treffen vom {{ meetup.start|date }}</h1>
@@ -81,11 +82,14 @@ <h1>Themenvorschläge</h1>
             <dt>Ort:</dt>
             <dd>{{ meetup.location }}</dd>
         </dl>
+        {% if meetup.address %}
         <dl>
             <dt>Adresse:</dt>
             <dd>{{ meetup.address }}</dd>
         </dl>
         {% endif %}
+        {{ base.location_info(meetup.location) }}
+        {% endif %}
     </div>
 </div>
 {% include "_docinfo.html" %}

pygraz_website/templates/meetups/add_idea.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% import "forms.html" as forms %}
+{% import "helpers/forms.html" as forms %}
 {% block body %}
     <form method="POST">
         <div>

pygraz_website/templates/meetups/edit.html

@@ -1,5 +1,5 @@
 {% extends "meetups/base.html" %}
-{% import "forms.html" as forms %}
+{% import "helpers/forms.html" as forms %}
 {% block body %}
 {% if preview %}
 <div id="preview">