amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed #2806 and #2863

Browse source
This commit is contained in:
Levi 2017-01-09 19:49:10 -05:00
commit 640819c7de
3 changed files with 98 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
datacenterlight/templates/datacenterlight/index.html
View file

@ -262,11 +262,6 @@
{% csrf_token %} {% csrf_token %}
{{ form.non_field_errors }} {{ form.non_field_errors }}
{{ form.email.errors|striptags}} {{ form.email.errors|striptags}}
<div>
{% for message in messages %}
<strong>{{ message }}</strong>
{% endfor %}
</div>
<div class="form-group"> <div class="form-group">
<label class="sr-only" for="exampleInputEmail3">{% trans "Email address" %}</label> <label class="sr-only" for="exampleInputEmail3">{% trans "Email address" %}</label>
@ -276,6 +271,25 @@
</form> </form>
<div class="modal fade bs-example-modal-sm" style="color:black;" id="reques-success-message" 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">&times;</span></button>
<h4 class="modal-title">Request sent</h4>
</div>
<div class="modal-body">
<p>Thank you, we will contact you as soon as possible</p>
</div>
<div class="modal-footer text-center">
<button type="submit" class="btn btn-primary" data-dismiss="modal">Ok</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
</ul> </ul>
</div> </div>
</div> </div>
@ -360,6 +374,13 @@
style: 'btn-link', style: 'btn-link',
windowPadding: 10, windowPadding: 10,
}); });
var hash = window.location.hash.substr(1);
console.log(hash);
if (hash == 'requestform'){
$('#reques-success-message').modal('show');
}
}; };
</script> </script>

71
digitalglarus/templates/digitalglarus/login.html
View file

@ -43,9 +43,78 @@
{% endfor %} {% endfor %}
<p>{{form.non_field_errors|striptags}}</p> <p>{{form.non_field_errors|striptags}}</p>
<p class="signup-notice">By logging in you agree to our<a href=#terms>Terms of Service</a>.</p> <p class="signup-notice">By logging in you agree to our<a href="#terms" data-toggle="modal" data-target="#terms-condition-modal">Terms of Service</a>.</p>
<button type="submit" class="btn btn-primary btn-blue">Login</button> <button type="submit" class="btn btn-primary btn-blue">Login</button>
</form> </form>
<div class="modal fade bs-example-modal-sm" id="terms-condition-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">&times;</span></button>
<h4 class="modal-title">Terms of Service</h4>
</div>
<div class="modal-body">
<section id="price2">
<div class="container">
<!--<div class="row col-md-2 text-center wow fadeInDown"></div> -->
<div class="row col-xs-12 col-sm-7 col-lg-6 text-center wow fadeInDown">
<div class="price-box">
<span class="glyphicon glyphicon-flag"></span>
<h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2>
<h2 class="price">Valid from 31 October 2016, v1.0 dated 31 October 2016</h2>
<hr class="primary">
<div class="price-exp-box">
<p class="text-center">
<p class="term-head">1. Membership</p>
1.1. The membership fee is 35CHF per month and charged on the 1st day of each month after your first month of subscription. <br>
1.2. Each additional day costs 15CHF for members.<br>
<br>
<p class="term-head">2. Coworking days</p>
2.1. Coworking days are counted as 1 calendar day. <br>
2.2. Free coworking days are included in the membership. <br>
2.3. Unused working days are not refunded and can not be compensated for. <br><br>
<p class="term-head">3. Possible reduction</p>
3.1. Your first month's membership fee is calculated according to the date of your subscription. <br>
3.2. The days already passed in the first month are discounted from the first month's membership fee.<br>
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.<br><br>
<p class="term-head">4. Member's right to cancellation </p>
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. <br>
4.2. Bookings cancelled less than 7 days before the working date will not be refunded.<br><br>
<p class="term-head">5. Digital Glarus' right to cancel a membership </p>
5.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
5.2. Members disrupting the environment of coworking may be rejected to join the membership.<br><br>
<p class="term-head">6. Digital Glarus' right to cancel a membership </p>
6.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
6.2. Digital Glarus may reject a member who disrupts the environment of coworking space from joining the membership.<br>
6.3. Digital Glarus may terminate the membership of a member who disrupts the environment of coworking space. <br>
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.
<br><br>
</p>
<div class="row col-xs-12 col-sm-7 col-lg-6 text-center">
<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
</div>
<div class="row col-md-2 text-center wow fadeInDown">
</div>
</div>
</div>
</div>
<div class="row col-md-3 text-center wow fadeInDown"></div>
</div>
</section>
</div>
<div class="modal-footer text-center">
<button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">OK</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<br> <br>
<div class="notice-box"> <div class="notice-box">
<p class="signup-text">Forgot password?<a href="{% url 'digitalglarus:reset_password' %}">Find ID/Password</a></p> <p class="signup-text">Forgot password?<a href="{% url 'digitalglarus:reset_password' %}">Find ID/Password</a></p>

2
digitalglarus/templates/digitalglarus/supportus.html
View file

@ -151,7 +151,7 @@
<h2 class="whatwedo">What we do with your support</h2> <h2 class="whatwedo">What we do with your support</h2>
<p class="carousel-text text-center supporter-white">Discover how your donation is being used in renovating our coworking space!</p> <p class="carousel-text text-center supporter-white">Discover how your donation is being used in renovating our coworking space!</p>
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-3 supportus-posts"> <div class="col-md-7 col-md-offset-3 supportus-posts">
<div class="blog-list"> <div class="blog-list">
{% for post in post_list %} {% for post in post_list %}
{% include "ungleich/djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} {% include "ungleich/djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}