From b299a0383f3ee231e897b07f529f0cb3cb51b8cc Mon Sep 17 00:00:00 2001 From: Natacha Quintero Date: Mon, 21 Nov 2016 20:26:03 -0430 Subject: [PATCH 1/4] terms and conditions --- .../digitalglarus/booking_payment.html | 2 +- .../digitalglarus/membership_payment.html | 2 +- .../templates/digitalglarus/terms.html | 261 ++++++++++++++++++ digitalglarus/urls.py | 3 +- digitalglarus/views.py | 3 + dynamicweb/settings/base.py | 2 + 6 files changed, 270 insertions(+), 3 deletions(-) create mode 100755 digitalglarus/templates/digitalglarus/terms.html diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html index 2f57361e..acf459b2 100644 --- a/digitalglarus/templates/digitalglarus/booking_payment.html +++ b/digitalglarus/templates/digitalglarus/booking_payment.html @@ -164,7 +164,7 @@
- I accept the Digital Glarus Terms and Conditions, Community Guidelines and Privacy Policy + I accept the Digital Glarus Terms and Conditions, Community Guidelines and Privacy Policy
diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html index 6f5dd384..a9ba743f 100644 --- a/digitalglarus/templates/digitalglarus/membership_payment.html +++ b/digitalglarus/templates/digitalglarus/membership_payment.html @@ -95,7 +95,7 @@
- I accept the Digital Glarus Terms and Conditions, Community Guidelines and Privacy Policy + I accept the Digital Glarus Terms and Conditions, Community Guidelines and Privacy Policy
diff --git a/digitalglarus/templates/digitalglarus/terms.html b/digitalglarus/templates/digitalglarus/terms.html new file mode 100755 index 00000000..a9defa21 --- /dev/null +++ b/digitalglarus/templates/digitalglarus/terms.html @@ -0,0 +1,261 @@ +{% extends "new_base_glarus.html" %} +{% load staticfiles cms_tags bootstrap3%} +{% load staticfiles bootstrap3 i18n %} +{% block content %} + + + + + + + + + + + Digital Glarus + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +

General Terms & Conditions of Digital Glarus Membership

+

Valid from 31 October 2016, v1.0 dated 31 October 2016

+
+
+

+

1. Membership

+ 1.1. The membership fee is 35CHF per month and charged on the 1st day of each month after your first month of subscription.
+ 1.2. Each additional day costs 15CHF for members.
+
+

2. Coworking days

+ 2.1. Coworking days are counted as 1 calendar day.
+ 2.2. Free coworking days are included in the membership.
+ 2.3. Unused working days are not refunded and can not be compensated for.

+

3. Possible reduction

+ 3.1. Your first month's membership fee is calculated according to the date of your subscription.
+ 3.2. The days already passed in the first month are discounted from the first month's membership fee.
+ 3.3. A member booking more than 19 days for coworking gets a reduction in total cost and will only pay maximum 290CHF per month. The reduction will be applied automatically on Digital Glarus website.

+

4. Member's right to cancellation

+ 4.1. The member may cancel or change the booking of working day at any time prior to 7 days before the working day with no extra cost.
+ 4.2. Bookings cancelled less than 7 days before the working date will not be refunded.

+

5. Digital Glarus' right to cancel a membership

+ 5.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.
+ 5.2. Members disrupting the environment of coworking may be rejected to join the membership.

+

6. Digital Glarus' right to cancel a membership

+ 6.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.
+ 6.2. Digital Glarus may reject a member who disrupts the environment of coworking space from joining the membership.
+ 6.3. Digital Glarus may terminate the membership of a member who disrupts the environment of coworking space.
+ 6.4. Digital Glarus may expell a member who disrupts the environment of coworking space from the coworking space, stating the reasons for the expulsion. +

+ +

+
+ +
+
+
+
+ +
+
+
+
+
+ + + + +
+
+
+
+ Digital Glarus
+ In der Au 7 Schwanden 8762 Switzerland +
info@digitalglarus.ch +
+ (044) 534-66-22 +

 

+ +
+

 

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{% endblock %} \ No newline at end of file diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index 488ba1d3..1d13e8f2 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -7,11 +7,12 @@ from .views import ContactView, IndexView, AboutView, HistoryView, LoginView, Si MembershipPricingView, BookingSelectDatesView, BookingPaymentView, OrdersBookingDetailView,\ BookingOrdersListView, MembershipOrdersListView, OrdersMembershipDetailView, \ MembershipDeactivateView, MembershipDeactivateSuccessView, UserBillingAddressView, \ - MembershipReactivateView + MembershipReactivateView,TermsAndConditions # from membership.views import LoginRegistrationView urlpatterns = [ url(_(r'^$'), IndexView.as_view(), name='landing'), + url(_(r'terms_conditions/?$'), TermsAndConditions.as_view(), name='TermsAndConditions'), url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(_(r'login/?$'), LoginView.as_view(), name='login'), url(_(r'signup/?$'), SignupView.as_view(), name='signup'), diff --git a/digitalglarus/views.py b/digitalglarus/views.py index fabf7c93..4b18333a 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -41,6 +41,9 @@ from .models import MembershipType, Membership, MembershipOrder, Booking, Bookin from .mixins import MembershipRequiredMixin, IsNotMemberMixin +class TermsAndConditions(TemplateView): + template_name ="digitalglarus/terms.html" + class IndexView(TemplateView): template_name = "digitalglarus/index.html" diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 4c6dffa4..be4c5745 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -182,6 +182,8 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': 'app', + 'HOST': 'db', + 'USER': 'app' } } From 569dd1b9e5876c28d950935de903757270f29c79 Mon Sep 17 00:00:00 2001 From: Natacha Quintero Date: Tue, 22 Nov 2016 00:52:51 -0430 Subject: [PATCH 2/4] finished the problem of the white margin --- digitalglarus/templates/new_base_glarus.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html index b156dd45..c5d683de 100644 --- a/digitalglarus/templates/new_base_glarus.html +++ b/digitalglarus/templates/new_base_glarus.html @@ -79,6 +79,14 @@ margin: 0px; color:white; } + + html,body{ + width: 100%; + height: 100%; + margin: 0px; + padding: 0px; + overflow-x: hidden; +} From addf3de67e67d3de5bf2472d20a3179ca9f1037f Mon Sep 17 00:00:00 2001 From: Natacha Quintero Date: Tue, 22 Nov 2016 11:25:03 -0430 Subject: [PATCH 3/4] fixing the base.py --- dynamicweb/settings/base.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index be4c5745..22591a2a 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -181,9 +181,7 @@ CMS_TEMPLATES = ( DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'app', - 'HOST': 'db', - 'USER': 'app' + 'NAME': 'app' } } From b8d576f6ce7643d594d058e64fb3983ca6968190 Mon Sep 17 00:00:00 2001 From: Natacha Quintero Date: Sun, 27 Nov 2016 00:21:01 -0430 Subject: [PATCH 4/4] hover animation,broken url --- .../templates/digitalglarus/index.html | 194 ++++++++++++++++-- digitalglarus/urls.py | 4 +- digitalglarus/views.py | 32 +++ 3 files changed, 214 insertions(+), 16 deletions(-) diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html index 152dd48e..86bcfeba 100644 --- a/digitalglarus/templates/digitalglarus/index.html +++ b/digitalglarus/templates/digitalglarus/index.html @@ -34,6 +34,100 @@ -->
+ + + + + @@ -145,9 +239,10 @@
+
-
+
+ + + +