Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
925cd76e
authored
Apr 20, 2015
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: move open graph to login page
parent
fe436540
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
5 deletions
+9
-5
circle/dashboard/context_processors.py
+0
-2
circle/dashboard/templates/base.html
+1
-2
circle/dashboard/templates/open-graph.html
+1
-1
circle/dashboard/views/user.py
+3
-0
circle/templates/registration/login.html
+4
-0
No files found.
circle/dashboard/context_processors.py
View file @
925cd76e
...
...
@@ -16,7 +16,6 @@
# with CIRCLE. If not, see <http://www.gnu.org/licenses/>.
from
django.conf
import
settings
from
django.templatetags.static
import
static
def
notifications
(
request
):
...
...
@@ -31,5 +30,4 @@ def extract_settings(request):
return
{
'COMPANY_NAME'
:
getattr
(
settings
,
"COMPANY_NAME"
,
None
),
'ADMIN_ENABLED'
:
getattr
(
settings
,
"ADMIN_ENABLED"
,
False
),
'OG_IMAGE'
:
settings
.
DJANGO_URL
[:
-
1
]
+
static
(
"dashboard/img/og.png"
)
}
circle/dashboard/templates/base.html
View file @
925cd76e
...
...
@@ -8,8 +8,8 @@
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0"
>
<meta
name=
"description"
content=
""
>
<meta
name=
"author"
content=
""
>
{% include "open-graph.html" %}
<link
rel=
"icon"
type=
"image/png"
href=
"{% static "
dashboard
/
img
/
favicon
.
png
"
%}"
/>
{% block extra_link %}{% endblock %}
<title>
{% block title %}{% block title-page %}{% endblock %} | {% block title-site %}CIRCLE{% endblock %}{% endblock %}
</title>
...
...
@@ -20,7 +20,6 @@
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
{% block extra_link %}{% endblock %}
{% block extra_css %}{% endblock %}
</head>
...
...
circle/dashboard/templates/open-graph.html
View file @
925cd76e
<meta
property=
"og:image"
content=
"{{
OG_IMAGE
}}"
/>
<meta
property=
"og:image"
content=
"{{
og_image
}}"
/>
<meta
property=
"og:site_name"
content=
"CIRCLE Cloud - devenv"
/>
<meta
property=
"og:title"
content=
"CIRCLE Cloud - devenv"
/>
<meta
property=
"og:type"
content=
"website"
/>
circle/dashboard/views/user.py
View file @
925cd76e
...
...
@@ -34,6 +34,7 @@ from django.core.paginator import Paginator, InvalidPage
from
django.db.models
import
Q
from
django.http
import
HttpResponse
,
HttpResponseRedirect
,
Http404
from
django.shortcuts
import
redirect
,
get_object_or_404
from
django.templatetags.static
import
static
from
django.utils.translation
import
ugettext
as
_
from
django.views.decorators.http
import
require_POST
from
django.views.generic
import
(
...
...
@@ -101,6 +102,8 @@ def circle_login(request):
authentication_form
=
CircleAuthenticationForm
extra_context
=
{
'saml2'
:
saml_available
,
'og_image'
:
(
settings
.
DJANGO_URL
.
rstrip
(
"/"
)
+
static
(
"dashboard/img/og.png"
))
}
response
=
login_view
(
request
,
authentication_form
=
authentication_form
,
extra_context
=
extra_context
)
...
...
circle/templates/registration/login.html
View file @
925cd76e
...
...
@@ -6,6 +6,10 @@
{% block title-page %}{% trans "Login" %}{% endblock %}
{% block extra_link %}
{% include "open-graph.html" %}
{% endblock %}
{% block navbar-brand %}
<a
class=
"navbar-brand"
href=
"{% url "
dashboard
.
index
"
%}"
style=
"padding: 10px 15px;"
>
<img
src=
"{% static "
dashboard
/
img
/
logo
.
png
"
%}"
style=
"height: 25px;"
/>
...
...
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