Commit 8ebf4214 by Kálmán Viktor

Merge branch 'issue-397' into 'master'

Open graph 

![bme](https://git.ik.bme.hu/uploads/circle/cloud/ba6f0686a7/bme.png)

Closes #397

See merge request !316
parents 1a51d380 f5eb9edb
......@@ -10,6 +10,7 @@
<meta name="description" content="">
<meta name="author" content="">
<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 +21,6 @@
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
{% block extra_link %}{% endblock %}
{% block extra_css %}{% endblock %}
</head>
......
<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"/>
......@@ -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)
......
......@@ -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;"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment