Download as
Browse Code »

Commit 34f3c2c1309c8d8037d54ddf839d0b058fd32746

Authored by Zambom
1 parent 90c7e378
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adjusting alignment of outside pages

Showing 6 changed files with 111 additions and 105 deletions   Show diff stats
amadeus/static/js/main.js
  Diff comments   View file @34f3c2c
1 $(function () { 1 $(function () {
2 var locale = $("body").data('lang'); 2 var locale = $("body").data('lang');
  3 +
  4 + if (!$("#sidebar-menu-div").children().length > 0) {
  5 + //$("#sidebar-menu-div").remove();
  6 + $("#page_content").switchClass('col-md-11', 'col-md-12', 0);
  7 + $("#page_content").switchClass('col-lg-11', 'col-lg-12', 0);
  8 + }
3 9
4 $('.datetime-picker').datetimepicker({ 10 $('.datetime-picker').datetimepicker({
5 locale: locale 11 locale: locale
amadeus/templates/base.html
  Diff comments   View file @34f3c2c
@@ -256,7 +256,7 @@ @@ -256,7 +256,7 @@
256 {% endblock %} 256 {% endblock %}
257 </div> 257 </div>
258 258
259 - <div class="col-xs-12 col-sm-12 col-md-11 col-lg-11"> 259 + <div id="page_content" class="col-xs-12 col-sm-12 col-md-11 col-lg-11">
260 {% block breadcrumbs %} 260 {% block breadcrumbs %}
261 {% breadcrumb 'Home' 'home' %} 261 {% breadcrumb 'Home' 'home' %}
262 {% endblock %} 262 {% endblock %}
users/templates/users/forgot_password.html
  Diff comments   View file @34f3c2c
@@ -14,46 +14,46 @@ @@ -14,46 +14,46 @@
14 14
15 {% block content %} 15 {% block content %}
16 <div class="row"> 16 <div class="row">
17 - <div class="col-lg-offset-1 col-md-offset-1">  
18 - <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus">  
19 - </div> 17 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
  18 + <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus">
  19 + </div>
20 </div> 20 </div>
21 21
22 <div class="row"> 22 <div class="row">
23 - <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-9 col-md-9 col-sm-10">  
24 - {% if messages %}  
25 - {% for message in messages %}  
26 - <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">  
27 - <button type="button" class="close" data-dismiss="alert" aria-label="Close">  
28 - <span aria-hidden="true">&times;</span>  
29 - </button>  
30 - <p>{{ message }}</p>  
31 - </div>  
32 - {% endfor %}  
33 - {% endif %} 23 + <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-8 col-md-8 col-sm-10">
  24 + {% if messages %}
  25 + {% for message in messages %}
  26 + <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
  27 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  28 + <span aria-hidden="true">&times;</span>
  29 + </button>
  30 + <p>{{ message }}</p>
  31 + </div>
  32 + {% endfor %}
  33 + {% endif %}
34 34
35 - <div class="card">  
36 - <div class="card-block">  
37 - <div class="row">  
38 - <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center">  
39 - <h2 class="outside-title"><strong> {% trans 'Forgot Password' %} </strong></h2>  
40 - <p>{% trans 'Enter your email below (the one used to access the platform) to recover your password' %}</p>  
41 - </div>  
42 - </div>  
43 -  
44 - <form id="form-reset" method="post" action="">  
45 - {% csrf_token %}  
46 - {% for field in form %}  
47 - <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">  
48 - <div class="form-group{% if form.has_error %} has-error {% endif %}">  
49 - {% render_field field class='form-control' %} 35 + <div class="card">
  36 + <div class="card-block">
  37 + <div class="row">
  38 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center">
  39 + <h2 class="outside-title"><strong> {% trans 'Forgot Password' %} </strong></h2>
  40 + <p>{% trans 'Enter your email below (the one used to access the platform) to recover your password' %}</p>
  41 + </div>
  42 + </div>
  43 +
  44 + <form id="form-reset" method="post" action="">
  45 + {% csrf_token %}
  46 + {% for field in form %}
  47 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  48 + <div class="form-group{% if form.has_error %} has-error {% endif %}">
  49 + {% render_field field class='form-control' %}
50 50
51 - <span id="helpBlock" class="help-block">{{ field.help_text }}</span> 51 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
52 52
53 - {% if field.errors %} 53 + {% if field.errors %}
54 <div class="alert alert-danger alert-dismissible" role="alert"> 54 <div class="alert alert-danger alert-dismissible" role="alert">
55 - <button type="button" class="close" data-dismiss="alert" aria-label="Close">  
56 - <span aria-hidden="true">&times;</span> 55 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  56 + <span aria-hidden="true">&times;</span>
57 </button> 57 </button>
58 <ul> 58 <ul>
59 {% for error in field.errors %} 59 {% for error in field.errors %}
@@ -62,24 +62,24 @@ @@ -62,24 +62,24 @@
62 </ul> 62 </ul>
63 </div> 63 </div>
64 {% endif %} 64 {% endif %}
65 - </div>  
66 - </div>  
67 - {% endfor %}  
68 - </form>  
69 - <div class="row">  
70 - <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">  
71 - <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">  
72 - <button type="submit" class="btn btn-success btn-raised btn-block" form="form-reset" style="position: initial;"> {% trans 'Recover' %} </button>  
73 - </div>  
74 - <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">  
75 - <a class="btn btn-default btn-raised btn-block" href="{% url 'users:login' %}" formaction="#" style="position: initial;">{% trans 'Back' %}</a>  
76 - </div>  
77 - </div>  
78 - </div>  
79 - </div>  
80 - </div>  
81 - </div>  
82 - </div> 65 + </div>
  66 + </div>
  67 + {% endfor %}
  68 + </form>
  69 + <div class="row">
  70 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  71 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  72 + <button type="submit" class="btn btn-success btn-raised btn-block" form="form-reset" style="position: initial;"> {% trans 'Recover' %} </button>
  73 + </div>
  74 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  75 + <a class="btn btn-default btn-raised btn-block" href="{% url 'users:login' %}" formaction="#" style="position: initial;">{% trans 'Back' %}</a>
  76 + </div>
  77 + </div>
  78 + </div>
  79 + </div>
  80 + </div>
  81 + </div>
  82 + </div>
83 {% endblock %} 83 {% endblock %}
84 84
85 {% block bottommenu %} 85 {% block bottommenu %}
users/templates/users/login.html
  Diff comments   View file @34f3c2c
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </div> 20 </div>
21 21
22 <div class="row"> 22 <div class="row">
23 - <div class="col-lg-offset-2 col-md-offset-2 col-lg-9 col-md-9 col-sm-12"> 23 + <div class="col-lg-offset-2 col-md-offset-2 col-lg-8 col-md-8 col-sm-12">
24 {% if messages %} 24 {% if messages %}
25 {% for message in messages %} 25 {% for message in messages %}
26 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert"> 26 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
users/templates/users/new_password.html
  Diff comments   View file @34f3c2c
@@ -14,38 +14,38 @@ @@ -14,38 +14,38 @@
14 14
15 {% block content %} 15 {% block content %}
16 <div class="row"> 16 <div class="row">
17 - <div class="col-lg-offset-1 col-md-offset-1">  
18 - <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus">  
19 - </div> 17 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
  18 + <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus">
  19 + </div>
20 </div> 20 </div>
21 21
22 <div class="row"> 22 <div class="row">
23 - <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-9 col-md-9 col-sm-10">  
24 - {% if messages %}  
25 - {% for message in messages %}  
26 - <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">  
27 - <button type="button" class="close" data-dismiss="alert" aria-label="Close">  
28 - <span aria-hidden="true">&times;</span>  
29 - </button>  
30 - <p>{{ message }}</p>  
31 - </div>  
32 - {% endfor %}  
33 - {% endif %} 23 + <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-8 col-md-8 col-sm-10">
  24 + {% if messages %}
  25 + {% for message in messages %}
  26 + <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
  27 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  28 + <span aria-hidden="true">&times;</span>
  29 + </button>
  30 + <p>{{ message }}</p>
  31 + </div>
  32 + {% endfor %}
  33 + {% endif %}
34 34
35 - <div class="card">  
36 - <div class="card-block">  
37 - <div class="row">  
38 - <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center">  
39 - <h2 class="outside-title"><strong> {% trans 'Set new password' %} </strong></h2>  
40 - </div>  
41 - </div>  
42 -  
43 - <form id="form-reset" method="post" action="">  
44 - {% csrf_token %}  
45 - {% for field in form %}  
46 - <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">  
47 - <div class="form-group{% if form.has_error %} has-error {% endif %}">  
48 - {% if field.field.required %} 35 + <div class="card">
  36 + <div class="card-block">
  37 + <div class="row">
  38 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center">
  39 + <h2 class="outside-title"><strong> {% trans 'Set new password' %} </strong></h2>
  40 + </div>
  41 + </div>
  42 +
  43 + <form id="form-reset" method="post" action="">
  44 + {% csrf_token %}
  45 + {% for field in form %}
  46 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  47 + <div class="form-group{% if form.has_error %} has-error {% endif %}">
  48 + {% if field.field.required %}
49 <label for="{{ field.auto_id }}" class="control-label">{{ field.label }} <span>*</span></label> 49 <label for="{{ field.auto_id }}" class="control-label">{{ field.label }} <span>*</span></label>
50 {% else %} 50 {% else %}
51 <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label> 51 <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
@@ -53,12 +53,12 @@ @@ -53,12 +53,12 @@
53 53
54 {% render_field field class='form-control' %} 54 {% render_field field class='form-control' %}
55 55
56 - <span id="helpBlock" class="help-block">{{ field.help_text }}</span> 56 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
57 57
58 - {% if field.errors %} 58 + {% if field.errors %}
59 <div class="alert alert-danger alert-dismissible" role="alert"> 59 <div class="alert alert-danger alert-dismissible" role="alert">
60 - <button type="button" class="close" data-dismiss="alert" aria-label="Close">  
61 - <span aria-hidden="true">&times;</span> 60 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  61 + <span aria-hidden="true">&times;</span>
62 </button> 62 </button>
63 <ul> 63 <ul>
64 {% for error in field.errors %} 64 {% for error in field.errors %}
@@ -67,24 +67,24 @@ @@ -67,24 +67,24 @@
67 </ul> 67 </ul>
68 </div> 68 </div>
69 {% endif %} 69 {% endif %}
70 - </div>  
71 - </div>  
72 - {% endfor %}  
73 - </form>  
74 - <div class="row">  
75 - <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">  
76 - <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">  
77 - <button type="submit" class="btn btn-success btn-raised btn-block" form="form-reset" style="position: initial;"> {% trans 'Reset' %} </button>  
78 - </div>  
79 - <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">  
80 - <a class="btn btn-default btn-raised btn-block" href="{% url 'users:login' %}" formaction="#" style="position: initial;">{% trans 'Back' %}</a>  
81 - </div>  
82 - </div>  
83 - </div>  
84 - </div>  
85 - </div>  
86 - </div>  
87 - </div> 70 + </div>
  71 + </div>
  72 + {% endfor %}
  73 + </form>
  74 + <div class="row">
  75 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  76 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  77 + <button type="submit" class="btn btn-success btn-raised btn-block" form="form-reset" style="position: initial;"> {% trans 'Reset' %} </button>
  78 + </div>
  79 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  80 + <a class="btn btn-default btn-raised btn-block" href="{% url 'users:login' %}" formaction="#" style="position: initial;">{% trans 'Back' %}</a>
  81 + </div>
  82 + </div>
  83 + </div>
  84 + </div>
  85 + </div>
  86 + </div>
  87 + </div>
88 {% endblock %} 88 {% endblock %}
89 89
90 {% block bottommenu %} 90 {% block bottommenu %}
users/templates/users/register.html
  Diff comments   View file @34f3c2c
@@ -15,13 +15,13 @@ @@ -15,13 +15,13 @@
15 15
16 {% block content %} 16 {% block content %}
17 <div class="row"> 17 <div class="row">
18 - <div class="col-lg-offset-1 col-md-offset-1"> 18 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
19 <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus"> 19 <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus">
20 </div> 20 </div>
21 </div> 21 </div>
22 22
23 <div class="row"> 23 <div class="row">
24 - <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-9 col-md-9 col-sm-10"> 24 + <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-8 col-md-8 col-sm-10">
25 {% if messages %} 25 {% if messages %}
26 {% for message in messages %} 26 {% for message in messages %}
27 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert"> 27 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">