Download as
Browse Code »

Commit 82d4a01e29284140400c7db2fdc5074d9a65d3a1

Authored by Jailson Dias
2 parents 0cc9739e 5c57a626
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge branch 'master' of https://github.com/amadeusproject/amadeuslms

Showing 2 changed files with 21 additions and 12 deletions   Show diff stats
core/templates/base.html
  Diff comments   View file @82d4a01
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 </head> 37 </head>
38 <body> 38 <body>
39 {% block nav %} 39 {% block nav %}
  40 + <div class="container-fluid">
40 <div class="row"> 41 <div class="row">
41 <div class="navbar navbar-default"> 42 <div class="navbar navbar-default">
42 <div class="container-fluid"> 43 <div class="container-fluid">
@@ -59,9 +60,10 @@ @@ -59,9 +60,10 @@
59 </div> 60 </div>
60 </div> 61 </div>
61 </div> 62 </div>
  63 + </div>
62 {% endblock %} 64 {% endblock %}
63 65
64 - <div class="container"> 66 + <div class="container-fluid">
65 {% block breadcrumbs %} 67 {% block breadcrumbs %}
66 68
67 {% endblock %} 69 {% endblock %}
core/templates/index.html
  Diff comments   View file @82d4a01
@@ -6,15 +6,18 @@ @@ -6,15 +6,18 @@
6 {% block nav %} 6 {% block nav %}
7 {% endblock %} 7 {% endblock %}
8 8
  9 +{% block sidebar %}
  10 + {% endblock sidebar %}
  11 +
9 {% block content %} 12 {% block content %}
10 <div class="row logo-row"> 13 <div class="row logo-row">
11 - <div class="col-lg-offset-2 col-lg-9">  
12 - <img src="..." class="img-responsive center-block " alt="logo amadeus"> 14 + <div class="col-md-offset-4 col-md-4 col-xs-4 col-xs-offset-4 logoLogin">
  15 + <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
13 </div> 16 </div>
14 </div> 17 </div>
15 18
16 <div class="row "> 19 <div class="row ">
17 - <div class="col-lg-9 col-lg-offset-2"> 20 + <div class="col-md-8 col-md-offset-2 col-sm-6 col-sm-offset-3">
18 <div class="card"> 21 <div class="card">
19 {% if message %} 22 {% if message %}
20 <div class="alert alert-danger fade in"> 23 <div class="alert alert-danger fade in">
@@ -23,7 +26,7 @@ @@ -23,7 +26,7 @@
23 26
24 {% endif %} 27 {% endif %}
25 <div class="card-content"> 28 <div class="card-content">
26 - <div class="card-body"> 29 +
27 <form id="form-login" class="form-group" method="post" action=""> 30 <form id="form-login" class="form-group" method="post" action="">
28 {% csrf_token %} 31 {% csrf_token %}
29 <div class="form-group is-empty"> 32 <div class="form-group is-empty">
@@ -38,7 +41,7 @@ @@ -38,7 +41,7 @@
38 <input form="form-login" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password"> 41 <input form="form-login" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
39 </div> 42 </div>
40 </div> 43 </div>
41 - <div class="col-md-offset-2 col-md-10"> 44 + <div class=" col-md-10">
42 <div class="checkbox"> 45 <div class="checkbox">
43 <label> 46 <label>
44 <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %} 47 <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
@@ -46,23 +49,27 @@ @@ -46,23 +49,27 @@
46 </div> 49 </div>
47 </div> 50 </div>
48 </form> 51 </form>
49 - </div> 52 +
50 53
51 - <footer class="card-footer" style="display: -webkit-box;">  
52 - <div class="col-md-6"> 54 +
  55 + <div class="col-md-6 col-xs-6">
53 <button type="button" class="btn btn-flat" formaction="#" style="position: initial;">{% trans 'Guest' %}</button> 56 <button type="button" class="btn btn-flat" formaction="#" style="position: initial;">{% trans 'Guest' %}</button>
54 </div> 57 </div>
55 - <div class="col-md-6"> 58 + <div class="col-md-6 col-xs-6">
56 <button type="submite" class="btn btn-flat btn-success" form="form-login" style="position: initial;">{% trans 'Login' %}</button> 59 <button type="submite" class="btn btn-flat btn-success" form="form-login" style="position: initial;">{% trans 'Login' %}</button>
57 </div> 60 </div>
58 - </footer> 61 +
59 </div> 62 </div>
60 </div> 63 </div>
61 </div> 64 </div>
62 </div> 65 </div>
63 <div class="row"> 66 <div class="row">
64 - <div class="col-lg-offset-2 col-lg-9"> 67 + <div class="col-lg-offset-2 col-lg-8 col-md-8 col-md-offset-2 col-sm-6 col-sm-offset-3">
65 <a class="btn btn-raised btn-primary btn-lg btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a> 68 <a class="btn btn-raised btn-primary btn-lg btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
66 </div> 69 </div>
67 </div> 70 </div>
68 {% endblock%} 71 {% endblock%}
  72 +
  73 +{% block rightbar %}
  74 +
  75 +{% endblock rightbar %}
69 \ No newline at end of file 76 \ No newline at end of file