-
+
+
Digital Glarus
In der Au 7 Schwanden 8762 Switzerland diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html index a9ba743f..38fd706a 100644 --- a/digitalglarus/templates/digitalglarus/membership_payment.html +++ b/digitalglarus/templates/digitalglarus/membership_payment.html @@ -18,6 +18,7 @@ padding: .5em; padding-right: 1.5em } +
@@ -97,9 +98,10 @@
I accept the Digital Glarus Terms and Conditions, Community Guidelines and Privacy Policy
-
-
In der Au 7 Schwanden 8762 Switzerland diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html index a9ba743f..38fd706a 100644 --- a/digitalglarus/templates/digitalglarus/membership_payment.html +++ b/digitalglarus/templates/digitalglarus/membership_payment.html @@ -18,6 +18,7 @@ padding: .5em; padding-right: 1.5em } +
-
+
+
+
+
diff --git a/digitalglarus/templates/digitalglarus/supportus.html b/digitalglarus/templates/digitalglarus/supportus.html
new file mode 100644
index 00000000..f7445447
--- /dev/null
+++ b/digitalglarus/templates/digitalglarus/supportus.html
@@ -0,0 +1,178 @@
+{% extends "new_base_glarus.html" %}
+{% load staticfiles cms_tags %}
+
+{% block extra_css %}
+
+{% endblock %}
+
+
+{% block content %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html
index c5d683de..e47b9b65 100644
--- a/digitalglarus/templates/new_base_glarus.html
+++ b/digitalglarus/templates/new_base_glarus.html
@@ -7,7 +7,8 @@
-
+
+
@@ -80,14 +81,50 @@
color:white;
}
+
html,body{
- width: 100%;
- height: 100%;
- margin: 0px;
- padding: 0px;
- overflow-x: hidden;
-}
+ width: 100%;
+ height: 100%;
+ margin: 0px;
+ padding: 0px;
+ overflow-x: hidden;
+ }
+
+ @media only screen and (min-width: 769px){
+ .dropdown.home-dropdown-mobile {
+ display: none;
+ }
+ .dropdown.home-dropdown {
+ display: block;
+ }
+ }
+
+ @media only screen and (max-width: 768px){
+ .dropdown.home-dropdown-mobile {
+ display: block;
+ background-color:
+ }
+
+ .dropdown.home-dropdown-mobile .dropdown-menu{
+ display: block;
+ background-color: #0f1221;
+ }
+
+ .dropdown.home-dropdown-mobile .dropdown-menu li a {
+ color:white;
+ }
+ .dropdown.home-dropdown-mobile .dropdown-menu li a:hover {
+ color: #0f1221;
+ }
+
+ .dropdown.home-dropdown {
+ display: none;
+ }
+ }
+
+>>>>>>> upstream/feature/new_digitalglarus
+ {% block extra_css %} {% endblock %}
@@ -128,6 +165,29 @@
{% if request.user.is_authenticated %}
+
+
+ {{request.user.name}}
+
+
+
{{request.user.name}}
diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py
index 1a9850e0..335c039c 100644
--- a/digitalglarus/urls.py
+++ b/digitalglarus/urls.py
@@ -7,7 +7,9 @@ from .views import ContactView, IndexView, AboutView, HistoryView, LoginView, Si
MembershipPricingView, BookingSelectDatesView, BookingPaymentView, OrdersBookingDetailView,\
BookingOrdersListView, MembershipOrdersListView, OrdersMembershipDetailView, \
MembershipDeactivateView, MembershipDeactivateSuccessView, UserBillingAddressView, \
- MembershipReactivateView,TermsAndConditions,ValidateUser
+ MembershipReactivateView,TermsAndConditions,ValidateUser,SupportusView
+
+
# from membership.views import LoginRegistrationView
urlpatterns = [
@@ -15,6 +17,7 @@ urlpatterns = [
url(_(r'login/validate/(?P\!\w+)/?$'), ValidateUser.as_view(), name='validate-login'),
url(_(r'^$'), IndexView.as_view(), name='landing'),
url(_(r'terms_conditions/?$'), TermsAndConditions.as_view(), name='TermsAndConditions'),
+ url(_(r'support-us/?$'), SupportusView.as_view(), name='supportus'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'login/?$'), LoginView.as_view(), name='login'),
url(_(r'signup/?$'), SignupView.as_view(), name='signup'),
@@ -50,7 +53,7 @@ urlpatterns = [
url(_(r'supporters/?$'), views.supporters, name='supporters'),
url(r'calendar_api/(?P\d+)/(?P\d+)?$', views.CalendarApi.as_view(),name='calendar_api_1'),
url(r'calendar_api/', views.CalendarApi.as_view(),name='calendar_api'),
- url(_(r'support-us/?$'), views.support, name='support'),
+ # url(_(r'support-us/?$'), views.support, name='support'),
url(r'^blog/(?P\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
url(r'blog/$', views.blog, name='blog'),
]
diff --git a/digitalglarus/views.py b/digitalglarus/views.py
index e48661fa..b05c4d2c 100644
--- a/digitalglarus/views.py
+++ b/digitalglarus/views.py
@@ -81,6 +81,19 @@ class IndexView(TemplateView):
template_name = "digitalglarus/index.html"
+class SupportusView(TemplateView):
+ template_name = "digitalglarus/supportus.html"
+
+ def get_context_data(self, *args, **kwargs):
+ context = super(SupportusView, self).get_context_data(**kwargs)
+ tags = ["dg-renovation"]
+ posts = Post.objects.filter(tags__name__in=tags, publish=True).translated(get_language())
+ context.update({
+ 'post_list': posts
+ })
+ return context
+
+
class LoginView(LoginViewMixin):
template_name = "digitalglarus/login.html"
form_class = LoginForm
diff --git a/requirements.txt b/requirements.txt
index 4619fae8..af6fee18 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,53 +1,86 @@
+Babel==2.3.4
Django==1.9.4
-aldryn-newsblog
-wheel
-django-bootstrap3
-django-cms
-django-compressor
-django-filter
-django-taggit
-django-taggit-autosuggest
-django-taggit-templatetags
-django-templatetag-sugar
-django-model-utils
-djangocms-blog
-django-dotenv
-psycopg2
-django-mptt
-easy_thumbnails
-django-polymorphic
-model-mommy
-pycryptodome
-django-stored-messages
-django-guardian
+Django-Select2==4.3.2
+Pillow==3.2.0
+URLObject==2.4.0
+Unidecode==0.04.19
+YURL==0.13
+aldryn-apphooks-config==0.2.7
+aldryn-boilerplates==0.7.4
+aldryn-categories==1.0.3
+aldryn-common==1.0.1
+aldryn-newsblog==1.2.1
+aldryn-people==1.2.0
+aldryn-reversion==1.0.8
+aldryn-search==0.2.11
+aldryn-translation-tools==0.2.1
+backport-collections==0.1
+cmsplugin-filer==1.0.1
+django-appconf==1.0.2
+django-appdata==0.1.5
+django-bootstrap3==7.0.1
+django-classy-tags==0.7.2
+django-cms==3.2.5
+django-compressor==2.0
+django-debug-toolbar==1.4
+django-dotenv==1.4.1
+django-extensions==1.6.7
+django-filer==1.2.0
+django-filter==0.13.0
+django-formtools==1.0
+django-guardian==1.4.4
+django-haystack==2.4.1
+django-meta==1.2
+django-meta-mixin==0.3.0
+django-model-utils==2.5
+django-mptt==0.8.4
+django-parler==1.6.3
+django-phonenumber-field==1.1.0
+django-polymorphic==0.9.2
+django-reversion==1.10.2
+django-sekizai==0.9.0
+django-sortedm2m==1.2.2
+django-spurl==0.6.4
+django-standard-form==1.1.1
+django-stored-messages==1.4.0
+django-taggit==0.18.3
+django-taggit-autosuggest==0.2.8
+django-taggit-templatetags==0.2.5
+django-templatetag-sugar==1.0
+django-treebeard==4.0.1
+djangocms-admin-style==1.1.1
+djangocms-apphook-setup==0.1.2
+djangocms-blog==0.7.0
+djangocms-file==1.0
+djangocms-flash==0.3.0
+djangocms-googlemap==0.4.0
+djangocms-inherit==0.2.1
+djangocms-link==1.7.2
+djangocms-page-meta==0.5.11
+djangocms-picture==1.0.0
+djangocms-teaser==0.2.0
+djangocms-text-ckeditor==2.9.3
+djangocms-video==1.0.0
+easy-thumbnails==2.3
+html5lib==0.9999999
+lxml==3.6.0
+model-mommy==1.2.6
+phonenumbers==7.4.0
+phonenumberslite==7.4.0
+psycopg2==2.6.1
+pycryptodome==3.4
+pylibmc==1.5.1
+python-dateutil==2.5.3
+python-slugify==1.2.0
+pytz==2016.4
+rcssmin==1.0.6
+requests==2.10.0
+rjsmin==1.0.12
+six==1.10.0
+sqlparse==0.1.19
+stripe==1.33.0
+wheel==0.29.0
-#PLUGINS
-djangocms_flash
-djangocms_googlemap
-djangocms_inherit
-djangocms_link
-djangocms_teaser
-djangocms_page_meta
-djangocms_text_ckeditor
-djangocms_file
-djangocms_picture
-djangocms_video
-#PAYMENT
-stripe
-django-treebeard
-django-sekizai
-django-classy-tags
-djangocms-admin-style
-html5lib
-six
-# Optional, recommended packages
-Pillow>=2
-django-filer
-cmsplugin-filer
-django-reversion
-pylibmc
-django_extensions
-django-debug-toolbar
\ No newline at end of file
diff --git a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
index 0c683d9f..16a7040a 100644
--- a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
+++ b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html
@@ -31,7 +31,7 @@
+
+
+
+
+
+ +
+
+
+ Become Our Supporter
+
+
+
+
+
+
+
+
+
+ 3 Ways to Help
+ +The First Coworking Space of Glarus was not possible without our
+ supporters.
+ Be our supporter today and help us realize our dream coworking space!
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+ Get our news
+ +
+
+
+ +
Subscribe to our mailing list and stay informed on our news at Digital Glarus! + We'll keep you up to date to our events and send you special invitations!
+ + +
+
+
+
+ 
+
+
+
+
+
+
+ Connect and Share
+ +
+
+
+
+ +
Share your experience at Digital Glarus with your friends and collegues, let the other discover our coworking space!
+ + +
+
+
+
+ 
+
+
+
+
+
+
+ + Donate now +
+ +
+
+
+ +
Your donation helps us renovate our 100+years old coworking space! This very old house needs a lot of love.
+ +
+
+
+
+
+
+ What we do with your support
+Discover how your donation is being used in renovating our coworking space!
+
+
+
+
+
+
+ {% for post in post_list %}
+ {% include "ungleich/djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+ Digital Glarus
+ In der Au 7 Schwanden 8762 Switzerland +
info@digitalglarus.ch +
+ (044) 534-66-22 +
+ + In der Au 7 Schwanden 8762 Switzerland +
info@digitalglarus.ch +
+ (044) 534-66-22 +
+ +
+
-
+
- + + {% trans "Bookings"%} + + +
- + {% trans "Membership"%} + + +
- + + + {% trans "Logout"%} + + +
- {% if not TRUNCWORDS_COUNT %} + {% if not TRUNCWORDS_COUNT %} {% render_model post "abstract" %} {% else %} {% render_model post "abstract" "" "" 'truncatewords_html:TRUNCWORDS_COUNT' %}