Merge branch 'feature-opensearch' into 'master'

Feature opensearch

* tested in firefox
* doesn't work in chrome 💩

See merge request !272

circle/dashboard/static/dashboard/dashboard.js

@@ -108,9 +108,9 @@ $(function () {
     e.stopImmediatePropagation();
     e.stopImmediatePropagation();
     return false;
     return false;
   });
   });
-  $('[title]:not(.title-favourite)').tooltip();
-  $('.title-favourite').tooltip({'placement': 'right'});
-  $(':input[title]').tooltip({trigger: 'focus', placement: 'auto right'});
+  $('body [title]:not(.title-favourite)').tooltip();
+  $('body .title-favourite').tooltip({'placement': 'right'});
+  $('body :input[title]').tooltip({trigger: 'focus', placement: 'auto right'});
   $(".knob").knob();
   $(".knob").knob();
 
 
   $('[data-toggle="pill"]').click(function() {
   $('[data-toggle="pill"]').click(function() {

circle/dashboard/templates/dashboard/base.html

@@ -8,6 +8,7 @@
   <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/loopj-jquery-simple-slider/css/simple-slider.css"/>
   <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/loopj-jquery-simple-slider/css/simple-slider.css"/>
   <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/introjs/introjs.min.css">
   <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/introjs/introjs.min.css">
   <link href="{{ STATIC_URL }}dashboard/dashboard.css" rel="stylesheet">
   <link href="{{ STATIC_URL }}dashboard/dashboard.css" rel="stylesheet">
+  {% block extra_link_2 %}{% endblock %}
 {% endblock %}
 {% endblock %}
 
 
 
 

circle/dashboard/templates/dashboard/index.html

@@ -3,6 +3,13 @@
 
 
 {% block title-page %}{% trans "Index" %}{% endblock %}
 {% block title-page %}{% trans "Index" %}{% endblock %}
 
 
+{% block extra_link_2 %}
+<link rel="search"
+  type="application/opensearchdescription+xml"
+  href="{% url "dashboard.views.vm-opensearch" %}"
+  title="{% blocktrans with name=COMPANY_NAME %}{{name}} virtual machines{% endblocktrans %}" />
+{% endblock %}
+
 {% block content %}
 {% block content %}
 <div class="body-content dashboard-index">
 <div class="body-content dashboard-index">
   <div class="row">
   <div class="row">

circle/dashboard/templates/dashboard/vm-opensearch.xml

+{% load i18n %}<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>{% blocktrans with name=COMPANY_NAME %}{{name}} virtual machines{% endblocktrans %}</ShortName>
+  <Url type="text/html"
+    template="{{ url }}?s={searchTerms}&amp;stype=shared" />
+</OpenSearchDescription>

circle/dashboard/urls.py

@@ -50,6 +50,7 @@ from .views import (
     VmGraphView, NodeGraphView, NodeListGraphView,
     VmGraphView, NodeGraphView, NodeListGraphView,
     TransferInstanceOwnershipView, TransferInstanceOwnershipConfirmView,
     TransferInstanceOwnershipView, TransferInstanceOwnershipConfirmView,
     TransferTemplateOwnershipView, TransferTemplateOwnershipConfirmView,
     TransferTemplateOwnershipView, TransferTemplateOwnershipConfirmView,
+    OpenSearchDescriptionView,
 )
 )
 from .views.vm import vm_ops, vm_mass_ops
 from .views.vm import vm_ops, vm_mass_ops
 from .views.node import node_ops
 from .views.node import node_ops
@@ -221,6 +222,8 @@ urlpatterns = patterns(
         name="dashboard.views.client-check"),
         name="dashboard.views.client-check"),
     url(r'^token-login/(?P<token>.*)/$', TokenLogin.as_view(),
     url(r'^token-login/(?P<token>.*)/$', TokenLogin.as_view(),
         name="dashboard.views.token-login"),
         name="dashboard.views.token-login"),
+    url(r'^vm/opensearch.xml$', OpenSearchDescriptionView.as_view(),
+        name="dashboard.views.vm-opensearch"),
 )
 )
 
 
 urlpatterns += patterns(
 urlpatterns += patterns(

circle/dashboard/views/index.py

@@ -19,6 +19,7 @@ from __future__ import unicode_literals, absolute_import
 import logging
 import logging
 
 
 from django.core.cache import get_cache
 from django.core.cache import get_cache
+from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.conf import settings
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import Group
 from django.views.generic import TemplateView
 from django.views.generic import TemplateView
@@ -121,3 +122,15 @@ class HelpView(TemplateView):
         ctx.update({"saml": hasattr(settings, "SAML_CONFIG"),
         ctx.update({"saml": hasattr(settings, "SAML_CONFIG"),
                     "store": settings.STORE_URL})
                     "store": settings.STORE_URL})
         return ctx
         return ctx
+
+
+class OpenSearchDescriptionView(TemplateView):
+    template_name = "dashboard/vm-opensearch.xml"
+    content_type = "application/opensearchdescription+xml"
+
+    def get_context_data(self, **kwargs):
+        context = super(OpenSearchDescriptionView, self).get_context_data(
+            **kwargs)
+        context['url'] = self.request.build_absolute_uri(
+            reverse("dashboard.views.vm-list"))
+        return context