diff --git a/amadeus/urls.py b/amadeus/urls.py
index 59e0380..ae45d93 100644
--- a/amadeus/urls.py
+++ b/amadeus/urls.py
@@ -24,8 +24,6 @@ from core import views
urlpatterns = [
url(r'^$', auth_views.login, {'template_name': 'index.html'}, name='home'),
url(r'^logout/$', auth_views.logout, {'next_page': 'home'}, name='logout'),
- url(r'^nova_conta/$', views.nova_conta, name='nova_conta'),
- url(r'^lembrar_senha/$', views.lembrar_senha, name='lembrar_senha'),
url(r'^app/', include('app.urls', namespace = 'app')),
url(r'^admin/', admin.site.urls),
]
diff --git a/app/templates/admin_avaliacao_curso.html b/app/templates/admin_avaliacao_curso.html
deleted file mode 100644
index 5d6e3a0..0000000
--- a/app/templates/admin_avaliacao_curso.html
+++ /dev/null
@@ -1,101 +0,0 @@
-{% extends "admin_index.html" %}
-
-{% block content %}
- {% load static %}
-
-
-
-
-
- Nada encontrado para exibir.
-
-
-
-
-
- Nada encontrado para exibir.
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
- Julio Jose de Oliveira Ribeiro Toscano de Brito
-
- jjortb@cin.ufpe.br
-
- |
-
-
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin_config.html b/app/templates/admin_config.html
deleted file mode 100644
index 385745e..0000000
--- a/app/templates/admin_config.html
+++ /dev/null
@@ -1,189 +0,0 @@
-{% extends "admin_index.html" %}
-
-{% block content %}
- {% load static %}
-
-
Aprovar Docência
-
-
-
-
- Nome: Jailson Dias
-
- Titulação: degree1
- Ano: 2014
- Instituição: n nm m m
- Interesses: sadfsdasdc
- Currículo: vdvsdcvd
-
-
- Justificativa:
-
-
-
-
-
-
-
-
-
-
- Nome: kjhkjlkb
-
- Titulação: degree1
- Ano: 2014
- Instituição: nkjkj
- Interesses: hlknklnçkhgbkj
- Currículo: kjlkjklkç
-
-
- Justificativa:
-
-
-
-
-
-
-
-
-
-
- Nome: joao
-
- Titulação: phd
- Ano: 2010
- Instituição: UFPE
- Interesses: Lencionar
- Currículo: Doutor
-
-
- Justificativa:
-
-
-
-
-
-
-
-
-
-
- Nome:
-
- Titulação:
- Ano:
- Instituição:
- Interesses: Praticar
- Currículo:
-
-
- Justificativa:
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin_users.html b/app/templates/admin_users.html
deleted file mode 100644
index fa94bab..0000000
--- a/app/templates/admin_users.html
+++ /dev/null
@@ -1,930 +0,0 @@
-{% extends "admin_index.html" %}
-
-{% block content %}
- {% load static %}
-
-
+
4
{% trans 'Pending Tasks' %}
-
+
0
{% trans 'Users Online' %}
diff --git a/app/templates/index.html b/app/templates/index.html
deleted file mode 100644
index 9952ed1..0000000
--- a/app/templates/index.html
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-{% load static %}
-
-
-
-
-
-
-
-
-
-
-
Projeto Amadeus
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Seu(s) curso(s):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Palavras-chave mais populares:
-
-
-
teste amadeus prospb,
programação fácil,
intermediário,
amadeus,
palavra02,
programação para iniciantes,
django,
aluno teste,
curso0101,
kjsdnksa,
palavra01,
programming,
python,
curso,
mvc,
programação web,
ionic,
framework,
web,
android,
programação
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/templates/mobile.html b/app/templates/mobile.html
deleted file mode 100644
index 98bfde3..0000000
--- a/app/templates/mobile.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-{% load static %}
-
-
-
-
Amadeus Mobile
-
-
-
-
-
-
-

-
Você está sendo direcionado para a página do Amadeus Mobile.
-
-
-
\ No newline at end of file
diff --git a/app/urls.py b/app/urls.py
index 0096d36..3f8c8fd 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -5,17 +5,5 @@ from . import views
urlpatterns = [
url(r'^$', views.index, name='index'),
url(r'^', include('courses.urls', namespace = 'course')),
- url(r'^cursos/participantes/$', views.participantes_curso, name='participantes_curso'),
- url(r'^cursos/avaliacoes/$', views.avaliacao_curso, name='avaliacao_curso'),
- url(r'^usuarios/', include('users.urls', namespace = 'users')),
- url(r'^enviar_email/$', views.email, name='send_mail'),
- url(r'^perfil/$', views.profile, name='profile'),
- url(r'^perfil/editar/$', views.edit_profile, name='editar_profile'),
- url(r'^perfil/alterar_senha/$', views.reset_pass, name='alterar_senha'),
- url(r'^perfil/colegas/$', views.colegas, name='colegas'),
- url(r'^configuracoes/$', views.configuracoes, name='config'),
- url(r'^mobile/$', views.mobile, name='mobile'),
- url(r'^tarefas/$', views.tarefas, name='tarefas'),
- url(r'^online/$', views.users_online, name='online'),
- url(r'^busca/$', views.search, name='search'),
+ url(r'^', include('users.urls', namespace = 'users')),
]
\ No newline at end of file
diff --git a/app/views.py b/app/views.py
index 643dcb8..e1932f8 100644
--- a/app/views.py
+++ b/app/views.py
@@ -3,56 +3,4 @@ from django.contrib.auth.decorators import login_required
@login_required
def index(request):
- return render(request, "app/index.html")
-
-@login_required
-def test(request):
- return render(request, "admin_index.html")
-
-@login_required
-def participantes_curso(request):
- return render(request, "admin_participantes_curso.html")
-
-@login_required
-def avaliacao_curso(request):
- return render(request, "admin_avaliacao_curso.html")
-
-@login_required
-def email(request):
- return render(request, "admin_send_email.html")
-
-@login_required
-def profile(request):
- return render(request, "admin_profile.html")
-
-@login_required
-def edit_profile(request):
- return render(request, "admin_editar_perfil.html")
-
-@login_required
-def reset_pass(request):
- return render(request, "admin_reset_pass.html")
-
-@login_required
-def colegas(request):
- return render(request, "admin_colegas_curso.html")
-
-@login_required
-def configuracoes(request):
- return render(request, "admin_config.html")
-
-@login_required
-def mobile(request):
- return render(request, "mobile.html")
-
-@login_required
-def tarefas(request):
- return render(request, "admin_tarefas.html")
-
-@login_required
-def users_online(request):
- return render(request, "admin_online.html")
-
-@login_required
-def search(request):
- return render(request, "admin_search.html")
\ No newline at end of file
+ return render(request, "app/index.html")
\ No newline at end of file
diff --git a/core/templates/lembrar_senha.html b/core/templates/lembrar_senha.html
deleted file mode 100644
index eee1874..0000000
--- a/core/templates/lembrar_senha.html
+++ /dev/null
@@ -1,169 +0,0 @@
-
-{% load static %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Projeto Amadeus
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Lembrar senha
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/templates/nova_conta.html b/core/templates/nova_conta.html
deleted file mode 100644
index cac89f1..0000000
--- a/core/templates/nova_conta.html
+++ /dev/null
@@ -1,181 +0,0 @@
-
-{% load static %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Projeto Amadeus
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Nova conta
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/views.py b/core/views.py
index 58651fe..cd60fb2 100644
--- a/core/views.py
+++ b/core/views.py
@@ -5,10 +5,4 @@ def index(request):
context = {
'subscribed_courses': 'testando'
}
- return render(request, "index.html", context)
-
-def nova_conta(request):
- return render(request, "nova_conta.html")
-
-def lembrar_senha(request):
- return render(request, "lembrar_senha.html")
\ No newline at end of file
+ return render(request, "index.html", context)
\ No newline at end of file
diff --git a/courses/templates/course/filtered.html b/courses/templates/course/filtered.html
index 3700955..91fb81b 100644
--- a/courses/templates/course/filtered.html
+++ b/courses/templates/course/filtered.html
@@ -1,6 +1,8 @@
{% extends 'course/index.html' %}
-{% block sidebar i18n %}
+{% load i18n %}
+
+{% block sidebar %}
- {% if user|has_role:'student' and course|show_subscribe:request.user %}
-
-
-
- {% endif %}
diff --git a/users/templates/users/create.html b/users/templates/users/create.html
index 7fcb59a..35286c4 100644
--- a/users/templates/users/create.html
+++ b/users/templates/users/create.html
@@ -18,7 +18,7 @@