Download as
Browse Code »

Commit a4734670d89ed677f716d47c54767e25edd3c0ed

Authored by ailsoncgt
2 parents 0f5c440a 218ea66a
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge

Showing 4 changed files with 110 additions and 102 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @a473467
@@ -344,4 +344,19 @@ ul, li { @@ -344,4 +344,19 @@ ul, li {
344 344
345 .logo-login{ 345 .logo-login{
346 margin-top: 15px; 346 margin-top: 15px;
347 - margin-bottom: 15px;  
348 \ No newline at end of file 347 \ No newline at end of file
  348 + margin-bottom: 15px;
  349 + width:50%;
  350 +}
  351 +.forgotPassword{
  352 + padding-bottom: 10px;
  353 +}
  354 +.form-group{
  355 + margin-top: 10px;
  356 +}
  357 +
  358 +/* core/register_user.html classes*/
  359 +
  360 +.block-register-inline{
  361 + float: left;
  362 + display: inline-block;
  363 +}
349 \ No newline at end of file 364 \ No newline at end of file
core/templates/index.html
  Diff comments   View file @a473467
@@ -11,18 +11,15 @@ @@ -11,18 +11,15 @@
11 11
12 {% block content %} 12 {% block content %}
13 <div class="row"> 13 <div class="row">
14 - <div class="col-sm-4 col-sm-offset-3 col-md-4 col-md-offset-3  
15 - col-xs-4 col-xs-offset-3 col-lg-4 col-lg-offset-3 col-xl-4 col-xl-offset-3 "> 14 + <div class="col-sm-6 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4 col-xl-6 col-xl-offset-4 ">
16 <div class="col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-8 col-xs-offset-2 col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2"> 15 <div class="col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-8 col-xs-offset-2 col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2">
17 -  
18 <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus"> 16 <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
19 -  
20 </div> 17 </div>
21 </div> 18 </div>
22 </div> 19 </div>
23 20
24 <div class="row"> 21 <div class="row">
25 - <div class="col-md-6 col-sm-6 col-sm-offset-2 col-xs-6 col-xs-offset-2 col-lg-6 col-lg-offset-2 col-xl-6 col-xl-offset-2"> 22 + <div class="col-md-8 col-md-offset-3 col-sm-10 col-sm-offset-2 col-xs-12 col-xs-offset-1 col-lg-8 col-lg-offset-3 col-xl-8 col-xl-offset-3">
26 {% if messages %} 23 {% if messages %}
27 {% for message in messages %} 24 {% for message in messages %}
28 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert"> 25 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
@@ -37,35 +34,35 @@ @@ -37,35 +34,35 @@
37 <div class="card-block"> 34 <div class="card-block">
38 <form id="form-login" class="form-group" method="post" action=""> 35 <form id="form-login" class="form-group" method="post" action="">
39 {% csrf_token %} 36 {% csrf_token %}
40 - <div class="form-group is-empty">  
41 - <label for="inputEmail" class="col-md-4 col-xs-4 col-sm-4 col-lg-4 control-label"> {% trans 'Username' %}</label>  
42 - <div class="col-md-8 col-xs-8 col-lg-8 col-sm-8">  
43 - <input form="form-login" type="text" name="username" class="form-control" id="inputEmail" placeholder="Username" value="{% if username %}{{username}}{% endif %}">  
44 - </div>  
45 - </div>  
46 - <div class="form-group is-empty">  
47 - <label for="inputPassword" class="col-md-4 col-xs-4 col-lg-4 col-sm-4 control-label"> {% trans 'Password' %}</label>  
48 - <div class="col-md-8 col-xs-8 col-lg-8 col-sm-8">  
49 - <input form="form-login" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">  
50 - </div>  
51 - </div>  
52 - <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10">  
53 - <div class="checkbox">  
54 - <label>  
55 - <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}  
56 - </label>  
57 - </div>  
58 - </div>  
59 - </form>  
60 - <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10">  
61 - <a href="{% url 'core:password_reset' %}">{% trans "Forgot your password?" %}</a>  
62 - </div>  
63 - <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">  
64 - <a class="btn btn-flat" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>  
65 - </div>  
66 - <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">  
67 - <button type="submite" class="btn btn-flat btn-success" form="form-login" style="position: initial;">{% trans 'Login' %}</button>  
68 - </div> 37 + <div class="col-md-12 col-xs-12 col-lg-10 col-lg-offset-1 col-sm-12">
  38 + <div class="form-group">
  39 + <label for="inputEmail" class="control-label"> {% trans 'Username' %}</label>
  40 + <input form="form-login" for="inputSmall" type="text" name="username" class="form-control" placeholder="Username" id="inputEmail" value="{% if username %}{{username}}{% endif %}">
  41 + </div>
  42 + </div>
  43 + <div class="col-md-12 col-xs-12 col-lg-10 col-lg-offset-1 col-sm-12">
  44 + <div class="form-group">
  45 + <label for="inputPassword" class="control-label"> {% trans 'Password' %}</label>
  46 + <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
  47 + </div>
  48 + </div>
  49 + <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10 col-lg-offset-1">
  50 + <div class="checkbox">
  51 + <label>
  52 + <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
  53 + </label>
  54 + </div>
  55 + </div>
  56 + </form>
  57 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 text-center">
  58 + <button type="submite" class="btn btn-success btn-raised btn-block" form="form-login" style="position: initial;">{% trans 'Login' %}</button>
  59 + </div>
  60 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 text-center">
  61 + <a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
  62 + </div>
  63 + <div class="col-md-10 col-sm-10 col-xs-10 col-lg-6 col-lg-offset-7 forgotPassword">
  64 + <a href="{% url 'core:password_reset' %}">{% trans "Forgot your password?" %}</a>
  65 + </div>
69 </div> 66 </div>
70 </div> 67 </div>
71 <a class="btn btn-raised btn-primary btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a> 68 <a class="btn btn-raised btn-primary btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
core/templates/register_user.html
  Diff comments   View file @a473467
@@ -19,81 +19,84 @@ @@ -19,81 +19,84 @@
19 {% endfor %} 19 {% endfor %}
20 {% endif %} 20 {% endif %}
21 <div class="row"> 21 <div class="row">
22 - <div class="col-lg-offset-2 col-lg-8 col-md-offset-2 col-md-8 col-xs-offset-2 col-xs-8 col-sm-offset-2 col-sm-8">  
23 - <div class="col-lg-8 col-md-8 col-xs-8 col-sm-8">  
24 - <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus" id="logo">  
25 - </div>  
26 - </div> 22 + <div class="col-sm-6 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4 col-xl-6 col-xl-offset-4 ">
  23 + <div class="col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-8 col-xs-offset-2 col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2">
  24 + <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
  25 + </div>
  26 + </div>
27 </div> 27 </div>
28 28
29 <div class="row"> 29 <div class="row">
30 - <div class="col-lg-8 col-lg-offset-1 col-md-8 col-md-offset-1 col-sm-8 col-sm-offset-1 col-xs-8 col-xs-offset-1"> 30 + <div class="col-md-8 col-md-offset-3 col-sm-10 col-sm-offset-2 col-xs-12 col-xs-offset-1 col-lg-10 col-lg-offset-2 col-xl-8 col-xl-offset-3">
31 <div class="card"> 31 <div class="card">
32 <div class="card-content"> 32 <div class="card-content">
33 <div class="card-body"> 33 <div class="card-body">
34 - <form class="form-horizontal" name="registerForm" method="post" action="" enctype="multipart/form-data"> 34 + <form class="form-horizontal" name="registerForm" method="post" id="register-user" enctype="multipart/form-data">
35 {% csrf_token %} 35 {% csrf_token %}
36 - <legend>{% trans 'User Register' %}</legend>  
37 - {% for field in form %}  
38 - <div class="form-group is-empy{% if form.has_error %} has-error {% endif %} is-fileinput">  
39 - {% if field.field.required %}  
40 - <label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}<span>*</span></label>  
41 - {% else %}  
42 - <label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}</label>  
43 - {% endif %}  
44 - <div class="col-md-8">  
45 - {% if field.auto_id == 'id_birth_date' %}  
46 - {% render_field field class='form-control input-sm date-picker' %}  
47 -  
48 - <span id="helpBlock" class="help-block">{{ field.help_text }}</span>  
49 - {% elif field.auto_id == 'id_image' %}  
50 - {% render_field field class='form-control input-sm' %}  
51 - <div class="input-group">  
52 - <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">  
53 - <span class="input-group-btn input-group-sm">  
54 - <button type="button" class="btn btn-fab btn-fab-mini">  
55 - <i class="material-icons">attach_file</i>  
56 - </button>  
57 - </span>  
58 - </div>  
59 - {% elif field.auto_id == 'id_cpf' %}  
60 - {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %} 36 + <h2>{% trans 'User Register' %}</h2>
  37 + <hr>
  38 + <div class="row">
  39 + <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
  40 + {% for field in form %}
  41 + <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput block-register-inline">
  42 + {% if field.field.required %}
  43 + <label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}<span>*</span></label>
  44 + {% else %}
  45 + <label for="{{ field.auto_id }}" class="col-md-4 control-label">{{ field.label }}</label>
  46 + {% endif %}
  47 + <div class="col-md-8 col-lg-10 col-lg-offset-2">
  48 + {% if field.auto_id == 'id_birth_date' %}
  49 + {% render_field field class='form-control input-sm date-picker' %}
  50 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
  51 + {% elif field.auto_id == 'id_image' %}
  52 + {% render_field field class='form-control input-sm' %}
  53 + <div class="input-group">
  54 + <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
  55 + <span class="input-group-btn input-group-sm">
  56 + <button type="button" class="btn btn-fab btn-fab-mini">
  57 + <i class="material-icons">attach_file</i>
  58 + </button>
  59 + </span>
  60 + </div>
  61 + {% elif field.auto_id == 'id_cpf' %}
  62 + {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
61 63
62 - {% elif field.auto_id == 'id_phone' %}  
63 - {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}  
64 - {% else %}  
65 - {% render_field field class='form-control' %}  
66 - <span id="helpBlock" class="help-block">{{ field.help_text }}</span>  
67 - {% endif %}  
68 - </div>  
69 -  
70 - {% if field.errors %}  
71 - <div class="alert alert-danger alert-dismissible col-md-offset-4 col-md-8" role="alert">  
72 - <button type="button" class="close" data-dismiss="alert" aria-label="Close">  
73 - <span aria-hidden="true">&times;</span>  
74 - </button>  
75 - <ul>  
76 - {% for error in field.errors %}  
77 - <li>{{ error }}</li> 64 + {% elif field.auto_id == 'id_phone' %}
  65 + {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
  66 + {% else %}
  67 + {% render_field field class='form-control' %}
  68 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
  69 + {% endif %}
  70 + </div>
  71 +
  72 + {% if field.errors %}
  73 + <div class="alert alert-danger alert-dismissible col-md-offset-4 col-md-8" role="alert">
  74 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  75 + <span aria-hidden="true">&times;</span>
  76 + </button>
  77 + <ul>
  78 + {% for error in field.errors %}
  79 + <li>{{ error }}</li>
  80 + {% endfor %}
  81 + </ul>
  82 + </div>
  83 + {% endif %}
  84 + </div>
78 {% endfor %} 85 {% endfor %}
79 - </ul> 86 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 text-center">
  87 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
  88 + </div>
  89 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 text-center">
  90 + <a href="{% url 'core:home' %}" class="btn btn-default btn-raised" >{% trans 'Cancel' %}</a>
  91 + </div>
80 </div> 92 </div>
81 - {% endif %}  
82 - </div>  
83 - {% endfor %}  
84 - <div class="col-md-offset-4 col-md-2 col-sm-2 col-xs-2">  
85 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />  
86 </div> 93 </div>
87 - <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">  
88 - <a href="{% url 'core:home' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>  
89 - </div>  
90 -  
91 </form> 94 </form>
92 </div> 95 </div>
93 </div> 96 </div>
94 </div> 97 </div>
95 </div> 98 </div>
96 </div> 99 </div>
97 - 100 +
98 <br clear="all" /> 101 <br clear="all" />
99 {% endblock %} 102 {% endblock %}
courses/templates/course/index.html
  Diff comments   View file @a473467
@@ -67,14 +67,7 @@ @@ -67,14 +67,7 @@
67 </div> 67 </div>
68 </form> 68 </form>
69 </div> 69 </div>
70 - <div class="col-md-12">  
71 - <div class="btn-group btn-group-justified btn-group-raised">  
72 - <a href="?category=all" class="btn btn-raised btn-info">Todos</a>  
73 - {% for category_course in categorys_courses %}  
74 - <a href="?category={{category_course.name}}" class="btn btn-raised btn-primary">{{category_course.name}}</a>  
75 - {% endfor %}  
76 - </div>  
77 - </div> 70 +
78 71
79 </fieldset> 72 </fieldset>
80 <div class="col-md-12"> 73 <div class="col-md-12">