Download as
Browse Code »

Commit b6366e6a1ba504d39269ac33e64e4b770083c717

Authored by Jailson Dias
1 parent 75162f0f
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Resolvido o problema do context processors e ajeitado o template de login e remember password #76

Showing 5 changed files with 142 additions and 108 deletions   Show diff stats
core/context_processors.py
  Diff comments   View file @b6366e6
1 1 from .models import Notification
2 2  
3 3 def notifications(request):
4   - if request.user.is_authenticated:
5   - return {
6   - 'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime')
7   - }
8   - else:
9   - return request
10 4 \ No newline at end of file
  5 + context = {}
  6 + context['notifications'] = None
  7 + if not request.user is None:
  8 + if request.user.is_authenticated:
  9 + return {
  10 + 'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime')
  11 + }
  12 + return context
... ...
core/templates/index.html
  Diff comments   View file @b6366e6
... ... @@ -10,71 +10,86 @@
10 10 {% endblock sidebar %}
11 11  
12 12 {% block content %}
13   - <div class="row logo-row">
14   - <div class="col-lg-offset-2 col-lg-9">
15   - <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus" id="logo">
  13 + <div class="row">
  14 + <div class="col-md-4 col-md-offset-4">
  15 + <div class="row">
  16 + <div class="col-md-offset-2 col-md-8">
  17 + </br>
  18 + </br>
  19 + <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
  20 + </br>
  21 + </div>
  22 + </div>
16 23 </div>
17   -
18 24 <div class="row">
19 25 {% for breadcrumb in breadcrumbs %}
20 26 <a href="{{ breadcrumb.url }}">{{ breadcrumb.text }}</a>
21 27 {% endfor %}
22   - </div>
23   -
24   - <div class="row ">
25   - <div class="col-md-8 col-md-offset-2 col-sm-6 col-sm-offset-3">
26   - <div class="card">
27   - {% if message %}
28   - <div class="alert alert-danger fade in">
29   - {{message}}
30   - </div>
31   -
32   - {% endif %}
33   - <div class="card-content">
34   -
35   - <form id="form-login" class="form-group" method="post" action="">
36   - {% csrf_token %}
37   - <div class="form-group is-empty">
38   - <label for="inputEmail" class="col-md-4 control-label"> {% trans 'Username' %}</label>
39   - <div class="col-md-8">
40   - <input form="form-login" type="text" name="username" class="form-control" id="inputEmail" placeholder="Username">
41   - </div>
42   - </div>
43   - <div class="form-group is-empty">
44   - <label for="inputPassword" class="col-md-4 control-label"> {% trans 'Password' %}</label>
45   - <div class="col-md-8">
46   - <input form="form-login" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
47   - </div>
48   - </div>
49   - <div class=" col-md-10">
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   -
  28 + </div>
58 29  
59   -
60   - <div class="col-md-6 col-xs-6">
61   - <button type="button" class="btn btn-flat" formaction="#" style="position: initial;">{% trans 'Guest' %}</button>
  30 + <div class="row ">
  31 + <div class="col-md-8 col-md-offset-2 col-sm-6 col-sm-offset-3">
  32 + {% if message %}
  33 + <div class="alert alert-danger alert-dismissible" role="alert">
  34 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  35 + <span aria-hidden="true">&times;</span>
  36 + </button>
  37 + <ul>
  38 + <li>{{ message }}</li>
  39 + </ul>
  40 + </div>
  41 + {% endif %}
  42 + <div class="card">
  43 + <div class="card-block">
  44 + {# <div class="row"> #}
  45 + <form id="form-login" class="form-group" method="post" action="">
  46 + {% csrf_token %}
  47 + <div class="form-group is-empty">
  48 + <label for="inputEmail" class="col-md-4 control-label"> {% trans 'Username' %}</label>
  49 + <div class="col-md-8">
  50 + <input form="form-login" type="text" name="username" class="form-control" id="inputEmail" placeholder="Username" value="{% if username %}{{username}}{% endif %}">
62 51 </div>
63   - <div class="col-md-6 col-xs-6">
64   - <button type="submite" class="btn btn-flat btn-success" form="form-login" style="position: initial;">{% trans 'Login' %}</button>
  52 + </div>
  53 + <div class="form-group is-empty">
  54 + <label for="inputPassword" class="col-md-4 control-label"> {% trans 'Password' %}</label>
  55 + <div class="col-md-8">
  56 + <input form="form-login" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
  57 + </div>
  58 + </div>
  59 + <div class="col-md-10">
  60 + <div class="checkbox">
  61 + <label>
  62 + <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
  63 + </label>
65 64 </div>
66   -
  65 + </div>
  66 + </form>
  67 + {# </div> #}
  68 + {# <div class="row"> #}
  69 + <div class="col-md-10">
  70 + <a href="{% url 'core:remember_password' %}">Forgot your password?</a>
  71 + </div>
  72 + {# </div> #}
  73 + {# <div class="row"> #}
  74 + <div class="col-md-6 col-xs-6 text-center">
  75 + <button type="button" class="btn btn-flat" formaction="#" style="position: initial;">{% trans 'Guest' %}</button>
  76 + </div>
  77 + <div class="col-md-6 col-xs-6 text-center">
  78 + <button type="submite" class="btn btn-flat btn-success" form="form-login" style="position: initial;">{% trans 'Login' %}</button>
  79 + </div>
  80 + {# </div> #}
67 81 </div>
68   - </div>
69   - </div>
  82 + </div>
  83 + </div>
70 84 </div>
71 85 <div class="row">
72   - <div class="col-lg-offset-2 col-lg-8 col-md-8 col-md-offset-2 col-sm-6 col-sm-offset-3">
73   - <a class="btn btn-raised btn-primary btn-lg btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
74   - </div>
  86 + <div class="col-lg-offset-2 col-lg-8 col-md-8 col-md-offset-2 col-sm-6 col-sm-offset-3">
  87 + <a class="btn btn-raised btn-primary btn-lg btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
  88 + </div>
75 89 </div>
  90 + </div>
76 91 {% endblock%}
77 92  
78 93 {% block rightbar %}
79   -
80   -{% endblock rightbar %}
81 94 \ No newline at end of file
  95 +
  96 +{% endblock rightbar %}
... ...
core/templates/remember_password.html
  Diff comments   View file @b6366e6
1 1 {% extends "index.html" %}
2   -{% load i18n %}
3   -{% block content %}
  2 +{% load i18n static %}
  3 +{% block content%}
4 4  
5   - <div class="row logo-row">
6   - <div class="col-lg-offset-2 col-lg-9">
7   - <img src="..." class="img-responsive center-block " alt="logo amadeus">
8   - </div>
9   - </div>
10   - <div class="row ">
11   - <div class="col-lg-9 col-lg-offset-2">
12   - <div class="card">
13   - {% if success %}
14   - <div class="alert alert-success fade in">
15   - {{success}}
16   - </div>
17   - {% elif danger %}
18   - <div class="alert alert-danger fade in">
19   - {{danger}}
20   - </div>
21   - {% endif %}
22   - <div class="card-content">
23   - <div class="card-body">
  5 + <div class="row">
  6 + <div class="col-md-4 col-md-offset-4">
  7 + <div class="row">
  8 + <div class="col-md-offset-2 col-md-8">
  9 + </br>
  10 + </br>
  11 + <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
  12 + </br>
  13 + </div>
  14 + </div>
  15 + </div>
  16 + <div class="row ">
  17 + <div class="col-lg-9 col-lg-offset-2">
  18 + {% if success %}
  19 + <div class="alert alert-success alert-dismissible" role="alert">
  20 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  21 + <span aria-hidden="true">&times;</span>
  22 + </button>
  23 + <ul>
  24 + <li>{{ success }}</li>
  25 + </ul>
  26 + </div>
  27 + {% elif danger %}
  28 + <div class="alert alert-danger alert-dismissible" role="alert">
  29 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  30 + <span aria-hidden="true">&times;</span>
  31 + </button>
  32 + <ul>
  33 + <li>{{ danger }}</li>
  34 + </ul>
  35 + </div>
  36 + {% endif %}
  37 + <div class="card">
  38 + <div class="card-block">
  39 + <div class="col-md-12">
24 40 <form class="form-group " method="post" action="">
25 41 {% csrf_token %}
26   - <div class="form-group">
27   - <label for="inputEmail" class="control-label label-static"> {% trans 'E-mail' %}</label>
28   - <input name="email" type="email" class="form-control" id="inputEmail" placeholder="Email" {% if email %}value="{{email}}"{% endif %}>
  42 + <div class="form-group is-empty">
  43 + <label for="inputEmail" class="ccontrol-label"> {% trans 'E-mail' %}</label>
  44 + {# <div class="col-md-8"> #}
  45 + <input name="email" type="email" class="form-control" id="inputEmail" placeholder="Email" {% if email %}value="{{email}}"{% endif %}>
  46 + {# </div> #}
29 47 </div>
30   - <div class="form-group">
31   - <label for="inputRegistration" class=" control-label"> {% trans 'Registration' %} </label>
32   - <input name="registration" type="text" class="form-control" id="inputRegistration" placeholder="Registration" {% if registration %}value="{{registration}}"{% endif %}>
  48 + <div class="form-group is-empty">
  49 + <label for="inputRegistration" class="control-label"> {% trans 'Registration' %} </label>
  50 + {# <div class="col-md-8"> #}
  51 + <input name="registration" type="text" class="col-md-4 form-control" id="inputRegistration" placeholder="Registration" {% if registration %}value="{{registration}}"{% endif %}>
  52 + {# </div> #}
33 53 </div>
34   - <div class="col-lg-offset-4 col-lg-4">
35   - <button type="submite" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Send' %}</button>
36   -
37   - </div>
  54 + <div class="col-lg-offset-4 col-lg-4">
  55 + <button type="submite" class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Send' %}</button>
38 56  
  57 + </div>
39 58 </form>
40 59 </div>
41   -
42   - </div>
43   -
44   -
  60 + </div>
  61 + </div>
  62 + </div>
45 63 </div>
46 64 </div>
47   - </div>
48 65  
49 66 {% endblock content %}
... ...
core/views.py
  Diff comments   View file @b6366e6
... ... @@ -71,7 +71,7 @@ def remember_password(request):
71 71 @log_decorator('Acessar', 'Sistema')
72 72 def login(request):
73 73 context = {}
74   -
  74 +
75 75 if request.POST:
76 76 username = request.POST['username']
77 77 password = request.POST['password']
... ... @@ -81,9 +81,10 @@ def login(request):
81 81 return redirect(reverse("app:index"))
82 82 else:
83 83 context["message"] = _("E-mail or password are incorrect!")
  84 + context["username"] = username
84 85 elif request.user.is_authenticated:
85 86 return redirect(reverse('app:index'))
86   -
  87 +
87 88 return render(request,"index.html",context)
88 89  
89 90  
... ...
courses/context_processors.py
  Diff comments   View file @b6366e6
1 1 from .models import Course
2 2  
3 3 def courses(request):
4   - if request.user.is_authenticated:
5   - context = {}
6   -
7   - if request.user.is_staff:
8   - context['courses_list'] = Course.objects.all()
9   - else:
10   - context['courses_list'] = Course.objects.filter(professors__in = [request.user])
11   -
12   - return context
13   - else:
14   - return request
15 4 \ No newline at end of file
  5 + context = {}
  6 + context['courses_list'] = None
  7 + if not request.user is None:
  8 + if request.user.is_authenticated:
  9 + if request.user.is_staff:
  10 + context['courses_list'] = Course.objects.all()
  11 + else:
  12 + context['courses_list'] = Course.objects.filter(professors__in = [request.user])
  13 + return context
  14 + return context
... ...