narbar
This commit is contained in:
		
					parent
					
						
							
								c78eb5fe58
							
						
					
				
			
			
				commit
				
					
						855c8f1140
					
				
			
		
					 5 changed files with 128 additions and 10 deletions
				
			
		|  | @ -0,0 +1,106 @@ | |||
| {% extends "new_base_glarus.html" %} | ||||
| {% load staticfiles cms_tags bootstrap3%} | ||||
| {% block title %}crowdfunding{% endblock %} | ||||
| 
 | ||||
| {% block content %} | ||||
| 
 | ||||
| <style type="text/css"> | ||||
| 
 | ||||
|   #cancel-subscription-modal{ | ||||
|     margin-top:10%;     | ||||
|   } | ||||
| 
 | ||||
|   #cancel-subscription-modal .modal-header{ | ||||
|     border-bottom: none; | ||||
|   } | ||||
| 
 | ||||
|   #cancel-subscription-modal .modal-footer{ | ||||
|     border-top: none; | ||||
|     text-align: center; | ||||
|   } | ||||
| 
 | ||||
| </style> | ||||
| 
 | ||||
|   <section id="price"> | ||||
|     <div class="signup-container"> | ||||
| 	  <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div> | ||||
|       <div class="col-xs-12 col-sm-6 col-lg-4 text-center wow fadeInDown">  | ||||
|      | ||||
|          <!-- <span class="glyphicon glyphicon-user"></span> --> | ||||
|           <div class="payment-box"> | ||||
|              <h2 class="billing-head">Membership Deactivation</h2>  | ||||
|              <hr class="greyline-long"> | ||||
|                <h2 class="membership-lead">Do you want to cancel your membership with us ?</h2> | ||||
|                <div class="date-box"> | ||||
|                  </div> | ||||
|                  <!--<hr class="primary">--> | ||||
|                       <div class="signup-form form-group row"> | ||||
|                        | ||||
|                         <div class="button-booking-box form-inline row"> | ||||
| 
 | ||||
|                           <form method="POST" action=""> | ||||
|                             {% csrf_token %}  | ||||
|                             <button type="button" class="btn btn-primary btn-blue" data-toggle="modal" data-target="#cancel-subscription-modal">Cancel my Membership</button> | ||||
|                             <a class="btn btn-primary btn-blue" href="{{request.META.HTTP_REFERER}}">Go back</a> | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|                             <div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog"> | ||||
|                               <div class="modal-dialog" role="document"> | ||||
|                                 <div class="modal-content"> | ||||
|                                   <div class="modal-header"> | ||||
|                                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> | ||||
|                                     <h4 class="modal-title">Cancel Subscription</h4> | ||||
|                                   </div> | ||||
|                                   <div class="modal-body"> | ||||
|                                     <p>Do you want to cancel your subscription?</p> | ||||
|                                   </div> | ||||
|                                   <div class="modal-footer text-center"> | ||||
|                                     <button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button> | ||||
|                                     <button type="submit" class="btn btn-primary">Yes</button> | ||||
|                                   </div> | ||||
|                                 </div><!-- /.modal-content --> | ||||
|                               </div><!-- /.modal-dialog --> | ||||
|                             </div><!-- /.modal --> | ||||
| 
 | ||||
| 
 | ||||
|                           </form> | ||||
| 
 | ||||
|                         </div> | ||||
|                           <div class="notice-box text-left"> | ||||
|                             <p class="order-bottom-text"> | ||||
|                               Your membership wouldn't be automatically renewed each month. | ||||
|                             </p> | ||||
|                          </div> | ||||
|                       </div> | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|          | ||||
|       </div>        | ||||
|      <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div> | ||||
|       </div> | ||||
|     </div>  | ||||
|     </div> | ||||
|       </div> | ||||
|     </div>    | ||||
|   </section> | ||||
|   <section id="contact"> | ||||
|     <div class="fill"> | ||||
|      <div class="row" class="wow fadeInDown"> | ||||
|       <div class="col-lg-12 text-center wow fadeInDown"> | ||||
|           <div class="col-md-4 map-title"> | ||||
|             Digital Glarus<br> | ||||
|             <span class="map-caption">In der Au 7 Schwanden 8762 Switzerland | ||||
|             <br>info@digitalglarus.ch | ||||
|             <br> | ||||
|             (044) 534-66-22 | ||||
|             <p> </p> | ||||
|             </span> | ||||
|           </div> | ||||
|            <p> </p> | ||||
|         </div> | ||||
|       </div> | ||||
|     </div> | ||||
|   </section> | ||||
| {% endblock %}  | ||||
|  | @ -122,7 +122,7 @@ | |||
|         } | ||||
|       } | ||||
| 
 | ||||
| >>>>>>> upstream/feature/new_digitalglarus | ||||
| 
 | ||||
|     </style> | ||||
|     {% block extra_css %} {% endblock %} | ||||
|   </head> | ||||
|  | @ -142,17 +142,17 @@ | |||
|         <span class="icon-bar"></span> | ||||
|         <span class="icon-bar"></span> | ||||
|       </button> | ||||
|       <p><a class="navbar-brand page-scroll"href="{% url 'digitalglarus:landing' %}"><img src="{% static 'digitalglarus/img/logo_white.svg' %}"></a></p> | ||||
|       <p><a class="navbar-brand page-scroll" href="{% url 'digitalglarus:landing' %}"><img src="{% static 'digitalglarus/img/logo_white.svg' %}"></a></p> | ||||
|     </div> | ||||
| 
 | ||||
|     <!-- Collect the nav links, forms, and other content for toggling --> | ||||
|     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> | ||||
|       <ul class="nav navbar-nav navbar-right"> | ||||
|       <ul class="nav navbar-nav navbar-right" style="margin-right: -; margin-left: 0px;margin-right: 0px;"> | ||||
|         <li class="hidden active"> | ||||
|           <a href="#page-top"></a> | ||||
|         </li> | ||||
|         <li> | ||||
|           <a class="page-scroll" href="{% url 'digitalglarus:booking' %}">booking & price</a> | ||||
|           <a class="page-scroll" href="{% url 'digitalglarus:booking' %}" >booking & price</a> | ||||
|         </li> | ||||
|         <li> | ||||
|           <a class="page-scroll" href="{% url 'digitalglarus:history' %}">history</a> | ||||
|  | @ -164,12 +164,15 @@ | |||
|           <a class="page-scroll" href="#contact">Contact</a> | ||||
|         </li> | ||||
| 
 | ||||
| 		 | ||||
|         {% if request.user.is_authenticated %} | ||||
|         <li class="dropdown home-dropdown-mobile open"> | ||||
| 
 | ||||
| 		 | ||||
| 		<li class="dropdown home-dropdown-mobile open"> | ||||
|           <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#"> | ||||
|             <i class="glyphicon glyphicon-user"></i>{{request.user.name}} <span class="caret"></span> | ||||
|           </a> | ||||
|           <ul id="g-account-menu" class="dropdown-menu" role="menu"> | ||||
|           <ul id="g-account-menu" class="dropdown-menu" role="menu" aria-hidden="true"> | ||||
|             <li> | ||||
|               <a href="{% url 'digitalglarus:booking_orders_list' %}"> | ||||
|                 <i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%} | ||||
|  |  | |||
|  | @ -7,13 +7,14 @@ from .views import ContactView, IndexView, AboutView, HistoryView, LoginView, Si | |||
|     MembershipPricingView, BookingSelectDatesView, BookingPaymentView, OrdersBookingDetailView,\ | ||||
|     BookingOrdersListView, MembershipOrdersListView, OrdersMembershipDetailView, \ | ||||
|     MembershipDeactivateView, MembershipDeactivateSuccessView, UserBillingAddressView, \ | ||||
|     MembershipReactivateView,TermsAndConditions,ValidateUser,SupportusView | ||||
|     MembershipReactivateView,TermsAndConditions,ValidateUser,SupportusView,Probar | ||||
| 
 | ||||
| 
 | ||||
| # from membership.views import LoginRegistrationView | ||||
| 
 | ||||
| urlpatterns = [ | ||||
| 
 | ||||
| 	url(_(r'probar/?$'), Probar, name='probar'), | ||||
|     url(_(r'login/validate/(?P<pk>\!\w+)/?$'), ValidateUser.as_view(), name='validate-login'), | ||||
|     url(_(r'^$'), IndexView.as_view(), name='landing'), | ||||
|     url(_(r'terms_conditions/?$'), TermsAndConditions.as_view(), name='TermsAndConditions'), | ||||
|  |  | |||
|  | @ -41,6 +41,13 @@ from .models import MembershipType, Membership, MembershipOrder, Booking, Bookin | |||
| 
 | ||||
| from .mixins import MembershipRequiredMixin, IsNotMemberMixin | ||||
| 
 | ||||
| class Probar(LoginRequiredMixin, UpdateView): | ||||
| 	template_name='digitalglarus/membership_deactivated.html' | ||||
| 	model = Membership | ||||
| 	success_url = reverse_lazy('digitalglarus:probar') | ||||
| 	 | ||||
| 	 | ||||
| 
 | ||||
| class ValidateUser(TemplateView): | ||||
|     #print ("ENTRE AQUI AL MENOS Y",pk) | ||||
|     template_name = "digitalglarus/signup.html" | ||||
|  |  | |||
|  | @ -182,6 +182,7 @@ DATABASES = { | |||
|     'default': { | ||||
|         'ENGINE': 'django.db.backends.postgresql_psycopg2', | ||||
|         'NAME': 'app' | ||||
| 
 | ||||
|     } | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue