Download as
Browse Code »

Commit 317f3bdb23607f73853f745448071e6da3bb9a92

Authored by Zambom
1 parent bc49fac0
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Cleaning users app

Showing 3 changed files with 0 additions and 258 deletions   Show diff stats
users/templates/users/search.html
View file @bc49fac
@@ -1,146 +0,0 @@ @@ -1,146 +0,0 @@
1 -{% extends 'home.html' %}  
2 -  
3 -{% load i18n pagination django_bootstrap_breadcrumbs permission_tags static %}  
4 -{% block javascript %}  
5 - <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>  
6 - <script src="{% static 'js/file.js' %}"></script>  
7 - <script type="text/javascript" src="{% static 'js/material.js' %}"></script>  
8 - <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>  
9 - <script src="{% static 'js/modals_requisitions.js'%}"></script>  
10 - <script src="{% static 'js/modal_poll.js'%}"></script>  
11 -{% endblock %}  
12 -  
13 -{% block breadcrumbs %}  
14 - {{ block.super }}  
15 - {% breadcrumb search 'users:search' %}  
16 -{% endblock %}  
17 -  
18 -  
19 -{% block content %}  
20 -<div class="jumbotron">  
21 -<h3>Search Result:</h3> {{qtd}} items found  
22 -  
23 -{% if link_list %}  
24 -<div class="panel-group">  
25 - <div class="panel panel-default">  
26 - <div class="panel-heading">  
27 - <h4 class="panel-title">  
28 - <a data-toggle="collapse" href="#Link" id="bot" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down"></i>Links</a>  
29 - </h4>  
30 - </div>  
31 - <div id="Link" class="panel-collapse collapse">  
32 - <div class="panel-body">  
33 -  
34 -  
35 - {% for link in link_list %}  
36 - <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i> <a href="javascript:modal.get('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>  
37 - {% endfor %}  
38 - <div class = 'row' id ="divModalLink">  
39 -  
40 - </div>  
41 -  
42 - </div>  
43 -  
44 - </div>  
45 - </div>  
46 -</div>  
47 -{% endif%}  
48 -  
49 -{% if file_list %}  
50 -<div class="panel-group">  
51 - <div class="panel panel-default">  
52 - <div class="panel-heading">  
53 - <h4 class="panel-title">  
54 - <a data-toggle="collapse" href="#File" id="bot1" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down1"></i>File</a>  
55 - </h4>  
56 - </div>  
57 - <div id="File" class="panel-collapse collapse">  
58 - <div class="panel-body">  
59 -  
60 - {% for file in file_list %}  
61 - <li id="file_{{ file.slug }}"><i class="material-icons">{{ file.file_type.icon }}</i> <a href="{% url 'course:file_material_view' file.slug %}" target="_blank">{{ file.name }}</a></li>  
62 - {% endfor%}  
63 -  
64 -  
65 - <div class="row" id="divModalFile">  
66 -  
67 - </div>  
68 - </div>  
69 -  
70 -  
71 - </div>  
72 - </div>  
73 -</div>  
74 -{% endif %}  
75 -  
76 -{% if forum_list %}  
77 -<div class="panel-group">  
78 - <div class="panel panel-default">  
79 - <div class="panel-heading">  
80 - <h4 class="panel-title">  
81 - <a data-toggle="collapse" href="#Forum" id="bot2" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down2"></i>Forum</a>  
82 - </h4>  
83 - </div>  
84 - <div id="Forum" class="panel-collapse collapse">  
85 - <div class="panel-body">  
86 - {% for forum in forum_list %}  
87 - <li><i class="fa fa-commenting" aria-hidden="true"></i> <a id="forum_{{ forum.id }}" href="{% url 'course:forum:view' forum.slug %}"> {{ forum }}</a></li>  
88 - {% endfor %}  
89 -  
90 - </div>  
91 -  
92 - </div>  
93 - </div>  
94 -</div>  
95 -{% endif %}  
96 -  
97 -{% if exam_list %}  
98 -<div class="panel-group">  
99 - <div class="panel panel-default">  
100 - <div class="panel-heading">  
101 - <h4 class="panel-title">  
102 - <a data-toggle="collapse" href="#Exam" id="bot3" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down3"></i>Exam</a>  
103 - </h4>  
104 - </div>  
105 - <div id="Exam" class="panel-collapse collapse">  
106 - <div class="panel-body">  
107 - {% for exam in exam_list %}  
108 - {{exam.name}}  
109 - {% endfor %}  
110 -  
111 - </div>  
112 -  
113 - </div>  
114 - </div>  
115 -</div>  
116 -{% endif %}  
117 -  
118 -{% if poll_list %}  
119 -<div class="panel-group">  
120 - <div class="panel panel-default">  
121 - <div class="panel-heading">  
122 - <h4 class="panel-title">  
123 - <a data-toggle="collapse" href="#Poll" id="bot4" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down4"></i>Poll</a>  
124 - </h4>  
125 - </div>  
126 - <div id="Poll" class="panel-collapse collapse">  
127 - <div class="panel-body">  
128 -  
129 - {% for poll in poll_list %}  
130 - <li id="poll_{{poll.slug}}"><i class="material-icons">{% trans 'poll' %}</i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a></li>  
131 - {% endfor %}  
132 -  
133 - <div class="row" id="modal_poll">  
134 -  
135 - </div>  
136 - </div>  
137 - </div>  
138 - </div>  
139 -</div>  
140 -{% endif %}  
141 -</div>  
142 -  
143 -  
144 -<script type="text/javascript" src="{% static 'js/amadeus.js' %}"> </script>  
145 -<script type="text/javascript" src="{% static 'js/topic_editation_presentation_search.js' %}"></script>  
146 -{% endblock %}  
users/templates/users/view.html
View file @bc49fac
@@ -1,36 +0,0 @@ @@ -1,36 +0,0 @@
1 -{% extends 'users/profile.html' %}  
2 -  
3 -{% load static i18n %}  
4 -  
5 -{% block breadcrumbs %}  
6 - <ol class="breadcrumb">  
7 - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>  
8 - <li class="active">{{ acc }}</li>  
9 - </ol>  
10 -{% endblock %}  
11 -  
12 -{% block content %}  
13 - <div class="row">  
14 - <div class="col-sm-3">  
15 - <img src="{{ acc.image.url }}" class="img-responsive" />  
16 - </div>  
17 - <div class="col-sm-9">  
18 - <h4>{{ acc }}</h4>  
19 - <span class="label label-info">{% if acc.type_profile %}{{ acc.get_type_profile_display }}{% else %} {% trans 'Administrator' %} {% endif %}</span>  
20 - <span class="label label-primary">{{ acc.get_gender_display }}</span>  
21 - <span class="label label-warning">{{ acc.city }} / {{ acc.state }}</span>  
22 - <p>  
23 - <strong>{% trans 'Mail:' %} </strong> {{ acc.email }}  
24 - </p>  
25 - <p>  
26 - <strong>{% trans 'Phone:' %} </strong> {{ acc.phone }}  
27 - </p>  
28 - <p>  
29 - <strong>{% trans 'Cpf:' %} </strong> {{ acc.cpf }}  
30 - </p>  
31 - <p>  
32 - <strong>{% trans 'Birth date:' %} </strong> {{ acc.birth_date }}  
33 - </p>  
34 - </div>  
35 - </div>  
36 -{% endblock %}  
users/views.py
  Diff comments   View file @317f3bd
1 from django.shortcuts import get_object_or_404,redirect, render 1 from django.shortcuts import get_object_or_404,redirect, render
2 from django.views import generic 2 from django.views import generic
3 from django.contrib import messages 3 from django.contrib import messages
4 -from rolepermissions.mixins import HasRoleMixin  
5 from django.contrib.auth import authenticate, login as login_user 4 from django.contrib.auth import authenticate, login as login_user
6 from django.contrib.auth.mixins import LoginRequiredMixin 5 from django.contrib.auth.mixins import LoginRequiredMixin
7 from django.core.urlresolvers import reverse, reverse_lazy 6 from django.core.urlresolvers import reverse, reverse_lazy
8 from django.utils.translation import ugettext_lazy as _ 7 from django.utils.translation import ugettext_lazy as _
9 -from rolepermissions.shortcuts import assign_role  
10 -from rolepermissions.verifications import has_role  
11 8
12 from .models import User 9 from .models import User
13 from .forms import RegisterUserForm, ProfileForm, UserForm, ChangePassForm, PassResetRequest, SetPasswordForm 10 from .forms import RegisterUserForm, ProfileForm, UserForm, ChangePassForm, PassResetRequest, SetPasswordForm
@@ -26,79 +23,6 @@ from .serializers import UserSerializer @@ -26,79 +23,6 @@ from .serializers import UserSerializer
26 from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly 23 from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
27 24
28 # ================ ADMIN ======================= 25 # ================ ADMIN =======================
29 -  
30 -# class View(LoginRequiredMixin, generic.DetailView):  
31 -  
32 -# #login_url = reverse_lazy("core:home")  
33 -# redirect_field_name = 'next'  
34 -# model = User  
35 -# context_object_name = 'acc'  
36 -# template_name = 'users/view.html'  
37 -# slug_field = 'username'  
38 -# slug_url_kwarg = 'username'  
39 -  
40 -# def get_context_data (self, **kwargs):  
41 -# context = super(View, self).get_context_data(**kwargs)  
42 -# context['title'] = "User"  
43 -# return context  
44 -  
45 -# def delete_user(request,username):  
46 -# user = get_object_or_404(User,username = username)  
47 -# user.delete()  
48 -# messages.success(request,_("User deleted Successfully!"))  
49 -# return redirect('users:manage')  
50 -  
51 -# def remove_account(request,username):  
52 -# user = get_object_or_404(User,username = username)  
53 -# user.delete()  
54 -# messages.success(request,_("User deleted Successfully!"))  
55 -# #return redirect('core:logout')  
56 -  
57 -# class Change_password(generic.TemplateView):  
58 -# template_name = 'users/change_password.html'  
59 -  
60 -# def get_context_data (self, **kwargs):  
61 -# context = super(Change_password, self).get_context_data(**kwargs)  
62 -# context['title'] = "Change Password"  
63 -# return context  
64 -  
65 -# class Remove_account(generic.TemplateView):  
66 -# template_name = 'users/remove_account.html'  
67 -  
68 -# def get_context_data (self, **kwargs):  
69 -# context = super(Remove_account, self).get_context_data(**kwargs)  
70 -# context['title'] = "Remove Account"  
71 -# return context  
72 -  
73 -  
74 -  
75 -# class DeleteUser(LoginRequiredMixin, generic.edit.DeleteView):  
76 -# allowed_roles = ['student']  
77 -# #login_url = reverse_lazy("core:home")  
78 -# model = User  
79 -  
80 -# #success_url = reverse_lazy('core:index')  
81 -# success_message = "Deleted Successfully"  
82 -  
83 -# def get_queryset(self):  
84 -# user = get_object_or_404(User, username = self.request.user.username)  
85 -# return user  
86 -  
87 -# class SearchView(LoginRequiredMixin, generic.ListView):  
88 -  
89 -# #login_url = reverse_lazy("core:home")  
90 -# redirect_field_name = 'next'  
91 -# queryset = None  
92 -# template_name = 'users/search.html'  
93 -# paginate_by = 10  
94 -  
95 -# def get_context_data(self, **kwargs):  
96 -# context = super(SearchView, self).get_context_data(**kwargs)  
97 -# search = self.request.GET.get('search', None)  
98 -  
99 -  
100 -# return context  
101 -  
102 class UsersListView(LoginRequiredMixin, generic.ListView): 26 class UsersListView(LoginRequiredMixin, generic.ListView):
103 login_url = reverse_lazy("users:login") 27 login_url = reverse_lazy("users:login")
104 redirect_field_name = 'next' 28 redirect_field_name = 'next'