Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
84152f8c
authored
Dec 10, 2013
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
circle: use django.contrib.auth.urls
parent
f712819a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
circle/circle/urls.py
+1
-3
circle/dashboard/templates/dashboard/base.html
+2
-2
No files found.
circle/circle/urls.py
View file @
84152f8c
...
...
@@ -2,7 +2,6 @@ from django.conf.urls import patterns, include, url
# from django.views.generic import TemplateView
from
django.contrib
import
admin
from
django.contrib.auth.views
import
login
,
logout
admin
.
autodiscover
()
...
...
@@ -19,7 +18,6 @@ urlpatterns = patterns(
url
(
r'^admin/'
,
include
(
admin
.
site
.
urls
)),
url
(
r'^network/'
,
include
(
'network.urls'
)),
url
(
r'^dashboard/'
,
include
(
'dashboard.urls'
)),
url
(
r'^login/'
,
login
),
url
(
r'^logout/'
,
logout
),
url
(
r'^accounts/'
,
include
(
'django.contrib.auth.urls'
)),
url
(
r'^vm-api/'
,
include
(
'vm.urls'
)),
)
circle/dashboard/templates/dashboard/base.html
View file @
84152f8c
...
...
@@ -28,9 +28,9 @@
<a
class=
"navbar-brand pull-right"
href=
"/network/"
style=
"color: white; font-size: 10px;"
>
Network
</a>
<a
class=
"navbar-brand pull-right"
href=
"/admin/"
style=
"color: white; font-size: 10px;"
>
Admin
</a>
{% if user.is_authenticated %}
<a
class=
"navbar-brand pull-right"
href=
"
/logout/?next=/login/
"
style=
"color: white; font-size: 10px;"
>
Log out {{user}}
</a>
<a
class=
"navbar-brand pull-right"
href=
"
{% url "
logout
"
%}?
next=
{%
url
"
login
"
%}
"
style=
"color: white; font-size: 10px;"
>
Log out {{user}}
</a>
{% else %}
<a
class=
"navbar-brand pull-right"
href=
"
/login/
?next={% url "
dashboard
.
index
"
%}"
style=
"color: white; font-size: 10px;"
>
Login
</a>
<a
class=
"navbar-brand pull-right"
href=
"
{% url "
login
"
%}
?
next=
{%
url
"
dashboard
.
index
"
%}"
style=
"color: white; font-size: 10px;"
>
Login
</a>
{% endif %}
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment