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/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 @@
+
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +

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/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html index 7c049356..e47b9b65 100644 --- a/digitalglarus/templates/new_base_glarus.html +++ b/digitalglarus/templates/new_base_glarus.html @@ -81,6 +81,15 @@ color:white; } + + html,body{ + width: 100%; + height: 100%; + margin: 0px; + padding: 0px; + overflow-x: hidden; + } + @media only screen and (min-width: 769px){ .dropdown.home-dropdown-mobile { display: none; @@ -113,6 +122,7 @@ } } +>>>>>>> upstream/feature/new_digitalglarus {% block extra_css %} {% endblock %} diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index 09678b96..335c039c 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -7,11 +7,16 @@ from .views import ContactView, IndexView, AboutView, HistoryView, LoginView, Si MembershipPricingView, BookingSelectDatesView, BookingPaymentView, OrdersBookingDetailView,\ BookingOrdersListView, MembershipOrdersListView, OrdersMembershipDetailView, \ MembershipDeactivateView, MembershipDeactivateSuccessView, UserBillingAddressView, \ - MembershipReactivateView, SupportusView + MembershipReactivateView,TermsAndConditions,ValidateUser,SupportusView + + # from membership.views import LoginRegistrationView 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'), diff --git a/digitalglarus/views.py b/digitalglarus/views.py index 39b7ae32..b05c4d2c 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -41,6 +41,41 @@ from .models import MembershipType, Membership, MembershipOrder, Booking, Bookin from .mixins import MembershipRequiredMixin, IsNotMemberMixin +class ValidateUser(TemplateView): + #print ("ENTRE AQUI AL MENOS Y",pk) + template_name = "digitalglarus/signup.html" + #form_class = SignupForm + success_url = reverse_lazy('digitalglarus:login') + #if request.method == 'POST': + #u = U.objects.get(pk = pk) + #u.is_active = True + #u.save() + #messages.info(request, 'Usuario Activado') + #Log('activar','usuario',request) + #resp = dict() + #resp['msg'] = 0 #0 para exito + #return HttpResponse(json.dumps(resp), content_type ='application/json') + +class ValidateView(SignupViewMixin): + template_name = "digitalglarus/signup.html" + form_class = SignupForm + success_url = reverse_lazy('digitalglarus:login') + + + #def activarUsuario(request, pk): + #if request.method == 'POST': + # u = U.objects.get(pk = pk) + # u.is_active = True + # u.save() + # messages.info(request, 'Usuario Activado') + # Log('activar','usuario',request) + #resp = dict() + #resp['msg'] = 0 #0 para exito + #return HttpResponse(json.dumps(resp), content_type ='application/json') + +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..22591a2a 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -181,7 +181,7 @@ CMS_TEMPLATES = ( DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'app', + 'NAME': 'app' } }