Gitlab CSE Unil
Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
M. Chardon
ADIM
Commits
bc159cb0
Commit
bc159cb0
authored
Aug 04, 2015
by
Julien Furrer
Browse files
Modifié url de admin
parent
00bac00d
Changes
3
Hide whitespace changes
Inline
Side-by-side
adim_project/adim_app/views.py
View file @
bc159cb0
...
@@ -60,7 +60,6 @@ def essai(request):
...
@@ -60,7 +60,6 @@ def essai(request):
:return:
:return:
"""
"""
return
render
(
request
,
"adim/essai.html"
,
{})
return
render
(
request
,
"adim/essai.html"
,
{})
# return render(request, "adim_app/essai.html", {})
@
login_required
@
login_required
...
...
adim_project/adim_project/urls.py
View file @
bc159cb0
...
@@ -2,6 +2,10 @@ from django.conf.urls import include, url, static
...
@@ -2,6 +2,10 @@ from django.conf.urls import include, url, static
from
django.conf
import
settings
from
django.conf
import
settings
from
django.contrib
import
admin
from
django.contrib
import
admin
admin
.
site
.
site_header
=
"ADIM - Site d'administration"
admin
.
site
.
site_title
=
"ADIM"
admin
.
site
.
index_title
=
"Administration"
admin
.
site
.
site_url
=
None
admin
.
autodiscover
()
admin
.
autodiscover
()
urlpatterns
=
[
urlpatterns
=
[
...
@@ -9,9 +13,9 @@ urlpatterns = [
...
@@ -9,9 +13,9 @@ urlpatterns = [
# url(r'^$', 'adim_project.views.home', name='home'),
# url(r'^$', 'adim_project.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
# url(r'^blog/', include('blog.urls')),
url
(
r
'^admin/'
,
include
(
admin
.
site
.
urls
)),
# url(r'^admin/', include(admin.site.urls)),
url
(
r
'^s-412-5/admin/'
,
include
(
admin
.
site
.
urls
)),
# url(r'^admin/', include('django_trap.urls', namespace='django_trap')),
# url(r'^admin/', include('django_trap.urls', namespace='django_trap')),
# url(r'^s-412-5/admin/', include(admin.site.urls)),
url
(
r
'^shibauth/'
,
include
(
'shibauth.urls'
)),
url
(
r
'^shibauth/'
,
include
(
'shibauth.urls'
)),
url
(
r
'^accounts/login/$'
,
'django.contrib.auth.views.login'
,
{
'template_name'
:
"adim/home.html"
}),
url
(
r
'^accounts/login/$'
,
'django.contrib.auth.views.login'
,
{
'template_name'
:
"adim/home.html"
}),
...
...
adim_project/templates/apache_config/base.conf
View file @
bc159cb0
...
@@ -95,9 +95,9 @@
...
@@ -95,9 +95,9 @@
{%
if
settings
.
BASE_URL
and
settings
.
BASE_URL
!=
"/"
%}
{%
if
settings
.
BASE_URL
and
settings
.
BASE_URL
!=
"/"
%}
RedirectMatch
^{{
settings
.
BASE_URL
|
make_list
|
slice
:
"-1"
|
join
:
""
}}$ {{
settings
.
BASE_URL
}}
RedirectMatch
^{{
settings
.
BASE_URL
|
make_list
|
slice
:
"-1"
|
join
:
""
}}$ {{
settings
.
BASE_URL
}}
{%
endif
%}
{%
endif
%}
{%
endblock
wsgi
%}
{%
endblock
wsgi
%}
{%
block
rewrite_protected
%}
{%
block
rewrite_protected
%}
<
IfModule
rewrite_module
>
<
IfModule
rewrite_module
>
RewriteEngine
On
RewriteEngine
On
## Retourne une 404 pour media/protected au lien d'une 403
## Retourne une 404 pour media/protected au lien d'une 403
...
@@ -107,9 +107,9 @@
...
@@ -107,9 +107,9 @@
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteRule ^.*$ /maintenance.html
#RewriteRule ^.*$ /maintenance.html
</
IfModule
>
</
IfModule
>
{%
endblock
rewrite_protected
%}
{%
endblock
rewrite_protected
%}
{%
block
rewrite_admin_protected
%}
{%
block
rewrite_admin_protected
%}
<
Location
"{{ settings.BASE_URL|make_list|slice:"
-
1
"|join:"" }}{% url "
admin
:
index
" %}"
>
<
Location
"{{ settings.BASE_URL|make_list|slice:"
-
1
"|join:"" }}{% url "
admin
:
index
" %}"
>
<
IfModule
rewrite_module
>
<
IfModule
rewrite_module
>
RewriteEngine
On
RewriteEngine
On
...
@@ -122,7 +122,7 @@
...
@@ -122,7 +122,7 @@
Deny
from
all
Deny
from
all
</
IfModule
>
</
IfModule
>
</
Location
>
</
Location
>
{%
endblock
rewrite_admin_protected
%}
{%
endblock
rewrite_admin_protected
%}
{%
endblock
main
%}
{%
endblock
main
%}
</
IfModule
>
</
IfModule
>
Write
Preview
Supports
Markdown
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