dashboard: move open graph to login page

circle/dashboard/context_processors.py

@@ -16,7 +16,6 @@
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
 
 from django.conf import settings
 from django.conf import settings
-from django.templatetags.static import static
 
 
 
 
 def notifications(request):
 def notifications(request):
@@ -31,5 +30,4 @@ def extract_settings(request):
     return {
     return {
         'COMPANY_NAME': getattr(settings, "COMPANY_NAME", None),
         'COMPANY_NAME': getattr(settings, "COMPANY_NAME", None),
         'ADMIN_ENABLED': getattr(settings, "ADMIN_ENABLED", False),
         'ADMIN_ENABLED': getattr(settings, "ADMIN_ENABLED", False),
-        'OG_IMAGE': settings.DJANGO_URL[:-1] + static("dashboard/img/og.png")
     }
     }

circle/dashboard/templates/base.html

@@ -8,8 +8,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="description" content="">
     <meta name="author" content="">
     <meta name="author" content="">
-    {% include "open-graph.html" %}
     <link rel="icon" type="image/png" href="{% static "dashboard/img/favicon.png" %}"/>
     <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>
     <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>
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
     <![endif]-->
 
 
-    {% block extra_link %}{% endblock %}
 
 
     {% block extra_css %}{% endblock %}
     {% block extra_css %}{% endblock %}
   </head>
   </head>

circle/dashboard/templates/open-graph.html

-<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:site_name" content="CIRCLE Cloud - devenv"/>
 <meta property="og:title" content="CIRCLE Cloud - devenv"/>
 <meta property="og:title" content="CIRCLE Cloud - devenv"/>
 <meta property="og:type" content="website"/>
 <meta property="og:type" content="website"/>

circle/dashboard/views/user.py

@@ -34,6 +34,7 @@ from django.core.paginator import Paginator, InvalidPage
 from django.db.models import Q
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import redirect, get_object_or_404
 from django.shortcuts import redirect, get_object_or_404
+from django.templatetags.static import static
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext as _
 from django.views.decorators.http import require_POST
 from django.views.decorators.http import require_POST
 from django.views.generic import (
 from django.views.generic import (
@@ -101,6 +102,8 @@ def circle_login(request):
     authentication_form = CircleAuthenticationForm
     authentication_form = CircleAuthenticationForm
     extra_context = {
     extra_context = {
         'saml2': saml_available,
         'saml2': saml_available,
+        'og_image': (settings.DJANGO_URL.rstrip("/") +
+                     static("dashboard/img/og.png"))
     }
     }
     response = login_view(request, authentication_form=authentication_form,
     response = login_view(request, authentication_form=authentication_form,
                           extra_context=extra_context)
                           extra_context=extra_context)

circle/templates/registration/login.html

@@ -6,6 +6,10 @@
 
 
 {% block title-page %}{% trans "Login" %}{% endblock %}
 {% block title-page %}{% trans "Login" %}{% endblock %}
 
 
+{% block extra_link %}
+  {% include "open-graph.html" %}
+{% endblock %}
+
 {% block navbar-brand %}
 {% block navbar-brand %}
   <a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
   <a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
     <img src="{% static "dashboard/img/logo.png" %}" style="height: 25px;"/>
     <img src="{% static "dashboard/img/logo.png" %}" style="height: 25px;"/>