Merge remote-tracking branch 'origin/master' into issue-218

.gitignore

@@ -39,3 +39,4 @@ circle/static_collected
 
 # jsi18n files
 jsi18n
+scripts.rc

circle/circle/settings/base.py

@@ -161,7 +161,7 @@ STATICFILES_FINDERS = (
 )
 ########## END STATIC FILE CONFIGURATION
 
-p = join(dirname(SITE_ROOT), 'site-circle/static')
+p = normpath(join(SITE_ROOT, '../../site-circle/static'))
 if exists(p):
     STATICFILES_DIRS = (p, )
 
@@ -211,8 +211,8 @@ TEMPLATE_LOADERS = (
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
 TEMPLATE_DIRS = (
+    normpath(join(SITE_ROOT, '../../site-circle/templates')),
     normpath(join(SITE_ROOT, 'templates')),
-    join(dirname(SITE_ROOT), 'site-circle/templates'),
 )
 ########## END TEMPLATE CONFIGURATION
 
@@ -368,9 +368,9 @@ if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
         from shutilwhich import which
     from saml2 import BINDING_HTTP_POST, BINDING_HTTP_REDIRECT
 
-    # INSTALLED_APPS += (  # needed only for testing djangosaml2
-    #     'djangosaml',
-    # )
+    INSTALLED_APPS += (
+        'djangosaml2',
+    )
     AUTHENTICATION_BACKENDS = (
         'django.contrib.auth.backends.ModelBackend',
         'djangosaml2.backends.Saml2Backend',
@@ -465,3 +465,6 @@ SESSION_COOKIE_NAME = "csessid%x" % (((getnode() // 139) ^
                                       (getnode() % 983)) & 0xffff)
 
 MAX_NODE_RAM = get_env_variable("MAX_NODE_RAM", 1024)
+
+# Url to download the client: (e.g. http://circlecloud.org/client/download/)
+CLIENT_DOWNLOAD_URL = get_env_variable('CLIENT_DOWNLOAD_URL', 'http://circlecloud.org/client/download/')

circle/circle/settings/production.py

@@ -20,22 +20,17 @@
 
 
 from os import environ
+from sys import argv
 
 from base import *  # noqa
 
-
-def get_env_setting(setting):
-    """ Get the environment setting or return exception """
-    try:
-        return environ[setting]
-    except KeyError:
-        error_msg = "Set the %s env variable" % setting
-        raise ImproperlyConfigured(error_msg)
+if 'runserver' in argv:
+    SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
 
 ########## HOST CONFIGURATION
 # See: https://docs.djangoproject.com/en/1.5/releases/1.5/
 #      #allowed-hosts-required-in-production
-ALLOWED_HOSTS = get_env_setting('DJANGO_ALLOWED_HOSTS').split(',')
+ALLOWED_HOSTS = get_env_variable('DJANGO_ALLOWED_HOSTS').split(',')
 ########## END HOST CONFIGURATION
 
 ########## EMAIL CONFIGURATION
@@ -44,18 +39,18 @@ EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 
 try:
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-host
-    EMAIL_HOST = environ.get('EMAIL_HOST')
+    EMAIL_HOST = get_env_variable('EMAIL_HOST')
 except ImproperlyConfigured:
-    pass
+    EMAIL_HOST = 'localhost'
 else:
     # https://docs.djangoproject.com/en/dev/ref/settings/#email-host-password
-    EMAIL_HOST_PASSWORD = environ.get('EMAIL_HOST_PASSWORD', '')
+    EMAIL_HOST_PASSWORD = get_env_variable('EMAIL_HOST_PASSWORD', '')
 
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-host-user
-    EMAIL_HOST_USER = environ.get('EMAIL_HOST_USER', 'your_email@example.com')
+    EMAIL_HOST_USER = get_env_variable('EMAIL_HOST_USER', 'your_email@example.com')
 
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-port
-    EMAIL_PORT = environ.get('EMAIL_PORT', 587)
+    EMAIL_PORT = get_env_variable('EMAIL_PORT', 587)
 
     # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-use-tls
     EMAIL_USE_TLS = True
@@ -64,7 +59,8 @@ else:
 EMAIL_SUBJECT_PREFIX = '[%s] ' % SITE_NAME
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#server-email
-SERVER_EMAIL = EMAIL_HOST_USER
+DEFAULT_FROM_EMAIL = get_env_variable('DEFAULT_FROM_EMAIL')
+SERVER_EMAIL = get_env_variable('SERVER_EMAIL', DEFAULT_FROM_EMAIL)
 ########## END EMAIL CONFIGURATION
 
 
@@ -83,5 +79,12 @@ CACHES = {
 
 ########## SECRET CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
-SECRET_KEY = get_env_setting('SECRET_KEY')
+SECRET_KEY = get_env_variable('SECRET_KEY')
 ########## END SECRET CONFIGURATION
+
+level = environ.get('LOGLEVEL', 'INFO')
+LOGGING['handlers']['syslog']['level'] = level
+for i in LOCAL_APPS:
+    LOGGING['loggers'][i] = {'handlers': ['syslog'], 'level': level}
+LOGGING['loggers']['djangosaml2'] = {'handlers': ['syslog'], 'level': level}
+LOGGING['loggers']['django'] = {'handlers': ['syslog'], 'level': level}

circle/common/models.py

@@ -17,6 +17,7 @@
 
 from collections import deque
 from contextlib import contextmanager
+from functools import update_wrapper
 from hashlib import sha224
 from itertools import chain, imap
 from logging import getLogger
@@ -26,6 +27,7 @@ from warnings import warn
 from django.contrib import messages
 from django.contrib.auth.models import User
 from django.core.cache import cache
+from django.core.exceptions import PermissionDenied
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models import (
     CharField, DateTimeField, ForeignKey, NullBooleanField
@@ -36,6 +38,7 @@ from django.utils.functional import Promise
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 from jsonfield import JSONField
 
+from manager.mancelery import celery
 from model_utils.models import TimeStampedModel
 
 logger = getLogger(__name__)
@@ -211,6 +214,46 @@ class ActivityModel(TimeStampedModel):
 
         self.result_data = None if value is None else value.to_dict()
 
+    @classmethod
+    def construct_activity_code(cls, code_suffix, sub_suffix=None):
+        code = join_activity_code(cls.ACTIVITY_CODE_BASE, code_suffix)
+        if sub_suffix:
+            return join_activity_code(code, sub_suffix)
+        else:
+            return code
+
+
+@celery.task()
+def compute_cached(method, instance, memcached_seconds,
+                   key, start, *args, **kwargs):
+    """Compute and store actual value of cached method."""
+    if isinstance(method, basestring):
+        model, id = instance
+        instance = model.objects.get(id=id)
+        try:
+            method = getattr(model, method)
+            while hasattr(method, '_original') or hasattr(method, 'fget'):
+                try:
+                    method = method._original
+                except AttributeError:
+                    method = method.fget
+        except AttributeError:
+            logger.exception("Couldnt get original method of %s",
+                             unicode(method))
+            raise
+
+    #  call the actual method
+    result = method(instance, *args, **kwargs)
+    # save to memcache
+    cache.set(key, result, memcached_seconds)
+    elapsed = time() - start
+    cache.set("%s.cached" % key, 2, max(memcached_seconds * 0.5,
+                                        memcached_seconds * 0.75 - elapsed))
+    logger.debug('Value of <%s>.%s(%s)=<%s> saved to cache (%s elapsed).',
+                 unicode(instance), method.__name__, unicode(args),
+                 unicode(result), elapsed)
+    return result
+
 
 def method_cache(memcached_seconds=60, instance_seconds=5):  # noqa
     """Cache return value of decorated method to memcached and memory.
@@ -233,9 +276,11 @@ def method_cache(memcached_seconds=60, instance_seconds=5):  # noqa
 
     def inner_cache(method):
 
+        method_name = method.__name__
+
         def get_key(instance, *args, **kwargs):
             return sha224(unicode(method.__module__) +
-                          unicode(method.__name__) +
+                          method_name +
                           unicode(instance.id) +
                           unicode(args) +
                           unicode(kwargs)).hexdigest()
@@ -254,21 +299,31 @@ def method_cache(memcached_seconds=60, instance_seconds=5):  # noqa
                 if vals['time'] + instance_seconds > now:
                     # has valid on class cache, return that
                     result = vals['value']
+                    setattr(instance, key, {'time': now, 'value': result})
 
             if result is None:
                 result = cache.get(key)
 
             if invalidate or (result is None):
-                # all caches failed, call the actual method
-                result = method(instance, *args, **kwargs)
-                # save to memcache and class attr
-                cache.set(key, result, memcached_seconds)
+                logger.debug("all caches failed, compute now")
+                result = compute_cached(method, instance, memcached_seconds,
+                                        key, time(), *args, **kwargs)
                 setattr(instance, key, {'time': now, 'value': result})
-                logger.debug('Value of <%s>.%s(%s)=<%s> saved to cache.',
-                             unicode(instance), method.__name__,
-                             unicode(args), unicode(result))
+            elif not cache.get("%s.cached" % key):
+                logger.debug("caches expiring, compute async")
+                cache.set("%s.cached" % key, 1, memcached_seconds * 0.5)
+                try:
+                    compute_cached.apply_async(
+                        queue='localhost.man', kwargs=kwargs, args=[
+                            method_name, (instance.__class__, instance.id),
+                            memcached_seconds, key, time()] + list(args))
+                except:
+                    logger.exception("Couldnt compute async %s", method_name)
 
             return result
+
+        update_wrapper(x, method)
+        x._original = method
         return x
 
     return inner_cache
@@ -367,6 +422,10 @@ class HumanReadableObject(object):
         self._set_values(user_text_template, admin_text_template, params)
 
     def _set_values(self, user_text_template, admin_text_template, params):
+        if isinstance(user_text_template, Promise):
+            user_text_template = user_text_template._proxy____args[0]
+        if isinstance(admin_text_template, Promise):
+            admin_text_template = admin_text_template._proxy____args[0]
         self.user_text_template = user_text_template
         self.admin_text_template = admin_text_template
         self.params = params
@@ -405,6 +464,12 @@ class HumanReadableObject(object):
                              self.user_text_template, unicode(self.params))
             return self.user_text_template
 
+    def get_text(self, user):
+        if user and user.is_superuser:
+            return self.get_admin_text()
+        else:
+            return self.get_user_text()
+
     def to_dict(self):
         return {"user_text_template": self.user_text_template,
                 "admin_text_template": self.admin_text_template,
@@ -431,17 +496,38 @@ class HumanReadableException(HumanReadableObject, Exception):
                     "Level should be the name of an attribute of django."
                     "contrib.messages (and it should be callable with "
                     "(request, message)). Like 'error', 'warning'.")
-        else:
+        elif not hasattr(self, "level"):
             self.level = "error"
 
     def send_message(self, request, level=None):
-        if request.user and request.user.is_superuser:
-            msg = self.get_admin_text()
-        else:
-            msg = self.get_user_text()
+        msg = self.get_text(request.user)
         getattr(messages, level or self.level)(request, msg)
 
 
+def fetch_human_exception(exception, user=None):
+    """Fetch user readable message from exception.
+
+    >>> r = humanize_exception("foo", Exception())
+    >>> fetch_human_exception(r, User())
+    u'foo'
+    >>> fetch_human_exception(r).get_text(User())
+    u'foo'
+    >>> fetch_human_exception(Exception(), User())
+    u'Unknown error'
+    >>> fetch_human_exception(PermissionDenied(), User())
+    u'Permission Denied'
+    """
+
+    if not isinstance(exception, HumanReadableException):
+        if isinstance(exception, PermissionDenied):
+            exception = create_readable(ugettext_noop("Permission Denied"))
+        else:
+            exception = create_readable(ugettext_noop("Unknown error"),
+                                        ugettext_noop("Unknown error: %(ex)s"),
+                                        ex=unicode(exception))
+    return exception.get_text(user) if user else exception
+
+
 def humanize_exception(message, exception=None, level=None, **params):
     """Return new dynamic-class exception which is based on
     HumanReadableException and the original class with the dict of exception.

circle/common/operations.py

@@ -18,10 +18,10 @@
 from inspect import getargspec
 from logging import getLogger
 
-from .models import activity_context, has_suffix
-
 from django.core.exceptions import PermissionDenied, ImproperlyConfigured
+from django.utils.translation import ugettext_noop
 
+from .models import activity_context, has_suffix, humanize_exception
 
 logger = getLogger(__name__)
 
@@ -31,6 +31,7 @@ class Operation(object):
     """
     async_queue = 'localhost.man'
     required_perms = None
+    superuser_required = False
     do_not_call_in_templates = True
     abortable = False
     has_percentage = False
@@ -143,13 +144,26 @@ class Operation(object):
     def check_precond(self):
         pass
 
-    def check_auth(self, user):
-        if self.required_perms is None:
+    @classmethod
+    def check_perms(cls, user):
+        """Check if user is permitted to run this operation on any instance
+        """
+
+        if cls.required_perms is None:
             raise ImproperlyConfigured(
                 "Set required_perms to () if none needed.")
-        if not user.has_perms(self.required_perms):
+        if not user.has_perms(cls.required_perms):
             raise PermissionDenied("%s doesn't have the required permissions."
                                    % user)
+        if cls.superuser_required and not user.is_superuser:
+            raise humanize_exception(ugettext_noop(
+                "Superuser privileges are required."), PermissionDenied())
+
+    def check_auth(self, user):
+        """Check if user is permitted to run this operation on this instance
+        """
+
+        self.check_perms(user)
 
     def create_activity(self, parent, user, kwargs):
         raise NotImplementedError
@@ -185,14 +199,17 @@ class OperatedMixin(object):
     def __getattr__(self, name):
         # NOTE: __getattr__ is only called if the attribute doesn't already
         # exist in your __dict__
-        cls = self.__class__
+        return self.get_operation_class(name)(self)
+
+    @classmethod
+    def get_operation_class(cls, name):
         ops = getattr(cls, operation_registry_name, {})
         op = ops.get(name)
         if op:
-            return op(self)
+            return op
         else:
             raise AttributeError("%r object has no attribute %r" %
-                                 (self.__class__.__name__, name))
+                                 (cls.__name__, name))
 
     def get_available_operations(self, user):
         """Yield Operations that match permissions of user and preconditions.
@@ -256,3 +273,4 @@ def register_operation(op_cls, op_id=None, target_cls=None):
         setattr(target_cls, operation_registry_name, dict())
 
     getattr(target_cls, operation_registry_name)[op_id] = op_cls
+    return op_cls

circle/common/views.py

@@ -25,9 +25,9 @@ def handler500(request):
                     ctx['error'] = exception.get_admin_text()
             except:
                 pass
-        try:
-            resp = render_to_response("500.html", ctx, RequestContext(request))
-        except:
-            resp = render_to_response("500.html", ctx)
-        resp.status_code = 500
-        return resp
+    try:
+        resp = render_to_response("500.html", ctx, RequestContext(request))
+    except:
+        resp = render_to_response("500.html", ctx)
+    resp.status_code = 500
+    return resp

circle/dashboard/admin.py

@@ -21,18 +21,22 @@ from django import contrib
 from django.contrib.auth.admin import UserAdmin, GroupAdmin
 from django.contrib.auth.models import User, Group
 
-from dashboard.models import Profile, GroupProfile
+from dashboard.models import Profile, GroupProfile, ConnectCommand
 
 
 class ProfileInline(contrib.admin.TabularInline):
     model = Profile
 
 
+class CommandInline(contrib.admin.TabularInline):
+    model = ConnectCommand
+
+
 class GroupProfileInline(contrib.admin.TabularInline):
     model = GroupProfile
 
 
-UserAdmin.inlines = (ProfileInline, )
+UserAdmin.inlines = (ProfileInline, CommandInline, )
 GroupAdmin.inlines = (GroupProfileInline, )
 
 contrib.admin.site.unregister(User)

circle/dashboard/autocomplete_light_registry.py

 import autocomplete_light
+from django.contrib.auth.models import User
+from django.utils.html import escape
 from django.utils.translation import ugettext as _
 
 from .views import AclUpdateView
+from .models import Profile
 
 
-class AclUserAutocomplete(autocomplete_light.AutocompleteGenericBase):
+def highlight(field, q, none_wo_match=True):
+    """
+    >>> highlight('<b>Akkount Krokodil', 'kro', False)
+    u'&lt;b&gt;Akkount <span class="autocomplete-hl">Kro</span>kodil'
+    """
+
+    if not field:
+        return None
+    try:
+        match = field.lower().index(q.lower())
+    except ValueError:
+        match = None
+    if q and match is not None:
+        match_end = match + len(q)
+        return (escape(field[:match])
+                + '<span class="autocomplete-hl">'
+                + escape(field[match:match_end])
+                + '</span>' + escape(field[match_end:]))
+    elif none_wo_match:
+        return None
+    else:
+        return escape(field)
+
+
+class AclUserGroupAutocomplete(autocomplete_light.AutocompleteGenericBase):
     search_fields = (
-        ('^first_name', 'last_name', 'username', '^email', 'profile__org_id'),
-        ('^name', 'groupprofile__org_id'),
+        ('first_name', 'last_name', 'username', 'email', 'profile__org_id'),
+        ('name', 'groupprofile__org_id'),
     )
-    autocomplete_js_attributes = {'placeholder': _("Name of group or user")}
-    choice_html_format = u'<span data-value="%s"><span>%s</span> %s</span>'
+    choice_html_format = (u'<span data-value="%s"><span style="display:none"'
+                          u'>%s</span>%s</span>')
 
-    def choice_html(self, choice):
-        try:
-            name = choice.get_full_name()
-        except AttributeError:
-            name = _('group')
-        if name:
-            name = u'(%s)' % name
+    def choice_displayed_text(self, choice):
+        q = unicode(self.request.GET.get('q', ''))
+        name = highlight(unicode(choice), q, False)
+        if isinstance(choice, User):
+            extra_fields = [highlight(choice.get_full_name(), q, False),
+                            highlight(choice.email, q)]
+            try:
+                extra_fields.append(highlight(choice.profile.org_id, q))
+            except Profile.DoesNotExist:
+                pass
+            return '%s (%s)' % (name, ', '.join(f for f in extra_fields
+                                                if f))
+        else:
+            return _('%s (group)') % name
 
+    def choice_html(self, choice):
         return self.choice_html_format % (
-            self.choice_value(choice), self.choice_label(choice), name)
+            self.choice_value(choice), self.choice_label(choice),
+            self.choice_displayed_text(choice))
 
     def choices_for_request(self):
         user = self.request.user
         self.choices = (AclUpdateView.get_allowed_users(user),
                         AclUpdateView.get_allowed_groups(user))
-        return super(AclUserAutocomplete, self).choices_for_request()
+        return super(AclUserGroupAutocomplete, self).choices_for_request()
+
+    def autocomplete_html(self):
+        html = []
+
+        for choice in self.choices_for_request():
+            html.append(self.choice_html(choice))
+
+        if not html:
+            html = self.empty_html_format % _('no matches found').capitalize()
+
+        return self.autocomplete_html_format % ''.join(html)
+
+
+class AclUserAutocomplete(AclUserGroupAutocomplete):
+    def choices_for_request(self):
+        user = self.request.user
+        self.choices = (AclUpdateView.get_allowed_users(user), )
+        return super(AclUserGroupAutocomplete, self).choices_for_request()
 
 
+autocomplete_light.register(AclUserGroupAutocomplete)
 autocomplete_light.register(AclUserAutocomplete)

circle/dashboard/fixtures/test-vm-fixture.json

@@ -1383,7 +1383,6 @@
     "time_of_suspend": null, 
     "ram_size": 200, 
     "priority": 10, 
-    "active_since": null, 
     "template": null, 
     "access_method": "nx", 
     "lease": 1, 
@@ -1413,7 +1412,6 @@
     "time_of_suspend": null, 
     "ram_size": 200, 
     "priority": 10, 
-    "active_since": null, 
     "template": null, 
     "access_method": "nx", 
     "lease": 1, 

circle/dashboard/models.py

@@ -46,8 +46,10 @@ from acl.models import AclBase
 from common.models import HumanReadableObject, create_readable, Encoder
 
 from vm.tasks.agent_tasks import add_keys, del_keys
+from vm.models.instance import ACCESS_METHODS
 
-from .store_api import Store, NoStoreException, NotOkException
+from .store_api import Store, NoStoreException, NotOkException, Timeout
+from .validators import connect_command_template_validator
 
 logger = getLogger(__name__)
 
@@ -100,6 +102,25 @@ class Notification(TimeStampedModel):
         self.message_data = None if value is None else value.to_dict()
 
 
+class ConnectCommand(Model):
+    user = ForeignKey(User, related_name='command_set')
+    access_method = CharField(max_length=10, choices=ACCESS_METHODS,
+                              verbose_name=_('access method'),
+                              help_text=_('Type of the remote access method.'))
+    name = CharField(max_length="128", verbose_name=_('name'), blank=False,
+                     help_text=_("Name of your custom command."))
+    template = CharField(blank=True, null=True, max_length=256,
+                         verbose_name=_('command template'),
+                         help_text=_('Template for connection command string. '
+                                     'Available parameters are: '
+                                     'username, password, '
+                                     'host, port.'),
+                         validators=[connect_command_template_validator])
+
+    def __unicode__(self):
+        return self.template
+
+
 class Profile(Model):
     user = OneToOneField(User)
     preferred_language = CharField(verbose_name=_('preferred language'),
@@ -129,6 +150,25 @@ class Profile(Model):
         default=2048 * 1024 * 1024,
         help_text=_('Disk quota in mebibytes.'))
 
+    def get_connect_commands(self, instance, use_ipv6=False):
+        """ Generate connection command based on template."""
+        single_command = instance.get_connect_command(use_ipv6)
+        if single_command:  # can we even connect to that VM
+            commands = self.user.command_set.filter(
+                access_method=instance.access_method)
+            if commands.count() < 1:
+                return [single_command]
+            else:
+                return [
+                    command.template % {
+                        'port': instance.get_connect_port(use_ipv6=use_ipv6),
+                        'host':  instance.get_connect_host(use_ipv6=use_ipv6),
+                        'password': instance.pw,
+                        'username': 'cloud',
+                    } for command in commands]
+        else:
+            return []
+
     def notify(self, subject, template, context=None, valid_until=None,
                **kwargs):
         if context is not None:
@@ -161,6 +201,11 @@ class Profile(Model):
     def __unicode__(self):
         return self.get_display_name()
 
+    def save(self, *args, **kwargs):
+        if self.org_id == "":
+            self.org_id = None
+        super(Profile, self).save(*args, **kwargs)
+
     class Meta:
         permissions = (
             ('use_autocomplete', _('Can use autocomplete.')),
@@ -216,7 +261,7 @@ def get_or_create_profile(self):
 Group.profile = property(get_or_create_profile)
 
 
-def create_profile(sender, user, request, **kwargs):
+def create_profile(user):
     if not user.pk:
         return False
     profile, created = Profile.objects.get_or_create(user=user)
@@ -227,7 +272,11 @@ def create_profile(sender, user, request, **kwargs):
         logger.exception("Can't create user %s", unicode(user))
     return created
 
-user_logged_in.connect(create_profile)
+
+def create_profile_hook(sender, user, request, **kwargs):
+    return create_profile(user)
+
+user_logged_in.connect(create_profile_hook)
 
 if hasattr(settings, 'SAML_ORG_ID_ATTRIBUTE'):
     logger.debug("Register save_org_id to djangosaml2 pre_user_save")
@@ -301,7 +350,7 @@ def update_store_profile(sender, **kwargs):
                       profile.disk_quota)
     except NoStoreException:
         logger.debug("Store is not available.")
-    except NotOkException:
+    except (NotOkException, Timeout):
         logger.critical("Store is not accepting connections.")
 
 

circle/dashboard/static/dashboard/dashboard.css

@@ -591,11 +591,15 @@ footer a, footer a:hover, footer a:visited {
   width: 100px;
 }
 
+#group-detail-user-table tr:last-child td:nth-child(2) {
+  text-align: left;
+}
+
 #group-detail-perm-header {
   margin-top: 25px;
 }
 
-textarea[name="list-new-namelist"] {
+textarea[name="new_members"] {
   max-width: 500px;
   min-height: 80px;
   margin-bottom: 10px;
@@ -654,7 +658,8 @@ textarea[name="list-new-namelist"] {
   width: 130px;
 }
 
-#vm-details-connection-string-copy {
+.vm-details-connection-string-copy,
+#vm-details-pw-show {
   cursor: pointer;
 }
 
@@ -681,10 +686,9 @@ textarea[name="list-new-namelist"] {
   max-width: 200px;
 }
 
-#dashboard-vm-details-connect-command {
+.dashboard-vm-details-connect-command {
   /* for mobile view */
   margin-bottom: 20px;
-
 }
 
 #store-list-list {
@@ -867,3 +871,135 @@ textarea[name="list-new-namelist"] {
   border-bottom: 1px dotted #aaa;
   padding: 5px 0px;
 }
+
+#profile-key-list-table td:last-child, #profile-key-list-table th:last-child,
+#profile-command-list-table td:last-child, #profile-command-list-table th:last-child,
+#profile-command-list-table td:nth-child(2), #profile-command-list-table th:nth-child(2) {
+  text-align: center;
+  vertical-align: middle;
+}
+
+#vm-list-table .migrating-icon {
+  -webkit-animation: passing 2s linear infinite;
+  animation: passing 2s linear infinite;
+}
+
+@-webkit-keyframes passing {
+  0% {
+    -webkit-transform: translateX(50%);
+    transform: translateX(50%);
+    opacity: 0;
+  }
+
+  50% {
+    -webkit-transform: translateX(0%);
+    transform: translateX(0%);
+    opacity: 1;
+  }
+
+  100% {
+    -webkit-transform: translateX(-50%);
+    transform: translateX(-50%);
+    opacity: 0;
+  }
+}
+
+@keyframes passing {
+  0% {
+    -webkit-transform: translateX(50%);
+    -ms-transform: translateX(50%);
+    transform: translateX(50%);
+    opacity: 0;
+  }
+
+  50% {
+    -webkit-transform: translateX(0%);
+    -ms-transform: translateX(0%);
+    transform: translateX(0%);
+    opacity: 1;
+  }
+
+  100% {
+    -webkit-transform: translateX(-50%);
+    -ms-transform: translateX(-50%);
+    transform: translateX(-50%);
+    opacity: 0;
+  }
+}
+
+.mass-migrate-node {
+  cursor: pointer;
+}
+
+.mass-op-panel {
+  padding: 6px 10px;
+}
+
+.mass-op-panel .check {
+  color: #449d44;
+}
+
+.mass-op-panel .minus {
+  color: #d9534f;
+}
+
+.mass-op-panel .status-icon {
+  font-size: .8em;
+}
+
+#vm-list-search, #vm-mass-ops {
+  margin-top: 8px;
+}
+
+#vm-list-search-checkbox {
+  margin-top: -1px;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+#vm-list-search-checkbox-span {
+  cursor: pointer
+}
+
+#vm-activity-state {
+  margin-bottom: 15px;
+}
+
+.autocomplete-hl {
+  color: #b20000;
+  font-weight: bold;
+}
+
+.hilight .autocomplete-hl {
+  color: orange;
+}
+
+.node-list-table tbody>tr>td, .node-list-table thead>tr>th {
+  vertical-align: middle;
+}
+
+.node-list-table thead>tr>th,
+.node-list-table .enabled, .node-list-table .priority,
+.node-list-table .overcommit, .node-list-table .number_of_VMs {
+  text-align: center;
+}
+
+.node-list-table-thin {
+  width: 10px;
+}
+
+.node-list-table-monitor {
+  width: 250px;
+}
+
+.graph-images img {
+  max-width: 100%;
+}
+
+#vm-list-table tbody td:nth-child(3) {
+  white-space: nowrap;
+}
+
+#vm-list-table td {
+  vertical-align: middle;
+}

circle/dashboard/static/dashboard/dashboard.js

@@ -234,6 +234,7 @@ $(function () {
             'host': result[i].host,
             'icon': result[i].icon,
             'status': result[i].status,
+            'owner': result[i].owner,
           });
         }
       });
@@ -244,28 +245,29 @@ $(function () {
     var search_result = []
     var html = '';
     for(var i in my_vms) {
-      if(my_vms[i].name.indexOf(input) != -1) {
+      if(my_vms[i].name.indexOf(input) != -1 || my_vms[i].host.indexOf(input) != -1) {
         search_result.push(my_vms[i]);
       }
     }
     search_result.sort(compareVmByFav);
     for(var i=0; i<5 && i<search_result.length; i++)
       html += generateVmHTML(search_result[i].pk, search_result[i].name, 
-                             search_result[i].host, search_result[i].icon,
+                             search_result[i].owner ? search_result[i].owner : search_result[i].host, search_result[i].icon,
                              search_result[i].status, search_result[i].fav,
                              (search_result.length < 5));
     if(search_result.length == 0)
       html += '<div class="list-group-item list-group-item-last">' + gettext("No result") + '</div>';
     $("#dashboard-vm-list").html(html);
     $('.title-favourite').tooltip({'placement': 'right'});
+  });
 
-    // if there is only one result and ENTER is pressed redirect
-    if(e.keyCode == 13 && search_result.length == 1) {
-      window.location.href = "/dashboard/vm/" + search_result[0].pk + "/";
-    }
-    if(e.keyCode == 13 && search_result.length > 1 && input.length > 0) {
-      window.location.href = "/dashboard/vm/list/?s=" + input;
+  $("#dashboard-vm-search-form").submit(function() {
+    var vm_list_items = $("#dashboard-vm-list .list-group-item");
+    if(vm_list_items.length == 1 && vm_list_items.first().prop("href")) {
+      window.location.href = vm_list_items.first().prop("href");
+      return false;
     }
+    return true;
   });
 
   /* search for nodes */
@@ -382,6 +384,33 @@ $(function () {
     $('.notification-messages').load("/dashboard/notifications/");
     $('#notification-button a span[class*="badge-pulse"]').remove();  
   });
+  
+  /* on the client confirmation button fire the clientInstalledAction */
+  $(document).on("click", "#client-check-button", function(event) {
+    var connectUri = $('#connect-uri').val();
+    clientInstalledAction(connectUri);
+    return false;
+  });
+
+  $("#dashboard-vm-details-connect-button").click(function(event) {
+    var connectUri = $(this).attr("href");
+    clientInstalledAction(connectUri);
+    return false;
+  });
+
+  /* change graphs */
+  $(".graph-buttons a").click(function() {
+    var time = $(this).data("graph-time");
+    $(".graph-images img").each(function() {
+      var src = $(this).prop("src");
+      var new_src = src.substring(0, src.lastIndexOf("/") + 1) + time;
+      $(this).prop("src", new_src);
+    });
+    // change the buttons too
+    $(".graph-buttons a").removeClass("btn-primary").addClass("btn-default");
+    $(this).removeClass("btn-default").addClass("btn-primary");
+    return false;
+  });
 });
 
 function generateVmHTML(pk, name, host, icon, _status, fav, is_last) {
@@ -487,8 +516,17 @@ function addSliderMiscs() {
     ram_fire = true;
     $(".ram-slider").simpleSlider("setValue", parseInt(val));
   });
+
+  setDefaultSliderValues();
+
+  $(".cpu-priority-slider").simpleSlider("setDisabled", $(".cpu-priority-input").prop("disabled"));
+  $(".cpu-count-slider").simpleSlider("setDisabled", $(".cpu-count-input").prop("disabled"));
+  $(".ram-slider").simpleSlider("setDisabled", $(".ram-input").prop("disabled"));
+}
+
+function setDefaultSliderValues() {
   $(".cpu-priority-input").trigger("change");
-  $(".cpu-count-input, .ram-input").trigger("input");
+  $(".ram-input, .cpu-count-input").trigger("input");
 }
 
 
@@ -579,6 +617,12 @@ function addModalConfirmation(func, data) {
   });
 }
 
+function clientInstalledAction(location) {   
+  setCookie('downloaded_client', true, 365 * 24 * 60 * 60, "/");
+  window.location.href = location;
+  $('#confirmation-modal').modal("hide");
+}
+
 // for AJAX calls
 /**                                                                         
  * Getter for user cookies                                                  
@@ -601,9 +645,25 @@ function getCookie(name) {
   return cookieValue;                                                       
 }
 
+function setCookie(name, value, seconds, path) {
+  if (seconds!=null) {
+    var today = new Date();
+    var expire = new Date();
+    expire.setTime(today.getTime() + seconds);
+  }
+  document.cookie = name+"="+escape(value)+"; expires="+expire.toUTCString()+"; path="+path;
+}
 
 /* no js compatibility */
 function noJS() {
   $('.no-js-hidden').show();
   $('.js-hidden').hide();
 }
+
+
+function getParameterByName(name) {
+    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+        results = regex.exec(location.search);
+    return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+}

circle/dashboard/static/dashboard/group-list.js

-var ctrlDown, shiftDown = false;
-var ctrlKey = 17;
-var shiftKey = 16;
-var selected = [];
-
 $(function() {
-  $(document).keydown(function(e) {
-    if (e.keyCode == ctrlKey) ctrlDown = true;
-    if (e.keyCode == shiftKey) shiftDown = true;
-  }).keyup(function(e) {
-    if (e.keyCode == ctrlKey) ctrlDown = false;
-    if (e.keyCode == shiftKey) shiftDown = false;
-  });
-
-  $('.group-list-table tbody').find('tr').mousedown(function() {
-    var retval = true;
-    if (ctrlDown) {
-      setRowColor($(this));
-      if(!$(this).hasClass('group-list-selected')) {
-        selected.splice(selected.indexOf($(this).index()), 1);
-      } else {
-        selected.push($(this).index());
-      }
-      retval = false;
-    } else if(shiftDown) {
-      if(selected.length > 0) {
-        start = selected[selected.length - 1] + 1;
-        end = $(this).index();
-
-        if(start > end) {
-          var tmp = start - 1; start = end; end = tmp - 1;
-        }
-
-        for(var i = start; i <= end; i++) {
-          if(selected.indexOf(i) < 0) {
-            selected.push(i);
-            setRowColor($('.group-list-table tbody tr').eq(i));
-            }
-        }
-      }
-      retval = false;
-    } else {
-      $('.group-list-selected').removeClass('group-list-selected');
-      $(this).addClass('group-list-selected');
-      selected = [$(this).index()];
-    }
-
-    // reset btn disables
-    $('.group-list-table tbody tr .btn').attr('disabled', false);
-    // show/hide group controls
-    if(selected.length > 1) {
-      $('.group-list-group-control a').attr('disabled', false);
-      for(var i = 0; i < selected.length; i++) {
-        $('.group-list-table tbody tr').eq(selected[i]).find('.btn').attr('disabled', true);
-      }
-    } else {
-      $('.group-list-group-control a').attr('disabled', true);
-    }
-    return retval;
-  });
-
-  $('#group-list-group-migrate').click(function() {
-    console.log(collectIds(selected));
-  });
-
-
-  $('tbody a').mousedown(function(e) {
-    // parent tr doesn't get selected when clicked
-    e.stopPropagation();
-    });
-
-  $('tbody a').click(function(e) {
-    // browser doesn't jump to top when clicked the buttons
-      
-      if(!$(this).hasClass('real-link')) {
-      return false;
-    }
-  });
-
-  
   /* rename */
   $("#group-list-rename-button, .group-details-rename-button").click(function() {
     $("#group-list-column-name", $(this).closest("tr")).hide();
@@ -113,51 +34,4 @@ $(function() {
     return false;
   });
 
-
-  /* group actions */
-
-  /* select all */
-  $('#group-list-group-select-all').click(function() {
-    $('.group-list-table tbody tr').each(function() {
-      var index = $(this).index();
-      if(selected.indexOf(index) < 0) {
-        selected.push(index);
-        $(this).addClass('group-list-selected');
-      }
-    });
-    if(selected.length > 0)
-      $('.group-list-group-control a').attr('disabled', false);
-    return false;
-  });
-
-  /* mass vm delete */
-  $('#group-list-group-delete').click(function() {
-    addModalConfirmation(massDeleteVm,
-      {
-        'url': '/dashboard/group/mass-delete/',
-        'data': {
-          'selected': selected,
-          'v': collectIds(selected)
-        }
-      }
-    );
-    return false;
-  });
 });
-
-function collectIds(rows) {
-  var ids = [];
-  for(var i = 0; i < rows.length; i++) {
-    var div = $('td:first-child div', $('.group-list-table tbody tr').eq(rows[i]));
-    ids.push(div.prop('id').replace('node-', ''));
-  }
-  return ids;  
-}
-
-function setRowColor(row) {
-  if(!row.hasClass('group-list-selected')) {
-    row.addClass('group-list-selected');
-  } else {
-    row.removeClass('group-list-selected');
-  }
-}

circle/dashboard/static/dashboard/loopj-jquery-simple-slider/js/simple-slider.js

@@ -80,7 +80,7 @@ var __slice = [].slice,
         });
       }
       this.dragger.mousedown(function(e) {
-        if (e.which !== 1) {
+        if (e.which !== 1 || _this.settings.disabled) {
           return;
         }
         _this.dragging = true;
@@ -170,6 +170,9 @@ var __slice = [].slice,
       if (this.input.data("slider-showscale") != null) {
         options.showScale = this.input.data("slider-showscale");
       }
+      if (this.input.data("slider-disabled")) {
+        options.disabled = this.input.data("slider-disabled");
+      }
       return options;
     }
 
@@ -207,8 +210,12 @@ var __slice = [].slice,
       return this.valueChanged(value, ratio, "setValue");
     };
 
+    SimpleSlider.prototype.setDisabled = function(value) {
+      this.settings.disabled = value;
+    }
+
     SimpleSlider.prototype.trackEvent = function(e) {
-      if (e.which !== 1) {
+      if (e.which !== 1 || this.settings.disabled) {
         return;
       }
       this.domDrag(e.pageX, e.pageY, true);
@@ -374,7 +381,7 @@ var __slice = [].slice,
     simpleSlider: function() {
       var params, publicMethods, settingsOrMethod;
       settingsOrMethod = arguments[0], params = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
-      publicMethods = ["setRatio", "setValue"];
+      publicMethods = ["setRatio", "setValue", "setDisabled", ];
       return $(this).each(function() {
         var obj, settings;
         if (settingsOrMethod && __indexOf.call(publicMethods, settingsOrMethod) >= 0) {

circle/dashboard/static/dashboard/node-details.js

+$(function() {
   /* rename */
   $("#node-details-h1-name, .node-details-rename-button").click(function() {
     $("#node-details-h1-name").hide();
@@ -43,26 +44,6 @@
     return false;
   });
 
-function changeNodeStatus(data) {
-  $.ajax({
-    type: 'POST',
-    url: data['url'],
-    headers: {"X-CSRFToken": getCookie('csrftoken')},
-    success: function(re, textStatus, xhr) {
-      if(!data['redirect']) {
-        selected = [];
-        addMessage(re['message'], 'success');
-      
-      } else {
-        window.location.replace('/dashboard');
-      }
-    },
-    error: function(xhr, textStatus, error) {
-      addMessage('Uh oh :(', 'danger')
-    }
-  });
-}
-
   // remove trait
   $('.node-details-remove-trait').click(function() {
     var to_remove =  $(this).data("trait-pk");
@@ -86,3 +67,24 @@ function changeNodeStatus(data) {
     });
     return false;
   });
+
+});
+
+function changeNodeStatus(data) {
+  $.ajax({
+    type: 'POST',
+    url: data['url'],
+    headers: {"X-CSRFToken": getCookie('csrftoken')},
+    success: function(re, textStatus, xhr) {
+      if(!data['redirect']) {
+        selected = [];
+        addMessage(re['message'], 'success');
+      } else {
+        window.location.replace('/dashboard');
+      }
+    },
+    error: function(xhr, textStatus, error) {
+      addMessage('Uh oh :(', 'danger')
+    }
+  });
+}

circle/dashboard/static/dashboard/node-list.js

-var ctrlDown, shiftDown = false;
-var ctrlKey = 17;
-var shiftKey = 16;
-var selected = [];
-
 $(function() {
-  $(document).keydown(function(e) {
-    if (e.keyCode == ctrlKey) ctrlDown = true;
-    if (e.keyCode == shiftKey) shiftDown = true;
-  }).keyup(function(e) {
-    if (e.keyCode == ctrlKey) ctrlDown = false;
-    if (e.keyCode == shiftKey) shiftDown = false;
-  });
-
-  $('.node-list-table tbody').find('tr').mousedown(function() {
-    var retval = true;
-    if (ctrlDown) {
-      setRowColor($(this));
-      if(!$(this).hasClass('node-list-selected')) {
-        selected.splice(selected.indexOf($(this).index()), 1);
-      } else {
-        selected.push($(this).index());
-      }
-      retval = false;
-    } else if(shiftDown) {
-      if(selected.length > 0) {
-        start = selected[selected.length - 1] + 1;
-        end = $(this).index();
-
-        if(start > end) {
-          var tmp = start - 1; start = end; end = tmp - 1;
-        }
-
-        for(var i = start; i <= end; i++) {
-          if(selected.indexOf(i) < 0) {
-            selected.push(i);
-            setRowColor($('.node-list-table tbody tr').eq(i));
-            }
-        }
-      }
-      retval = false;
-    } else {
-      $('.node-list-selected').removeClass('node-list-selected');
-      $(this).addClass('node-list-selected');
-      selected = [$(this).index()];
-    }
-
-    // reset btn disables
-    $('.node-list-table tbody tr .btn').attr('disabled', false);
-    // show/hide group controls
-    if(selected.length > 1) {
-      $('.node-list-group-control a').attr('disabled', false);
-      for(var i = 0; i < selected.length; i++) {
-        $('.node-list-table tbody tr').eq(selected[i]).find('.btn').attr('disabled', true);
-      }
-    } else {
-      $('.node-list-group-control a').attr('disabled', true);
-    }
-    return retval;
-  });
-
-  $('#node-list-group-migrate').click(function() {
-    console.log(collectIds(selected));
-  });
-
-  $(document).ready( function()
-  {
+  $(document).ready( function() {
     colortable();
-    $('.node-list-details').popover(
-    {
-      placement : 'auto',
-      html : true,
-      trigger : 'click',
-    });
-  });
-	
-
-  $('tbody a').mousedown(function(e) {
-    // parent tr doesn't get selected when clicked
-    e.stopPropagation();
-    });
-
-  $('tbody a').click(function(e) {
-    // browser doesn't jump to top when clicked the buttons
-      
-      if(!$(this).hasClass('real-link')) {
-      return false;
-    }
   });
 
   // find disabled nodes, set danger (red) on the rows
@@ -176,51 +91,4 @@ $(function() {
     });
     return false;
   });
-
-  /* group actions */
-
-  /* select all */
-  $('#node-list-group-select-all').click(function() {
-    $('.node-list-table tbody tr').each(function() {
-      var index = $(this).index();
-      if(selected.indexOf(index) < 0) {
-        selected.push(index);
-        $(this).addClass('node-list-selected');
-      }
-    });
-    if(selected.length > 0)
-      $('.node-list-group-control a').attr('disabled', false);
-    return false;
-  });
-
-  /* mass vm delete */
-  $('#node-list-group-delete').click(function() {
-    addModalConfirmation(massDeleteVm,
-      {
-        'url': '/dashboard/node/mass-delete/',
-        'data': {
-          'selected': selected,
-          'v': collectIds(selected)
-        }
-      }
-    );
-    return false;
-  });
 });
-
-function collectIds(rows) {
-  var ids = [];
-  for(var i = 0; i < rows.length; i++) {
-    var div = $('td:first-child div', $('.node-list-table tbody tr').eq(rows[i]));
-    ids.push(div.prop('id').replace('node-', ''));
-  }
-  return ids;  
-}
-
-function setRowColor(row) {
-  if(!row.hasClass('node-list-selected')) {
-    row.addClass('node-list-selected');
-  } else {
-    row.removeClass('node-list-selected');
-  }
-}

circle/dashboard/static/dashboard/template-list.js

@@ -39,6 +39,7 @@ $(function() {
   $(".template-list-table thead th").css("cursor", "pointer");
   
   $(".template-list-table th a").on("click", function(event) {
+    if(!$(this).closest("th").data("sort")) return true;
     event.preventDefault();
   });
 });

circle/dashboard/static/dashboard/vm-common.js

@@ -3,7 +3,7 @@
 $(function() {
 
   /* vm operations */
-  $('#ops, #vm-details-resources-disk, #vm-details-renew-op, #vm-details-pw-reset, #vm-details-add-interface').on('click', '.operation', function(e) {
+  $('#ops, #vm-details-resources-disk, #vm-details-renew-op, #vm-details-pw-reset, #vm-details-add-interface, .operation-wrapper').on('click', '.operation', function(e) {
     var icon = $(this).children("i").addClass('fa-spinner fa-spin');
 
     $.ajax({

circle/dashboard/static/dashboard/vm-create.js

@@ -28,6 +28,9 @@ function vmCreateLoaded() {
         $('#create-modal').on('hidden.bs.modal', function() {
             $('#create-modal').remove();
         });
+        $("#create-modal").on("shown.bs.modal", function() {
+          setDefaultSliderValues();
+        });
     });
     return false;
   });
@@ -217,6 +220,10 @@ function vmCustomizeLoaded() {
     });
     if(error) return true;
 
+    $(this).find("i").prop("class", "fa fa-spinner fa-spin");
+
+    if($("#create-modal")) return true;
+
     $.ajax({
       url: '/dashboard/vm/create/',
       headers: {"X-CSRFToken": getCookie('csrftoken')},

circle/dashboard/static/dashboard/vm-details.js

@@ -105,19 +105,20 @@ $(function() {
   $("#vm-details-pw-show").click(function() {
     var input = $(this).parent("div").children("input");
     var eye = $(this).children("#vm-details-pw-eye");
+    var span = $(this);
     
-    eye.tooltip("destroy")
+    span.tooltip("destroy")
     if(eye.hasClass("fa-eye")) {
       eye.removeClass("fa-eye").addClass("fa-eye-slash");
       input.prop("type", "text");
-      input.focus();
-      eye.prop("title", "Hide password");
+      input.select();
+      span.prop("title", gettext("Hide password"));
     } else {
       eye.removeClass("fa-eye-slash").addClass("fa-eye");
       input.prop("type", "password");
-      eye.prop("title", "Show password");
+      span.prop("title", gettext("Show password"));
     }
-    eye.tooltip();
+    span.tooltip();
   });
 
   /* change password confirmation */
@@ -186,18 +187,7 @@ $(function() {
       success: function(re, textStatus, xhr) { 
         /* remove the html element */
         $('a[data-interface-pk="' + data.pk + '"]').closest("div").fadeOut();
-        
-        /* add the removed element to the list */
-        network_select = $('select[name="new_network_vlan"]');
-        name_html = (re.removed_network.managed ? "": "") + " " + re.removed_network.vlan;
-        option_html = '<option value="' + re.removed_network.vlan_pk + '">' + name_html + '</option>';
-        // if it's -1 then it's a dummy placeholder so we can use .html
-        if($("option", network_select)[0].value === "-1") {
-          network_select.html(option_html);
-          network_select.next("div").children("button").prop("disabled", false); 
-        } else {
-          network_select.append(option_html);
-        }
+        location.reload();
       },
       error: function(xhr, textStatus, error) {
         addMessage('Uh oh :(', 'danger')
@@ -209,7 +199,7 @@ $(function() {
   $("#vm-details-h1-name, .vm-details-rename-button").click(function() {
     $("#vm-details-h1-name").hide();
     $("#vm-details-rename").css('display', 'inline');
-    $("#vm-details-rename-name").focus();
+    $("#vm-details-rename-name").select();
     return false;
   });
 
@@ -217,7 +207,7 @@ $(function() {
   $(".vm-details-home-edit-name-click").click(function() {
     $(".vm-details-home-edit-name-click").hide();
     $("#vm-details-home-rename").show();
-    $("input", $("#vm-details-home-rename")).focus();
+    $("input", $("#vm-details-home-rename")).select();
     return false;
   });
 
@@ -317,8 +307,8 @@ $(function() {
   });
 
   // select connection string
-  $("#vm-details-connection-string-copy").click(function() {
-    $("#vm-details-connection-string").focus();
+  $(".vm-details-connection-string-copy").click(function() {
+    $(this).parent("div").find("input").select();
   });
 
   $("a.operation-password_reset").click(function() {
@@ -388,8 +378,14 @@ function checkNewActivity(runs) {
       }
       $("#vm-details-state span").html(data['human_readable_status'].toUpperCase());
       if(data['status'] == "RUNNING") {
+        if(data['connect_uri']) {
+            $("#dashboard-vm-details-connect-button").removeClass('disabled');
+        }
         $("[data-target=#_console]").attr("data-toggle", "pill").attr("href", "#console").parent("li").removeClass("disabled");
       } else {
+        if(data['connect_uri']) {
+            $("#dashboard-vm-details-connect-button").addClass('disabled');
+        }
         $("[data-target=#_console]").attr("data-toggle", "_pill").attr("href", "#").parent("li").addClass("disabled");
       }
 

circle/dashboard/static/dashboard/vm-list.js

@@ -14,6 +14,7 @@ $(function() {
 
   $('.vm-list-table tbody').find('tr').mousedown(function() {
     var retval = true;
+    if(!$(this).data("vm-pk")) return;
     if (ctrlDown) {
       setRowColor($(this));
       if(!$(this).hasClass('vm-list-selected')) {
@@ -46,86 +47,20 @@ $(function() {
       selected = [{'index': $(this).index(), 'vm': $(this).data("vm-pk")}];
     }
 
-    // reset btn disables
-    $('.vm-list-table tbody tr .btn').attr('disabled', false);
     // show/hide group controls
     if(selected.length > 0) {
-      $('.vm-list-group-control a').attr('disabled', false);
-      for(var i = 0; i < selected.length; i++) {
-        $('.vm-list-table tbody tr').eq(selected[i]).find('.btn').attr('disabled', true);
-      }
+      $('#vm-mass-ops .mass-operation').attr('disabled', false);
     } else {
-      $('.vm-list-group-control a').attr('disabled', true);
+      $('#vm-mass-ops .mass-operation').attr('disabled', true);
     }
     return retval;
   });
 
-    
-  $('#vm-list-group-migrate').click(function() {
-    // pass?
-  });
-
-  $('.vm-list-details').popover({
-    'placement': 'auto',
-    'html': true,
-    'trigger': 'hover'
-  });
-
-  $('.vm-list-connect').popover({
-    'placement': 'left',
-    'html': true,
-    'trigger': 'click'
-  });
-
   $('tbody a').mousedown(function(e) {
     // parent tr doesn't get selected when clicked
     e.stopPropagation();
     });
 
-  $('tbody a').click(function(e) {
-    // browser doesn't jump to top when clicked the buttons
-    if(!$(this).hasClass('real-link')) {
-      return false;
-    }
-  });
-
-  /* rename */
-  $("#vm-list-rename-button, .vm-details-rename-button").click(function() {
-    $("#vm-list-column-name", $(this).closest("tr")).hide();
-    $("#vm-list-rename", $(this).closest("tr")).css('display', 'inline');
-    $("#vm-list-rename-name", $(this).closest("tr")).focus();
-  });
-
-  /* rename ajax */
-  $('.vm-list-rename-submit').click(function() {
-    var row = $(this).closest("tr")
-    var name = $('#vm-list-rename-name', row).val();
-    var url = '/dashboard/vm/' + row.children("td:first-child").text().replace(" ", "") + '/';
-    $.ajax({
-      method: 'POST',
-      url: url,
-      data: {'new_name': name},
-      headers: {"X-CSRFToken": getCookie('csrftoken')},
-      success: function(data, textStatus, xhr) {
-        
-        $("#vm-list-column-name", row).html(
-          $("<a/>", {
-            'class': "real-link",
-            href: "/dashboard/vm/" + data['vm_pk'] + "/",
-            text: data['new_name']
-          })
-        ).show();
-        $('#vm-list-rename', row).hide();
-        // addMessage(data['message'], "success");
-      },
-      error: function(xhr, textStatus, error) {
-        addMessage("Error during renaming!", "danger");
-      }
-    });
-    return false;
-  });
-  
-  
   /* group actions */
 
   /* select all */
@@ -133,27 +68,69 @@ $(function() {
     $('.vm-list-table tbody tr').each(function() {
       var index = $(this).index();
       var vm = $(this).data("vm-pk");
-      if(!isAlreadySelected(vm)) {
+      if(vm && !isAlreadySelected(vm)) {
         selected.push({'index': index, 'vm': vm});
         $(this).addClass('vm-list-selected');
       }
     });
     if(selected.length > 0)
-      $('.vm-list-group-control a').attr('disabled', false);
+      $('#vm-mass-ops .mass-operation').attr('disabled', false);
+    return false;
+  });
+
+
+  /* mass operations */
+  $("#vm-mass-ops").on('click', '.mass-operation', function(e) {
+    var icon = $(this).children("i").addClass('fa-spinner fa-spin');
+    params = "?" + selected.map(function(a){return "vm=" + a.vm}).join("&");
+
+    $.ajax({
+      type: 'GET',
+      url: $(this).attr('href') + params,
+      success: function(data) {
+        icon.removeClass("fa-spinner fa-spin");
+        $('body').append(data);
+        $('#confirmation-modal').modal('show');
+        $('#confirmation-modal').on('hidden.bs.modal', function() {
+          $('#confirmation-modal').remove();
+        });
+        $("[title]").tooltip({'placement': "left"});
+      }
+    });
     return false;
   });
 
-  /* mass vm delete */
-  $('#vm-list-group-delete').click(function() {
-    addModalConfirmation(massDeleteVm,
-      {
-        'url': '/dashboard/vm/mass-delete/',
-        'data': {
-          'selected': selected,
-          'v': collectIds(selected)
+
+  $("body").on("click", "#op-form-send", function() {
+    var url = $(this).closest("form").prop("action");
+    $(this).find("i").prop("class", "fa fa-fw fa-spinner fa-spin");
+
+    $.ajax({
+      url: url,
+      headers: {"X-CSRFToken": getCookie('csrftoken')},
+      type: 'POST',
+      data: $(this).closest('form').serialize(),
+      success: function(data, textStatus, xhr) {
+        /* hide the modal we just submitted */
+        $('#confirmation-modal').modal("hide");
+
+        updateStatuses(1);
+
+        /* if there are messages display them */
+        if(data.messages && data.messages.length > 0) {
+          addMessage(data.messages.join("<br />"), "danger");
+        }
+      },
+      error: function(xhr, textStatus, error) {
+        $('#confirmation-modal').modal("hide");
+
+        if (xhr.status == 500) {
+          addMessage("500 Internal Server Error", "danger");
+        } else {
+          addMessage(xhr.status + " " + xhr.statusText, "danger");
         }
       }
-    );
+    });
     return false;
   });
 
@@ -168,7 +145,7 @@ $(function() {
     // this didn't work ;;
     // var th = $("this").find("th");
     $(".table-sorting").hide();
-    
+
     $(".vm-list-table thead th i").remove();
 
     var icon_html = '<i class="fa fa-sort-' + (data.direction == "desc" ? "desc" : "asc") + ' pull-right"></i>';
@@ -181,8 +158,68 @@ $(function() {
   $(".vm-list-table th a").on("click", function(event) {
     event.preventDefault();
   });
+
+  $(document).on("click", ".mass-migrate-node", function() {
+    $(this).find('input[type="radio"]').prop("checked", true);
+  });
+
+  if(checkStatusUpdate() || $("#vm-list-table tbody tr").length >= 100) {
+    updateStatuses(1);
+  }
+
 });
 
+
+function checkStatusUpdate() {
+  icons = $("#vm-list-table tbody td.state i");
+  if(icons.hasClass("fa-spin") || icons.hasClass("migrating-icon")) {
+    return true;
+  }
+}
+
+
+function updateStatuses(runs) {
+  var include_deleted = getParameterByName("include_deleted");
+  $.get("/dashboard/vm/list/?compact", function(result) {
+    $("#vm-list-table tbody tr").each(function() {
+      vm = $(this).data("vm-pk");
+      status_td = $(this).find("td.state");
+      status_icon = status_td.find("i");
+      status_text = status_td.find("span");
+
+      if(vm in result) {
+        if(result[vm].in_status_change) {
+          if(!status_icon.hasClass("fa-spin")) {
+            status_icon.prop("class", "fa fa-fw fa-spinner fa-spin");
+          }
+        }
+        else if(result[vm].status == "MIGRATING") {
+          if(!status_icon.hasClass("migrating-icon")) {
+            status_icon.prop("class", "fa fa-fw " + result[vm].icon + " migrating-icon");
+          }
+        } else {
+          status_icon.prop("class", "fa fa-fw " + result[vm].icon);
+        }
+        status_text.text(result[vm].status);
+        if("node" in result[vm]) {
+          $(this).find(".node").text(result[vm].node);
+        }
+      } else {
+        if(!include_deleted)
+          $(this).remove();
+      }
+    });
+
+    if(checkStatusUpdate()) {
+      setTimeout(
+          function() {updateStatuses(runs + 1)},
+          1000 + Math.exp(runs * 0.05)
+      );
+    }
+  });
+}
+
+
 function isAlreadySelected(vm) {
   for(var i=0; i<selected.length; i++)
     if(selected[i].vm == vm)
@@ -202,7 +239,7 @@ function collectIds(rows) {
   for(var i = 0; i < rows.length; i++) {
     ids.push(rows[i].vm);
   }
-  return ids;  
+  return ids;
 }
 
 function setRowColor(row) {

circle/dashboard/store_api.py

@@ -7,6 +7,7 @@ from datetime import datetime
 from django.http import Http404
 from django.conf import settings
 from requests import get, post, codes
+from requests.exceptions import Timeout  # noqa
 from sizefield.utils import filesizeformat
 
 logger = logging.getLogger(__name__)

circle/dashboard/tables.py

@@ -19,12 +19,12 @@ from __future__ import absolute_import
 
 from django.contrib.auth.models import Group, User
 from django_tables2 import Table, A
-from django_tables2.columns import (TemplateColumn, Column, BooleanColumn,
-                                    LinkColumn)
+from django_tables2.columns import TemplateColumn, Column, LinkColumn
 
-from vm.models import Instance, Node, InstanceTemplate, Lease
+from vm.models import Node, InstanceTemplate, Lease
 from django.utils.translation import ugettext_lazy as _
 from django_sshkey.models import UserKey
+from dashboard.models import ConnectCommand
 
 
 class NodeListTable(Table):
@@ -35,17 +35,14 @@ class NodeListTable(Table):
     )
 
     overcommit = Column(
-        verbose_name="Overcommit",
+        verbose_name=_("Overcommit"),
         attrs={'th': {'class': 'node-list-table-thin'}},
     )
 
-    host = Column(
-        verbose_name="Host",
-    )
-
-    enabled = BooleanColumn(
-        verbose_name="Enabled",
+    get_status_display = Column(
+        verbose_name=_("Status"),
         attrs={'th': {'class': 'node-list-table-thin'}},
+        order_by=("enabled", "schedule_enabled"),
     )
 
     name = TemplateColumn(
@@ -54,36 +51,28 @@ class NodeListTable(Table):
     )
 
     priority = Column(
-        verbose_name=_("Priority"),
         attrs={'th': {'class': 'node-list-table-thin'}},
     )
 
     number_of_VMs = TemplateColumn(
+        verbose_name=_("Number of VMs"),
         template_name='dashboard/node-list/column-vm.html',
         attrs={'th': {'class': 'node-list-table-thin'}},
     )
 
     monitor = TemplateColumn(
+        verbose_name=_("Monitor"),
         template_name='dashboard/node-list/column-monitor.html',
         attrs={'th': {'class': 'node-list-table-monitor'}},
-    )
-
-    details = TemplateColumn(
-        template_name='dashboard/node-list/column-details.html',
-        attrs={'th': {'class': 'node-list-table-thin'}},
-    )
-    actions = TemplateColumn(
-        attrs={'th': {'class': 'node-list-table-thin'}},
-        template_code=('{% include "dashboard/node-list/column-'
-                       'actions.html" with btn_size="btn-xs" %}'),
+        orderable=False,
     )
 
     class Meta:
         model = Node
         attrs = {'class': ('table table-bordered table-striped table-hover '
                            'node-list-table')}
-        fields = ('pk', 'name', 'host', 'enabled', 'priority', 'overcommit',
-                  'number_of_VMs', )
+        fields = ('pk', 'name', 'host', 'get_status_display', 'priority',
+                  'overcommit', 'number_of_VMs', )
 
 
 class GroupListTable(Table):
@@ -141,76 +130,47 @@ class UserListTable(Table):
         fields = ('pk', 'username', )
 
 
-class NodeVmListTable(Table):
-    pk = TemplateColumn(
-        template_name='dashboard/vm-list/column-id.html',
-        verbose_name="ID",
-        attrs={'th': {'class': 'vm-list-table-thin'}},
-    )
-
-    name = TemplateColumn(
-        template_name="dashboard/vm-list/column-name.html"
-    )
-
-    admin = TemplateColumn(
-        template_name='dashboard/vm-list/column-admin.html',
-        attrs={'th': {'class': 'vm-list-table-admin'}},
-    )
-    details = TemplateColumn(
-        template_name='dashboard/vm-list/column-details.html',
-        attrs={'th': {'class': 'vm-list-table-thin'}},
-    )
-    actions = TemplateColumn(
-        template_name='dashboard/vm-list/column-actions.html',
-        attrs={'th': {'class': 'vm-list-table-thin'}},
-    )
-    time_of_suspend = TemplateColumn(
-        '{{ record.time_of_suspend|timeuntil }}',
-        verbose_name=_("Suspend in"))
-    time_of_delete = TemplateColumn(
-        '{{ record.time_of_delete|timeuntil }}',
-        verbose_name=_("Delete in"))
-
-    class Meta:
-        model = Instance
-        attrs = {'class': ('table table-bordered table-striped table-hover '
-                           'vm-list-table')}
-        fields = ('pk', 'name', 'state', 'time_of_suspend', 'time_of_delete', )
-
-
 class UserListTablex(Table):
     class Meta:
         model = User
 
 
 class TemplateListTable(Table):
-    name = LinkColumn(
-        'dashboard.views.template-detail',
-        args=[A('pk')],
+    name = TemplateColumn(
+        template_name="dashboard/template-list/column-template-name.html",
         attrs={'th': {'data-sort': "string"}}
     )
-    num_cores = Column(
-        verbose_name=_("Cores"),
-        attrs={'th': {'data-sort': "int"}}
-    )
-    ram_size = TemplateColumn(
-        "{{ record.ram_size }} Mb",
-        attrs={'th': {'data-sort': "string"}}
+    resources = TemplateColumn(
+        template_name="dashboard/template-list/column-template-resources.html",
+        verbose_name=_("Resources"),
+        attrs={'th': {'data-sort': "int"}},
+        order_by=("ram_size"),
     )
     lease = TemplateColumn(
         "{{ record.lease.name }}",
         verbose_name=_("Lease"),
         attrs={'th': {'data-sort': "string"}}
     )
-    arch = Column(
-        attrs={'th': {'data-sort': "string"}}
-    )
     system = Column(
         attrs={'th': {'data-sort': "string"}}
     )
     access_method = Column(
         attrs={'th': {'data-sort': "string"}}
     )
+    owner = TemplateColumn(
+        template_name="dashboard/template-list/column-template-owner.html",
+        verbose_name=_("Owner"),
+        attrs={'th': {'data-sort': "string"}}
+    )
+    created = TemplateColumn(
+        template_name="dashboard/template-list/column-template-created.html",
+        verbose_name=_("Created at"),
+    )
+    running = TemplateColumn(
+        template_name="dashboard/template-list/column-template-running.html",
+        verbose_name=_("Running"),
+        attrs={'th': {'data-sort': "int"}},
+    )
     actions = TemplateColumn(
         verbose_name=_("Actions"),
         template_name="dashboard/template-list/column-template-actions.html",
@@ -222,8 +182,8 @@ class TemplateListTable(Table):
         model = InstanceTemplate
         attrs = {'class': ('table table-bordered table-striped table-hover'
                            ' template-list-table')}
-        fields = ('name', 'num_cores', 'ram_size', 'arch',
-                  'system', 'access_method', 'lease', 'actions', )
+        fields = ('name', 'resources', 'system', 'access_method', 'lease',
+                  'owner', 'created', 'running', 'actions', )
 
         prefix = "template-"
 
@@ -255,6 +215,7 @@ class LeaseListTable(Table):
         fields = ('name', 'suspend_interval_seconds',
                   'delete_interval_seconds', )
         prefix = "lease-"
+        empty_text = _("No available leases.")
 
 
 class UserKeyListTable(Table):
@@ -283,5 +244,41 @@ class UserKeyListTable(Table):
 
     class Meta:
         model = UserKey
-        attrs = {'class': ('table table-bordered table-striped table-hover')}
+        attrs = {'class': ('table table-bordered table-striped table-hover'),
+                 'id': "profile-key-list-table"}
         fields = ('name', 'fingerprint', 'created', 'actions')
+        prefix = "key-"
+        empty_text = _("You haven't added any public keys yet.")
+
+
+class ConnectCommandListTable(Table):
+    name = LinkColumn(
+        'dashboard.views.connect-command-detail',
+        args=[A('pk')],
+        attrs={'th': {'data-sort': "string"}}
+    )
+    access_method = Column(
+        verbose_name=_("Access method"),
+        attrs={'th': {'data-sort': "string"}}
+    )
+    template = Column(
+        verbose_name=_("Template"),
+        attrs={'th': {'data-sort': "string"}}
+    )
+    actions = TemplateColumn(
+        verbose_name=_("Actions"),
+        template_name=("dashboard/connect-command-list/column-command"
+                       "-actions.html"),
+        orderable=False,
+    )
+
+    class Meta:
+        model = ConnectCommand
+        attrs = {'class': ('table table-bordered table-striped table-hover'),
+                 'id': "profile-command-list-table"}
+        fields = ('name', 'access_method',  'template', 'actions')
+        prefix = "cmd-"
+        empty_text = _(
+            "You don't have any custom connection commands yet. You can "
+            "specify commands to be displayed on VM detail pages instead of "
+            "the defaults.")

circle/dashboard/tasks/local_periodic_tasks.py

@@ -41,6 +41,7 @@ def send_email_notifications():
     for i in Notification.objects.filter(q):
         recipients.setdefault(i.to, [])
         recipients[i.to].append(i)
+    logger.info("Delivering notifications to %d users", len(recipients))
 
     for user, msgs in recipients.iteritems():
         if (not user.profile or not user.email or not

circle/dashboard/templates/base.html

@@ -12,7 +12,7 @@
 
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
-    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{{ STATIC_URL }}/template.css">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->

circle/dashboard/templates/dashboard/_client-check.html

+{% load i18n %}
+
+<p>
+    {% blocktrans %}
+    To effortlessly connect to all kind of virtual machines you have to install the <strong>CIRCLE Client</strong>.
+    {% endblocktrans %}
+</p>
+<p class="text-info">
+    {% blocktrans %}
+    To install the <strong>CIRCLE Client</strong> click on the <strong>Download the Client</strong> button. 
+    The button takes you to the installation detail page, where you can choose your operating system and start 
+    the download or read more detailed information about the <strong>Client</strong>. The program can be installed on Windows XP (and above)
+    or Debian based Linux operating systems. To successfully install the client you have to have admin (root or elevated) rights.
+    After the installation complete clicking on the <strong>I have the Client installed</strong> button will launch the appropriate tool
+    designed for that connection with necessarily predefined configurations. This option will also save your answer and this prompt about
+    installation will not pop up again.
+    {% endblocktrans %}
+</p> 
+<br>
+<div class="pull-right">
+    <form method="POST" id="dashboard-client-check" action="">
+        {% csrf_token %}
+        <a class="btn btn-default" href="{%  url "dashboard.views.detail" pk=instance.pk %}" data-dismiss="modal">{% trans "Cancel" %}</a>
+        <a class="btn btn-info" href="{{ client_download_url }}" traget="_blank">{% trans "Download the Client" %}</a>
+        <button data-dismiss="modal" id="client-check-button" type="submit" class="btn btn-success" title="{% trans "I downloaded and installed the client and I want to connect using it. This choice will be saved to your compuer" %}">
+            <i class="fa fa-external-link"></i> {% trans "I have the Client installed" %}
+        </button>
+        <input id="connect-uri" name="connect-uri" type="hidden" value="{% if instance.get_connect_uri %}{{ instance.get_connect_uri}}{% endif %}" />
+        <input name="vm" type="hidden" value="{% if instance.get_connect_uri %}{{ instance.pk}}{% endif %}" />
+    </form>
+</div>
\ No newline at end of file

circle/dashboard/templates/dashboard/_disk-list-element.html

@@ -11,11 +11,17 @@
   {% endif %}
 {% else %}<span class="disk-list-disk-percentage" data-disk-pk="{{ d.pk }}">{{ d.get_download_percentage }}</span>%{% endif %}
 {% if is_owner != False %}
-<a href="{% url "dashboard.views.disk-remove" pk=d.pk %}?next={{ request.path }}"
-  data-disk-pk="{{ d.pk }}" class="btn btn-xs btn-danger pull-right disk-remove"
-  {% if not long_remove %}title="{% trans "Remove" %}"{% endif %}
-  >
-  <i class="fa fa-times"></i>{% if long_remove %} {% trans "Remove" %}{% endif %}
-</a>
+  <a href="{% url "dashboard.views.disk-remove" pk=d.pk %}?next={{ request.path }}"
+    data-disk-pk="{{ d.pk }}" class="btn btn-xs btn-danger pull-right disk-remove"
+    {% if not long_remove %}title="{% trans "Remove" %}"{% endif %}>
+    <i class="fa fa-times"></i>{% if long_remove %} {% trans "Remove" %}{% endif %}
+  </a>
+  {% if op.resize_disk %}
+    <span class="operation-wrapper">
+      <a href="{{ op.resize_disk.get_url }}?disk={{d.pk}}" class="btn btn-xs btn-warning pull-right operation">
+        <i class="fa fa-arrows-alt"></i> {% trans "Resize" %}
+      </a>
+    </span>
+  {% endif %}
 {% endif %}
 <div style="clear: both;"></div>

circle/dashboard/templates/dashboard/_display-name.html

 {% load i18n %}
 
 {% if user and user.pk %}
-  {% if user.get_full_name %}
-    {{ user.get_full_name }}
-  {% else %}
-    {{ user.username }}
-  {% endif %}
+  {% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user.username }}{% endif %}{% if new_line %}<br />{% endif %}
 
   {% if show_org %}
     {% if user.profile and user.profile.org_id %}

circle/dashboard/templates/dashboard/_graph-time-buttons.html

+{% for o in graph_time_options %}
+  <a class="btn btn-xs
+    btn-{% if graph_time == o.time %}primary{% else %}default{% endif %}"
+    href="?graph_time={{ o.time }}"
+    data-graph-time="{{ o.time }}">
+    {{ o.name }}
+  </a>
+{% endfor %}

circle/dashboard/templates/dashboard/_modal.html

@@ -2,6 +2,12 @@
 <div class="modal fade" id="confirmation-modal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
     <div class="modal-content">
+      {% if box_title and ajax_title %}
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">{{ box_title }}</h4>
+      </div>
+      {% endif %}
       <div class="modal-body">
         {% if template %}
           {% include template %}

circle/dashboard/templates/dashboard/_notifications-timeline.html

 {% load i18n %}
+{% load hro %}
 {% for n in notifications %}
   <li class="notification-message" id="msg-{{n.id}}">
     <span class="notification-message-subject">
-      {% if n.status == "new" %}<i class="fa fa-envelope-alt"></i> {% endif %}
-      {{ n.subject.get_user_text }}
+      {% if n.status == "new" %}<i class="fa fa-envelope-o"></i> {% endif %}
+      {{ n.subject|get_text:user }}
     </span>
     <span class="notification-message-date pull-right" title="{{n.created}}">
       {{ n.created|timesince }}
     </span>
     <div style="clear: both;"></div>
     <div class="notification-message-text">
-      {{ n.message.get_user_text|safe }}
+      {{ n.message|get_text:user|safe }}
     </div>
   </li>
 {% empty %}

circle/dashboard/templates/dashboard/_vm-create-2.html

@@ -3,7 +3,7 @@
 {% load sizefieldtags %}
 
 {% include "display-form-errors.html" with form=vm_create_form %}
-<form method="POST">
+<form method="POST" action="{% url "dashboard.views.vm-create" %}">
 {% csrf_token %}
 
 {{ vm_create_form.template }}
@@ -23,6 +23,7 @@
   </div>
 </div>
 
+{% if perms.vm.set_resources %}
 <div class="row">
   <div class="col-sm-10">
     <div class="form-group">
@@ -85,6 +86,7 @@
     </div><!-- .no-js-hidden -->
   </div><!-- .col-sm-8 -->
 </div><!-- .row -->
+{% endif %}
 
 </form>
 <script>

circle/dashboard/templates/dashboard/_vm-mass-migrate.html

+{% extends "dashboard/mass-operate.html" %}
+{% load i18n %}
+{% load sizefieldtags %}
+
+
+{% block formfields %}
+  <hr />
+  <ul id="vm-migrate-node-list" class="list-unstyled">
+    <li class="panel panel-default panel-primary mass-migrate-node">
+      <div class="panel-body">
+        <label for="migrate-to-none">
+          <strong>{% trans "Reschedule" %}</strong>
+        </label>
+        <input id="migrate-to-none" type="radio" name="node" value="" style="float: right;" checked="checked">
+        <span class="vm-migrate-node-property">
+          {% trans "This option will reschedule each virtual machine to the optimal node." %}
+        </span>
+        <div style="clear: both;"></div>
+      </div>
+    </li>
+    {% for n in nodes %}
+    <li class="panel panel-default mass-migrate-node">
+      <div class="panel-body">
+        <label for="migrate-to-{{n.pk}}">
+          <strong>{{ n }}</strong>
+        </label>
+        <input id="migrate-to-{{n.pk}}" type="radio" name="node" value="{{ n.pk }}" style="float: right;"/>
+        <span class="vm-migrate-node-property">{% trans "CPU load" %}: {{ n.cpu_usage }}</span>
+        <span class="vm-migrate-node-property">{% trans "RAM usage" %}: {{ n.byte_ram_usage|filesize }}/{{ n.ram_size|filesize }}</span>
+        <div style="clear: both;"></div>
+      </div>
+    </li>
+    {% endfor %}
+  </ul>
+  <hr />
+{% endblock %}

circle/dashboard/templates/dashboard/_vm-migrate.html

@@ -18,6 +18,8 @@ Choose a compute node to migrate {{obj}} to.
       <li class="panel panel-default"><div class="panel-body">
         <label for="migrate-to-{{n.pk}}">
           <strong>{{ n }}</strong>
+          <div class="label label-primary"><i class="fa {{n.get_status_icon}}"></i>
+              {{n.get_status_display}}</div>
           {% if current == n.pk %}<div class="label label-info">{% trans "current" %}</div>{% endif %}
           {% if selected == n.pk %}<div class="label label-success">{% trans "recommended" %}</div>{% endif %}
         </label>

circle/dashboard/templates/dashboard/confirm/ajax-node-flush.html

-{% load i18n %}
-<div class="modal fade" id="confirmation-modal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-body">
-
-          {% if text %}
-            {{ text }}
-          {% else %}
-            {%blocktrans with object=object%}
-              Are you sure you want to flush <strong>{{ object }}</strong>?
-            {%endblocktrans%}
-          {% endif %}
-        <div class="pull-right">
-		<form action="{% url "dashboard.views.flush-node" pk=node.pk %}?next={{next}}" method="POST">
-            {% csrf_token %}
-            <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
-	    <input type="hidden" name="flush" value=""/>
-            <button class="btn btn-warning">{% trans "Yes" %}</button>
-          </form>
-        </div>
-	<div class="clearfix"></div>
-
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
-</div>

circle/dashboard/templates/dashboard/confirm/base-transfer-ownership.html

@@ -10,8 +10,9 @@
         </h3>
       </div>
       <div class="panel-body">
-          {% blocktrans with owner=instance.owner fqdn=instance.primary_host %}
-          {{ owner }} offered to take the ownership of virtual machine {{fqdn}}.
+          {% blocktrans with owner=instance.owner name=instance.name id=instance.id%}
+          <strong>{{ owner }}</strong> offered to take the ownership of
+          virtual machine <strong>{{name}} ({{id}})</strong>.
           Do you accept the responsility of being the host's owner?
           {% endblocktrans %}
         <div class="pull-right">

circle/dashboard/templates/dashboard/connect-command-create.html

+{% extends "dashboard/base.html" %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title-page %}{% trans "Create command template" %}{% endblock %}
+
+{% block content %}
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <a class="pull-right btn btn-default btn-xs" href="{% url "dashboard.views.profile-preferences" %}">{% trans "Back" %}</a>
+        <h3 class="no-margin"><i class="fa fa-code"></i> {% trans "Create new command template" %}</h3>
+      </div>
+      <div class="panel-body">
+        <form method="POST">
+          {% csrf_token %}
+          {{ form.name|as_crispy_field }}
+          {{ form.access_method|as_crispy_field }}
+          {{ form.template|as_crispy_field }}
+          <p class="text-muted">
+            {% trans "Examples" %}
+          </p>
+          <p>
+            <strong>SSH:</strong>
+            <span class="text-muted">
+              sshpass -p %(password)s ssh -o StrictHostKeyChecking=no cloud@%(host)s -p %(port)d
+            </span>
+          </p>
+          <p>
+            <strong>RDP:</strong>
+            <span class="text-muted">
+              rdesktop %(host)s:%(port)d -u cloud -p %(password)s
+            </span>
+          </p>
+          <input type="submit" class="btn btn-primary" value="{% trans "Save" %}">
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endblock %}

circle/dashboard/templates/dashboard/connect-command-edit.html

+{% extends "dashboard/base.html" %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title-page %}{% trans "Edit command template" %}{% endblock %}
+
+{% block content %}
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <a class="pull-right btn btn-default btn-xs" href="{% url "dashboard.views.profile-preferences" %}">{% trans "Back" %}</a>
+        <h3 class="no-margin"><i class="fa fa-code"></i> {% trans "Edit command template" %}</h3>
+      </div>
+      <div class="panel-body">
+        <form method="POST">
+          {% csrf_token %}
+          {{ form.name|as_crispy_field }}
+          {{ form.access_method|as_crispy_field }}
+          {{ form.template|as_crispy_field }}
+          <p class="text-muted">
+            {% trans "Examples" %}
+          </p>
+          <p>
+            <strong>SSH:</strong>
+            <span class="text-muted">
+              sshpass -p %(password)s ssh -o StrictHostKeyChecking=no cloud@%(host)s -p %(port)d
+            </span>
+          </p>
+          <p>
+            <strong>RDP:</strong>
+            <span class="text-muted">
+              rdesktop %(host)s:%(port)d -u cloud -p %(password)s
+            </span>
+          </p>
+          <input type="submit" class="btn btn-primary" value="{% trans "Save" %}">
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endblock %}

circle/dashboard/templates/dashboard/connect-command-list/column-command-actions.html

+{% load i18n %}
+<a href="{% url "dashboard.views.connect-command-detail" pk=record.pk%}" id="template-list-edit-button" class="btn btn-default btn-xs" title="{% trans "Edit" %}">
+  <i class="fa fa-edit"></i>
+</a>
+<a data-template-pk="{{ record.pk }}" href="{% url "dashboard.views.connect-command-delete" pk=record.pk %}" class="btn btn-danger btn-xs template-delete" title="{% trans "Delete" %}">
+  <i class="fa fa-times"></i>
+</a>

circle/dashboard/templates/dashboard/group-create.html

 {% load crispy_forms_tags %}
+{% load i18n %}
+
+<p class="text-muted">
+{% trans "User groups allow sharing templates or other resources with multiple users at once." %}
+</p>
+
 
 <form method="POST" action="{% url "dashboard.views.group-create" %}">
 {% csrf_token %}

circle/dashboard/templates/dashboard/group-detail.html

@@ -2,6 +2,8 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
+{% block title-page %}{{ group.name }} | {% trans "group" %}{% endblock %}
+
 {% block content %}
 <div class="body-content">
   <div class="page-header">
@@ -89,13 +91,12 @@
         <tr>
           <td><i class="fa fa-plus"></i></td>
           <td colspan="2">
-            <input type="text" class="form-control" name="list-new-name"
-            placeholder="{% trans "Name of user" %}">
+            {{addmemberform.new_member}}
           </td>
         </tr>
   </tbody>
   </table>
-  <textarea name="list-new-namelist" class="form-control"
+  <textarea name="new_members" class="form-control"
     placeholder="{% trans "Add multiple users at once (one identifier per line)." %}"></textarea>
   <div class="form-actions">
     <button type="submit" class="btn btn-success">{% trans "Save" %}</button>

circle/dashboard/templates/dashboard/group-list.html

@@ -6,63 +6,24 @@
 
 {% block content %}
 
-<div class="alert alert-info">
-  Tip #1: you can select multiple vm instances while holding down the <strong>CTRL</strong> key!
-</div>
-
-<div class="alert alert-info">
-  Tip #2: if you want to select multiple instances by one click select an instance then hold down <strong>SHIFT</strong> key and select another one!
-</div>
-
 <div class="row">
   <div class="col-md-12">
     <div class="panel panel-default">
       <div class="panel-heading">
         <h3 class="no-margin"><i class="fa fa-group"></i> Your groups</h3>
       </div>
-      <div class="panel-body group-list-group-control">
-        <p>
-          <strong>Group actions</strong>
-          <button id="group-list-group-select-all" class="btn btn-info btn-xs">Select all</button>
-          <a id="group-list-group-delete" disabled href="#" class="btn btn-danger btn-xs"><i class="fa fa-times"></i> Discard</a>
-        </p>
-	</div>
+      <div class="panel-body">
 	<div id="table_container">
-	
-        <div id="rendered_table" class="panel-body">
-	      {% render_table table %}
+          <div id="rendered_table" class="panel-body">
+            {% render_table table %}
+          </div>
         </div>
-      </div>
+      </div><!-- .panel-body -->
     </div>
   </div>
 </div>
-<style>
-  .popover {
-    max-width: 600px;
-  }
-
-  .group-list-selected, .group-list-selected td {
-    background-color: #e8e8e8 !important;
-  }
-
-  .group-list-selected:hover, .group-list-selected:hover td {
-    background-color: #d0d0d0 !important;
-  }
-
-  .group-list-selected td:first-child {
-    font-weight: bold;
-  }
-
-  .group-list-table-thin {
-    width: 10px;
-  }
-
-  .group-list-table-admin {
-    width: 130px;
-  }
-</style>
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ STATIC_URL}}dashboard/group-list.js"></script>
+  <script src="{{ STATIC_URL}}dashboard/group-list.js"></script>
 {% endblock %}

circle/dashboard/templates/dashboard/group-list/column-actions.html

-   <a data-group-pk="{{ record.pk }}" class="btn btn-danger btn-xs real-link group-delete" href="{% url "dashboard.views.delete-group" pk=record.pk %}?next={{ request.path }}"><i class="fa fa-trash"></i></a>
+<a data-group-pk="{{ record.pk }}"
+  class="btn btn-danger btn-xs real-link group-delete"
+  href="{% url "dashboard.views.delete-group" pk=record.pk %}?next={{ request.path }}">
+  <i class="fa fa-trash-o"></i>
+</a>

circle/dashboard/templates/dashboard/index-nodes.html

@@ -3,8 +3,10 @@
   <div class="panel-heading">
     <div class="pull-right toolbar">
       <div class="btn-group">
-        <a href="#index-graph-view" data-index-box="node" class="btn btn-default btn-xs"><i class="fa fa-dashboard"></i></a>
-        <a href="#index-list-view" data-index-box="node" class="btn btn-default btn-xs disabled"><i class="fa fa-list"></i></a>
+        <a href="#index-graph-view" data-index-box="node" class="btn btn-default btn-xs"
+          data-container="body"><i class="fa fa-dashboard"></i></a>
+        <a href="#index-list-view" data-index-box="node" class="btn btn-default btn-xs disabled"
+          data-container="body"><i class="fa fa-list"></i></a>
 
       </div>
       <span class="btn btn-default btn-xs infobtn" title="{% trans "List of compute nodes, also called worker nodes or hypervisors, which run the virtual machines." %}"><i class="fa fa-info-circle"></i></span>

circle/dashboard/templates/dashboard/index-vm.html

@@ -3,10 +3,12 @@
   <div class="panel-heading">
     <div class="pull-right toolbar">
       <div class="btn-group">
-        <a href="#index-graph-view" data-index-box="vm" class="btn
-            btn-default btn-xs" title="{% trans "summary view" %}"><i class="fa fa-dashboard"></i></a>
-        <a href="#index-list-view" data-index-box="vm" class="btn
-            btn-default btn-xs disabled" title="{% trans "list view" %}"><i class="fa fa-list"></i></a>
+        <a href="#index-graph-view" data-index-box="vm" class="btn btn-default btn-xs"
+          data-container="body"
+          title="{% trans "summary view" %}"><i class="fa fa-dashboard"></i></a>
+        <a href="#index-list-view" data-index-box="vm" class="btn btn-default btn-xs disabled"
+          data-container="body"
+          title="{% trans "list view" %}"><i class="fa fa-list"></i></a>
       </div>
       <span class="btn btn-default btn-xs infobtn" title="{% trans "List of your current virtual machines. Favourited ones are ahead of others." %}"><i class="fa fa-info-circle"></i></span>
     </div>
@@ -23,7 +25,10 @@
           <i class="fa {{ i.get_status_icon }}" title="{{ i.get_status_display }}"></i>
           {{ i.name }}
         </span>
-        <small class="text-muted"> {{ i.primary_host.hostname }}</small>
+        <small class="text-muted">
+          {% if i.owner == request.user %}{{ i.short_hostname }}
+          {% else %}{{i.owner.profile.get_display_name}}{% endif %}
+        </small>
         <div class="pull-right dashboard-vm-favourite" data-vm="{{ i.pk }}">
           {% if i.fav %}
             <i class="fa fa-star text-primary title-favourite" title="{% trans "Unfavourite" %}"></i>
@@ -46,12 +51,15 @@
     </style>
     <div href="#" class="list-group-item list-group-footer">
       <div class="row">
-        <div class="col-sm-6 col-xs-6 input-group input-group-sm">
-          <input id="dashboard-vm-search-input" type="text" class="form-control" placeholder="{% trans "Search..." %}" />
-          <div class="input-group-btn">
-            <button type="submit" class="form-control btn btn-primary"><i class="fa fa-search"></i></button>
+        <form action="{% url "dashboard.views.vm-list" %}" method="GET" id="dashboard-vm-search-form">
+          <div class="col-sm-6 col-xs-6 input-group input-group-sm">
+            <input id="dashboard-vm-search-input" type="text" class="form-control" name="s"
+            placeholder="{% trans "Search..." %}" />
+            <div class="input-group-btn">
+              <button type="submit" class="form-control btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
           </div>
-        </div>
+        </form>
         <div class="col-sm-6 text-right">
           <a class="btn btn-primary btn-xs" href="{% url "dashboard.views.vm-list" %}">
             <i class="fa fa-chevron-circle-right"></i>

circle/dashboard/templates/dashboard/instanceactivity_detail.html

 {% extends "dashboard/base.html" %}
 {% load i18n %}
+{% load hro %}
 
 {% block content %}
 <div class="body-content">
   <div class="page-header">
-    <h1>
-        {{ object.instance.name }}:
-            {% if user.is_superuser %}
-            {{object.readable_name.get_admin_text}}
-            {% else %}
-            {{object.readable_name.get_user_text}}
-            {% endif %}
+    <h1><i class="fa fa-{{icon}}"></i>
+        {{ object.instance.name }}: {{object.readable_name|get_text:user}}
     </h1>
   </div>
   <div class="row">
-    <div class="col-md-5" id="vm-info-pane">
-      <div class="big">
-        <span id="vm-activity-state" class="label label-{% if object.get_status_id == 'wait' %}info{% else %}{% if object.succeeded %}success{% else %}error{% endif %}{% endif %}">
+    <div class="col-md-6" id="vm-info-pane">
+      <div class="big" id="vm-activity-state">
+        <span class="label label-{% if object.get_status_id == 'wait' %}info{% else %}{% if object.succeeded %}success{% else %}danger{% endif %}{% endif %}">
           <span>{{ object.get_status_id|upper }}</span>
         </span>
       </div>
@@ -24,7 +20,7 @@
       {% include "dashboard/vm-detail/_activity-timeline.html" with active=object %}
 
     </div>
-    <div class="col-md-7">
+    <div class="col-md-6">
       <div class="panel panel-default">
         <!--<div class="panel-heading"><h2 class="panel-title">{% trans "Activity" %}</h2></div> -->
         <div class="panel-body">
@@ -58,7 +54,7 @@
 
 
             <dt>{% trans "result" %}</dt>
-            <dd><textarea class="form-control">{% if user.is_superuser %}{{object.result.get_admin_text}}{% else %}{{object.result.get_user_text}}{% endif %}</textarea></dd>
+            <dd><textarea class="form-control">{{object.result|get_text:user}}</textarea></dd>
 
             <dt>{% trans "resultant state" %}</dt>
             <dd>{{object.resultant_state|default:'n/a'}}</dd>

circle/dashboard/templates/dashboard/lease-create.html

@@ -11,7 +11,7 @@
     <div class="panel panel-default">
       <div class="panel-heading">
         <a class="pull-right btn btn-default btn-xs" href="{% url "dashboard.views.template-list" %}">{% trans "Back" %}</a>
-        <h3 class="no-margin"><i class="fa fa-time"></i> {% trans "Create lease" %}</h3>
+        <h3 class="no-margin"><i class="fa fa-clock-o"></i> {% trans "Create lease" %}</h3>
       </div>
       <div class="panel-body">
         {% with form=form %}

circle/dashboard/templates/dashboard/lease-edit.html

@@ -10,7 +10,7 @@
     <div class="panel panel-default">
       <div class="panel-heading">
         <a class="pull-right btn btn-default btn-xs" href="{% url "dashboard.views.template-list" %}">{% trans "Back" %}</a>
-        <h3 class="no-margin"><i class="fa fa-time"></i> {% trans "Edit lease" %}</h3>
+        <h3 class="no-margin"><i class="fa fa-clock-o"></i> {% trans "Edit lease" %}</h3>
       </div>
       <div class="panel-body">
         {% with form=form %}

circle/dashboard/templates/dashboard/mass-operate.html

+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block question %}
+<p>
+{% blocktrans with op=op.name count count=vm_count %}
+Do you want to perform the <strong>{{op}}</strong> operation on the following instance?
+{% plural %}
+Do you want to perform the <strong>{{op}}</strong> operation on the following {{ count }} instances?
+{% endblocktrans %}
+</p>
+<p class="text-info">{{op.description}}</p>
+{% endblock %}
+<form method="POST" action="{{url}}">{% csrf_token %}
+  {% block formfields %}{% endblock %}
+  {% for i in instances %}
+  <div class="panel panel-default mass-op-panel">
+    <i class="fa {{ i.get_status_icon }} fa-fw"></i>
+    {{ i.name }} ({{ i.pk }})
+    <div style="float: right;" title="{{ i.disabled }}" class="status-icon">
+      <span class="fa-stack">
+        <i class="fa fa-stack-2x fa-square {{ i.disabled|yesno:"minus,check" }}"></i>
+        <i class="fa fa-stack-1x fa-inverse fa-{% if i.disabled %}{{i.disabled_icon|default:"minus"}}{% else %}check{% endif %}"></i>
+      </span>
+    </div>
+  </div>
+  <input type="checkbox" name="vm" value="{{ i.pk }}" {% if not i.disabled %}checked{% endif %}
+    style="display: none;"/>
+  {% endfor %}
+
+  <div class="pull-right">
+    <a class="btn btn-default" href="{% url "dashboard.views.vm-list" %}"
+     data-dismiss="modal">{% trans "Cancel" %}</a>
+    <button class="btn btn-{{ opview.effect }}" type="submit" id="op-form-send">
+      {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ opview.name|capfirst }}
+    </button>
+  </div>
+</form>

circle/dashboard/templates/dashboard/node-detail.html

@@ -6,13 +6,12 @@
 {% block content %}
 <div class="body-content">
   <div class="page-header">
+    <div class="pull-right" id="ops">
+      {% include "dashboard/vm-detail/_operations.html" %}
+    </div>
      <div class="pull-right" style="padding-top: 15px;">
       <a title="{% trans "Rename" %}" href="#" class="btn btn-default btn-xs node-details-rename-button"><i class="fa fa-pencil"></i></a>
-      <a title="{% trans "Flush" %}" data-node-pk="{{ node.pk }}" class="btn btn-default btn-xs real-link node-flush" href="{% url "dashboard.views.flush-node" pk=node.pk %}"><i class="fa fa-cloud-upload"></i></a>
-      <a title="{% trans "Enable" %}" style="display:{% if node.enabled %}none{% else %}inline-block{% endif %}" data-node-pk="{{ node.pk }}" class="btn btn-default btn-xs real-link node-enable" href="{% url "dashboard.views.status-node" pk=node.pk %}?next={{ request.path }}"><i class="fa fa-check"></i></a>
-      <a title="{% trans "Disable" %}" style="display:{% if not node.enabled %}none{% else %}inline-block{% endif %}" data-node-pk="{{ node.pk }}" class="btn btn-default btn-xs real-link node-enable" href="{% url "dashboard.views.status-node" pk=node.pk %}?next={{ request.path }}"><i class="fa fa-ban"></i></a>
       <a title="{% trans "Delete" %}" data-node-pk="{{ node.pk }}" class="btn btn-default btn-xs real-link node-delete" href="{% url "dashboard.views.delete-node" pk=node.pk %}"><i class="fa fa-trash-o"></i></a>
-      <a title="{% trans "Help" %}" href="#" class="btn btn-default btn-xs node-details-help-button"><i class="fa fa-question"></i></a>
     </div>
    <h1>
       <div id="node-details-rename">
@@ -26,39 +25,33 @@
       {{ node.name }}
       </div>
     </h1>
-    <div class="node-details-help js-hidden">
-      <ul style="list-style: none;">
-        <li>
-          <strong>{% trans "Rename" %}:</strong>
-          {% trans "Change the name of the node." %}
-        </li>
-        <li>
-          <strong>{% trans "Flush" %}:</strong>
-          {% trans "Disable node and move all instances to other one." %}
-        </li>
-        <li>
-          <strong>{% trans "Enable" %}:</strong>
-          {% trans "Enables node." %}
-        </li>
-        <li>
-          <strong>{% trans "Disable" %}:</strong>
-          {% trans "Disables node." %}
-        </li>
-        <li>
-          <strong>{% trans "Delete" %}:</strong>
-          {% trans "Remove node and it's host." %}
-        </li>
-      </ul>
-    </div>
   </div>
   <div class="row">
     <div class="col-md-2" id="node-info-pane">
       <div id="node-info-data" class="big">
-      <span id="node-details-state" class="label {% if node.state == 'ONLINE' %}label-success
-			{% elif node.state == 'MISSING' %}label-danger
-			{% elif node.state == 'DISABLED' %}label-warning
-			{% elif node.state == 'OFFLINE' %}label-warning
-			{% endif %}">{{ node.get_status_display|upper }}</span>
+        <span id="node-details-state" class="label
+          {% if node.state == 'ACTIVE' %}label-success
+          {% elif node.state == 'PASSIVE' %}label-warning
+          {% else %}label-danger{% endif %}">
+          <i class="fa {{ node.get_status_icon }}"></i> {{ node.get_status_display|upper }}
+        </span>
+      </div>
+      <div>
+        {% if node.enabled %}
+          <span class="label label-success">{% trans "Enabled" %}</span>
+          {% if node.schedule_enabled %}
+            <span class="label label-success">{% trans "Schedule enabled" %}</span>
+          {% else %}
+            <span class="label label-warning">{% trans "Schedule disabled" %}</span>
+          {% endif %}
+        {% else %}
+          <span class="label label-warning">{% trans "Disabled" %}</span>
+        {% endif %}
+        {% if node.online %}
+          <span class="label label-success">{% trans "Online" %}</span>
+        {% else %}
+          <span class="label label-warning">{% trans "Offline" %}</span>
+        {% endif %}
       </div>
     </div>
     <div class="col-md-10" id="node-detail-pane">
@@ -67,39 +60,41 @@
           <li class="active">
             <a href="#home" data-toggle="pill" class="text-center">
               <i class="fa fa-compass fa-2x"></i><br>
-              {% trans "Home" %}</a></li>
+              {% trans "Home" %}
+            </a>
+          </li>
           <li>
             <a href="#resources" data-toggle="pill" class="text-center">
               <i class="fa fa-tasks fa-2x"></i><br>
-              {% trans "Resources" %}</a></li>
+              {% trans "Resources" %}
+            </a>
+          </li>
 	  <li>
-            <a href="#virtualmachines" data-toggle="pill" class="text-center">
+            <a href="{% url "dashboard.views.vm-list" %}?s=node:{{ node.name }}" 
+              target="blank" class="text-center">
               <i class="fa fa-desktop fa-2x"></i><br>
-              {% trans "Virtual Machines" %}</a></li>
+              {% trans "Virtual Machines" %}
+            </a>
+          </li>
  	  <li>
             <a href="#activity" data-toggle="pill" class="text-center">
               <i class="fa fa-clock-o fa-2x"></i><br>
-              {% trans "Activity" %}</a></li>
+              {% trans "Activity" %}
+            </a>
+          </li>
 	</ul>
 
         <div id="panel-body"  class="tab-content panel-body">
           <div class="tab-pane active" id="home">{% include "dashboard/node-detail/home.html" %}</div>
 	  <div class="tab-pane" id="resources">{% include "dashboard/node-detail/resources.html" %}</div>
           <div class="tab-pane" id="activity">{% include "dashboard/node-detail/activity.html" %}</div>
-          <div class="tab-pane" id="virtualmachines">{% include "dashboard/node-detail/vm.html" %}</div>
   	</div>
       </div>
     </div>
   </div>
 </div>
-<style>
-  .popover {
-    max-width: 600px;
-  }
-</style>
-
 {% endblock %}
+
 {% block extra_js %}
-<script src="{{ STATIC_URL}}dashboard/node-details.js"></script>
+  <script src="{{ STATIC_URL}}dashboard/node-details.js"></script>
 {% endblock %}
-

circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html

 {% load i18n %}
+{% load hro %}
 <div id="activity-timeline" class="timeline">
 {% for a in activities %}
 <div class="activity" data-activity-id="{{ a.pk }}">
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
   <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-plus{% endif %}"></i>
 </span>
-<strong>{% if user.is_superuser %}
-    {{ a.readable_name.get_admin_text }}
-    {% else %}
-    {{ a.readable_name.get_user_text }}{% endif %}</strong>
+<strong title="{{ a.result.get_admin_text }}">
+  {{ a.readable_name.get_admin_text|capfirst }}
+</strong>
+
 {{ a.started|date:"Y-m-d H:i" }}, {{ a.user }}
   {% if a.children.count > 0 %}
     <div class="sub-timeline">
       {% for s in a.children.all %}
-      <div data-activity-id="{{ s.pk }}" class="sub-activity{% if s.has_failed %} sub-activity-failed{% endif %}">
-    {% if user.is_superuser %}
-    {{ s.readable_name.get_admin_text }}
-    {% else %}
-    {{ s.readable_name.get_user_text }}{% endif %}
+      <div data-activity-id="{{ s.pk }}" 
+        class="sub-activity{% if s.has_failed %} sub-activity-failed{% endif %}"
+        >
+    {{ s.readable_name|get_text:user }}
          &ndash;
         {% if s.finished %}
           {{ s.finished|time:"H:i:s" }}
@@ -25,7 +25,7 @@
           <i class="fa fa-refresh fa-spin" class="sub-activity-loading-icon"></i>
         {% endif %}
         {% if s.has_failed %}
-          <div class="label label-danger">{% trans "failed" %}</div>
+          <div title="{{ s.result.get_admin_text }}" class="label label-danger">{% trans "failed" %}</div>
         {% endif %}
         </div>
       {% endfor %}

circle/dashboard/templates/dashboard/node-detail/home.html

@@ -30,15 +30,22 @@
   </div>
   <div class="col-md-8">
     {% if graphite_enabled %}
-    <img src="{% url "dashboard.views.node-graph" node.pk "cpu" "6h" %}" style="width:100%"/>
-    <img src="{% url "dashboard.views.node-graph" node.pk "memory" "6h" %}" style="width:100%"/>
-    <img src="{% url "dashboard.views.node-graph" node.pk "network" "6h" %}" style="width:100%"/>
+    <div class="text-center graph-buttons">
+      {% include "dashboard/_graph-time-buttons.html" %}
+    </div>
+    <div class="graph-images text-center">
+      <img src="{% url "dashboard.views.node-graph" node.pk "cpu" graph_time %}"/>
+      <img src="{% url "dashboard.views.node-graph" node.pk "memory" graph_time %}"/>
+      <img src="{% url "dashboard.views.node-graph" node.pk "network" graph_time %}"/>
+      <img src="{% url "dashboard.views.node-graph" node.pk "vm" graph_time %}"/>
+      <img src="{% url "dashboard.views.node-graph" node.pk "alloc" graph_time %}"/>
+    </div>
     {% endif %}
   </div>
-  </div>
-  <style>
-  .form-group {
-    margin: 0px;
-  }
+</div>
 
-</style>
+  <style>
+    .form-group {
+      margin: 0px;
+    }
+  </style>

circle/dashboard/templates/dashboard/node-detail/resources.html

@@ -4,15 +4,25 @@
   <dl class="dl-horizontal">
     <dt>{% trans "Node name" %}:</dt><dd>{{ node.name }}</dd>
     <dt>{% trans "CPU cores" %}:</dt><dd>{{ node.info.core_num }}</dd>
-    <dt>{% trans "RAM size" %}:</dt> <dd>{% widthratio node.info.ram_size 1048576 1 %} MB</dd>
+    <dt>{% trans "RAM size" %}:</dt> <dd>{% widthratio node.info.ram_size 1048576 1 %} MiB</dd>
     <dt>{% trans "Architecture" %}:</dt><dd>{{ node.info.architecture }}</dd>
     <dt>{% trans "Host IP" %}:</dt><dd>{{ node.host.ipv4 }}</dd>
     <dt>{% trans "Enabled" %}:</dt><dd>{{ node.enabled }}</dd>
     <dt>{% trans "Host online" %}:</dt><dd> {{ node.online }}</dd>
     <dt>{% trans "Priority" %}:</dt><dd>{{ node.priority }}</dd>
-    <dt>{% trans "Host owner" %}:</dt><dd>{{ node.host.owner }}</dd>
+    <dt>{% trans "Host owner" %}:</dt>
+    <dd>
+      {% include "dashboard/_display-name.html" with user=node.host.owner show_org=True %}
+    </dd>
     <dt>{% trans "Vlan" %}:</dt><dd>{{ node.host.vlan }}</dd>
-    <dt>{% trans "Host name" %}:</dt><dd>{{ node.host.hostname }}</dd>
+    <dt>{% trans "Host name" %}:</dt>
+    <dd>
+      {{ node.host.hostname }}
+      <a href="{{ node.host.get_absolute_url }}" class="btn btn-default btn-xs">
+        <i class="fa fa-pencil"></i>
+        {% trans "Edit host" %}
+      </a>
+    </dd>
     </dl>
 
 {% block extra_js %}

circle/dashboard/templates/dashboard/node-detail/vm.html

-{% load render_table from django_tables2 %}
-{% block content %}
-<div class="panel-body">
-  {% render_table table %}
-</div>
-{% endblock %}
-<script>
-    "use strict";
-
-    $('a[data-toggle$="pill"][href!="#virtualmachines"]').click(function() {
-        $("#node-info-pane").fadeIn();
-        $("#node-detail-pane").removeClass("col-md-12");
-    });
-
-
-    $('a[href$="virtualmachines"]').click(function() {
-        $("#node-info-pane").hide();
-        $("#node-detail-pane").addClass("col-md-12");
-    });
-    </script>
-
-{% block extra_js %}
-<script src="{{ STATIC_URL}}dashboard/vm-list.js"></script>
-{% endblock %}

circle/dashboard/templates/dashboard/node-list.html

@@ -12,47 +12,34 @@
       <div class="panel-heading">
         <h3 class="no-margin"><i class="fa fa-desktop"></i> {% trans "Compute nodes" %}</h3>
       </div>
-	<div id="table_container">
-	
+      <div id="table_container">
         <div id="rendered_table" class="panel-body">
-	      {% render_table table %}
+          {% render_table table %}
         </div>
       </div>
     </div>
   </div>
 </div>
-<style>
 
-  .node-list-table tbody>tr>td {
-    vertical-align: middle;
-  }
-
-  .popover {
-    max-width: 600px;
-  }
-
-  .node-list-selected, .node-list-selected td {
-    background-color: #e8e8e8 !important;
-  }
-
-  .node-list-selected:hover, .node-list-selected:hover td {
-    background-color: #d0d0d0 !important;
-  }
-
-  .node-list-selected td:first-child {
-    font-weight: bold;
-  }
-
-  .node-list-table-thin {
-    width: 10px;
-  }
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <div class="pull-right graph-buttons">
+          {% include "dashboard/_graph-time-buttons.html" %}
+        </div>
+        <h3 class="no-margin"><i class="fa fa-area-chart"></i> {% trans "Graphs" %}</h3>
+      </div>
+      <div class="text-center graph-images">
+        <img src="{% url "dashboard.views.node-list-graph" "alloc" graph_time %}"/>
+        <img src="{% url "dashboard.views.node-list-graph" "vm" graph_time %}"/>
+      </div>
+    </div>
+  </div><!-- -col-md-12 -->
+</div><!-- .row -->
 
-  .node-list-table-monitor {
-    width: 250px;
-  }
-</style>
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ STATIC_URL}}dashboard/node-list.js"></script>
+  <script src="{{ STATIC_URL}}dashboard/node-list.js"></script>
 {% endblock %}

circle/dashboard/templates/dashboard/node-list/column-actions.html

-{% load i18n %}
-<div class="btn-group">
-	<button type="button" class="btn {{ btn_size }} btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="fa fa-caret-down"></i></button>
-  <ul class="dropdown-menu nojs-dropdown-toogle" role="menu">
- <li><a href="#" class="node-details-rename-button"><i class="fa fa-pencil"></i> {% trans "Rename" %}</a></li>
- <li><a data-node-pk="{{ record.pk }}" class="real-link node-flush" href="{% url "dashboard.views.flush-node" pk=record.pk %}"><i class="fa fa-cloud-upload"></i>{% trans "Flush" %}</a>
-    <li><a style={% if record.enabled %}"display:none"{% else %}"display:block"{% endif %} data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}"><i class="fa fa-check"></i>{% trans "Enable" %}</a>
-  <a style={% if record.enabled %}"display:block"{% else %}"display:none"{% endif %} data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}"><i class="fa fa-times"></i>{% trans "Disable" %}</a></li>
-  <li><a data-node-pk="{{ record.pk }}" class="real-link node-delete" href="{% url "dashboard.views.delete-node" pk=record.pk %}?next={{ request.path }}"><i class="fa fa-trash"></i>{% trans "Delete" %}</a></li>
-    </ul>
-</div>

circle/dashboard/templates/dashboard/node-list/column-admin.html

-{% load i18n %}
-<a class="btn btn-default btn-xs" title="{% trans "Flush" %}">
-<i class="fa fa-cloud-upload"></i>
-</a>
-<a id="node-list-rename-button" class="btn btn-default btn-xs" title="{% trans "Rename" %}">
-  <i class="fa fa-pencil"></i>
-</a>

circle/dashboard/templates/dashboard/node-list/column-details.html

-<a class="btn btn-info btn-xs node-list-details" rel="popover" href="#" data-toggle="popover"
-  data-content='
-  <h4>Quick details</h4>
-  <dl class="dl-horizontal">
-    <dt>Number of cores:</dt><dd>{{ record.num_cores }}</dd>
-    <dt>Memory:</dt> <dd>{% widthratio record.ram_size 1048576 1 %} MB</dd>
-    <dt>Architecture:</td><dd>{{ record.arch }}</dd>
-  </dl>
-  <dl>
-    <dt>IPv4 address:</dt><dd>{{ record.ipv4 }}10.9.8.7</dd>
-      <dt>IPv6 address:</dt><dd> 2001:2001:2001:2001:2001:2001::</dd>
-      <dt>DNS name:</dt><dd>1825.vm.ik.bme.hu</dd>
-    </ul>
-    '>Details</a>

circle/dashboard/templates/dashboard/node-list/column-id.html

-<div id="node-{{ record.pk }}">{{ record.pk }}</div>

circle/dashboard/templates/dashboard/node-list/column-vm.html

 {% load i18n %}
 
 <div id="node-list-column-vm">
-  <a class="real-link" href="{% url "dashboard.views.node-detail" pk=record.pk %}#virtualmachines">{{ value }}</a>
+  <a class="real-link" href="{% url "dashboard.views.vm-list" %}?s=node:{{ record.name }}">
+    {{ value }}
+  </a>
 </div>

circle/dashboard/templates/dashboard/node-list/test-one.html

-
-            <tr>
-              <!--<td><input type="checkbox"/ class="vm-checkbox" id="vm-1825{{ c }}"></td>-->
-              <td>
-                <div id="vm-1{{ c }}">1{{ c }}</div>
-              </td>
-              <td><a href="" class="real-link">network-devenv</a></td>
-              <td>running</td>
-              <td>10 days</td>
-              <td>1 month</td>
-              <td>
-                <a class="btn btn-default btn-xs" title data-original-title="Migrate">
-                  <i class="fa fa-truck"></i>
-                </a>
-                <a class="btn btn-default btn-xs" title data-original-title="Rename">
-                  <i class="fa fa-pencil"></i>
-                </a>
-                <a href="#" class="btn btn-default btn-xs vm-list-connect" data-toggle="popover"
-                  data-content='
-                  Belépés: <input style="width: 300px;" type="text" class="form-control" value="ssh cloud@vm.ik.bme.hu -p22312"/>
-                  Jelszó: <input style="width: 300px;" type="text" class="form-control" value="asdfkicsiasdfkocsi"/>
-                  '>Connect</a>
-              </td>
-              <td>
-                <a class="btn btn-info btn-xs vm-list-details" href="#" data-toggle="popover"
-                  data-content='
-                  <h4>Quick details</h4>
-                  <dl class="dl-horizontal">
-                    <dt>Number of cores:</dt><dd>4</dd>
-                    <dt>Memory:</dt> <dd>512 MB</dd>
-                    <dt>Architecture:</td><dd>x86-64</dd>
-                  </dl>
-                  <dl>
-                    <dt>IPv4 address:</dt><dd>10.9.8.7</dd>
-                    <dt>IPv6 address:</dt><dd> 2001:2001:2001:2001:2001:2001::</dd>
-                    <dt>DNS name:</dt><dd>1825.vm.ik.bme.hu</dd>
-                  </ul>
-                  '>Details</a>
-              </td>
-              <td>
-                <div class="btn-group">
-                  <button type="button" class="btn btn-xs btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="fa fa-caret-down"></i></button>
-                  <ul class="nojs-dropdown-menu dropdown-menu" role="menu">
-                    <li><a href="#"><i class="fa fa-refresh"></i> Reboot</a></li>
-                    <li><a href="#"><i class="fa fa-off"></i> Shutdown</a></li>
-                    <li><a href="#"><i class="fa fa-times"></i> Discard</a></li>
-                  </ul>
-                </div>
-              </td>
-
-            </tr>

circle/dashboard/templates/dashboard/profile.html

@@ -10,6 +10,12 @@
   <div class="col-md-12">
     <div class="panel panel-default">
       <div class="panel-heading">
+        {% if request.user.is_superuser %}
+          <a href="{{ login_token }}"
+             class="pull-right btn btn-danger btn-xs"
+             title="{% trans "Log in as this user. Recommended to open in an incognito window." %}">
+             {% trans "Login as this user" %}</a>
+        {% endif %}
         <a class="pull-right btn btn-default btn-xs" href="{% url "dashboard.index" %}">{% trans "Back" %}</a>
         <h3 class="no-margin">
           <i class="fa fa-user"></i>

circle/dashboard/templates/dashboard/profile_form.html

@@ -66,4 +66,20 @@
   </div>
 </div>
 
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <a href="{% url "dashboard.views.connect-command-create" %}"
+          class="pull-right btn btn-success btn-xs" style="margin-right: 10px;">
+          <i class="fa fa-plus"></i> {% trans "add command template" %}
+        </a>
+        <h3 class="no-margin"><i class="fa fa-code"></i> {% trans "Command templates" %}</h3>
+      </div>
+      <div class="panel-body">
+        {% render_table connectcommand_table %}
+      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}

circle/dashboard/templates/dashboard/template-edit.html

@@ -3,7 +3,7 @@
 {% load sizefieldtags %}
 {% load crispy_forms_tags %}
 
-{% block title-page %}{% trans "Edit template" %}{% endblock %}
+{% block title-page %}{{ form.name.value }} | {% trans "template" %}{% endblock %}
 
 {% block content %}
 
@@ -24,6 +24,15 @@
 
         {{ form.name|as_crispy_field }}
 
+        <strong>{% trans "Parent template" %}:</strong>
+        {% if parent %}
+        <a href="{% url "dashboard.views.template-detail" pk=parent.pk %}">
+          {{ parent.name }}
+        </a>
+        {% else %}
+          -
+        {% endif %}
+
         <fieldset class="resources-sliders">
           <legend>{% trans "Resource configuration" %}</legend>
           {% include "dashboard/_resources-sliders.html" with field_priority=form.priority field_num_cores=form.num_cores field_ram_size=form.ram_size %}
@@ -39,6 +48,7 @@
         {{ form.req_traits|as_crispy_field }}
         {{ form.description|as_crispy_field }}
         {{ form.system|as_crispy_field }}
+        {{ form.has_agent|as_crispy_field }}
         </fieldset>
         <fieldset>
           <legend>{% trans "External resources" %}</legend>

circle/dashboard/templates/dashboard/template-list.html

@@ -16,22 +16,41 @@
         <h3 class="no-margin"><i class="fa fa-puzzle-piece"></i> {% trans "Templates" %}</h3>
       </div>
       <div class="panel-body">
+        <div class="row">
+          <div class="col-md-offset-8 col-md-4" id="template-list-search">
+            <form action="" method="GET">
+              <div class="input-group">
+                {{ search_form.s }}
+                <div class="input-group-btn">
+                  {{ search_form.stype }}
+                  <button type="submit" class="btn btn-primary input-tags">
+                    <i class="fa fa-search"></i>
+                  </button>
+                </div>
+              </div><!-- .input-group -->
+            </form>
+          </div><!-- .col-md-4 #template-list-search -->
+        </div>
+      </div>
+      <div class="panel-body">
         {% render_table table %}
       </div>
     </div>
   </div>
 </div>
 
+{% if show_lease_table %}
 <div class="row">
   <div class="col-md-6">
     <div class="panel panel-default">
       <div class="panel-heading">
         {% if perms.vm.create_leases %}
-        <a href="{% url "dashboard.views.lease-create" %}" class="pull-right btn btn-success btn-xs" style="margin-right: 10px;">
+        <a href="{% url "dashboard.views.lease-create" %}"
+          class="pull-right btn btn-success btn-xs" style="margin-right: 10px;">
           <i class="fa fa-plus"></i> {% trans "new lease" %}
         </a>
         {% endif %}
-        <h3 class="no-margin"><i class="fa fa-time"></i> {% trans "Leases" %}</h3>
+        <h3 class="no-margin"><i class="fa fa-clock-o"></i> {% trans "Leases" %}</h3>
       </div>
       <div class="panel-body">
         <div class="" style="max-width: 600px;">
@@ -54,6 +73,7 @@
   </div>
   {% endcomment %}
 </div>
+{% endif %}
 {% endblock %}
 
 {% block extra_js %}

circle/dashboard/templates/dashboard/template-list/column-template-actions.html

 {% load i18n %}
+<a href="{% url "dashboard.views.vm-create" %}?template={{ record.pk }}"
+  class="btn btn-success btn-xs customize-vm" title="{% trans "Start" %}">
+  <i class="fa fa-play"></i>
+</a>
 <a href="{% url "dashboard.views.template-detail" pk=record.pk%}" id="template-list-edit-button" class="btn btn-default btn-xs" title="{% trans "Edit" %}">
   <i class="fa fa-edit"></i>
 </a>

circle/dashboard/templates/dashboard/template-list/column-template-created.html

+{{ record.created|date }}
+<br />
+{{ record.created|time }}

circle/dashboard/templates/dashboard/template-list/column-template-name.html

+<a href="{% url "dashboard.views.template-detail" pk=record.pk %}" title="{{ record.description }}">
+  {{ record.name }}
+</a>

circle/dashboard/templates/dashboard/template-list/column-template-owner.html

+{% include "dashboard/_display-name.html" with user=record.owner show_org=True new_line=True %}

circle/dashboard/templates/dashboard/template-list/column-template-resources.html

+{% load i18n %}
+
+{{ record.ram_size }}MiB RAM
+<br />
+{% blocktrans with num_cores=record.num_cores count count=record.num_cores %}
+  {{ num_cores }} CPU core
+{% plural %}
+  {{ num_cores }} CPU cores
+{% endblocktrans %}

circle/dashboard/templates/dashboard/template-list/column-template-running.html

+<a href="{% url "dashboard.views.vm-list" %}?s=template:{{ record.pk }}%20status:running">
+  {{ record.running }}
+</a>

circle/dashboard/templates/dashboard/vm-detail.html

@@ -98,8 +98,9 @@
           <div class="input-group">
             <input type="text" id="vm-details-pw-input" class="form-control input-sm input-tags"
             value="{{ instance.pw }}" spellcheck="false"/>
-            <span class="input-group-addon input-tags" id="vm-details-pw-show">
-              <i class="fa fa-eye" id="vm-details-pw-eye" title="Show password"></i>
+            <span class="input-group-addon input-tags" id="vm-details-pw-show"
+              title="{% trans "Show password" %}" data-container="body">
+              <i class="fa fa-eye" id="vm-details-pw-eye"></i>
             </span>
           </div>
         </dd>
@@ -111,16 +112,42 @@
           </div>
         </dd>
       </dl>
-
-      <div class="input-group" id="dashboard-vm-details-connect-command">
+      {% for c in connect_commands %}
+      <div class="input-group dashboard-vm-details-connect-command">
         <span class="input-group-addon input-tags">{% trans "Command" %}</span>
         <input type="text" spellcheck="false"
-        value="{% if instance.get_connect_command %}{{ instance.get_connect_command }}{% else %}{% trans "Connection is not possible." %}{% endif %}"
+        value="{{ c }}"
+        id="vm-details-connection-string" class="form-control input-tags" />
+        <span class="input-group-addon input-tags vm-details-connection-string-copy"
+          title="{% trans "Select all" %}" data-container="body">
+          <i class="fa fa-copy"></i>
+        </span>
+      </div>
+
+      {% empty %}
+      <div class="input-group dashboard-vm-details-connect-command">
+        <span class="input-group-addon input-tags">{% trans "Command" %}</span>
+        <input type="text" spellcheck="false" value="{% trans "Connection is not possible." %}"
         id="vm-details-connection-string" class="form-control input-tags" />
         <span class="input-group-addon input-tags" id="vm-details-connection-string-copy">
           <i class="fa fa-copy" title="{% trans "Select all" %}"></i>
         </span>
       </div>
+      {% endfor %}
+      {% if instance.get_connect_uri %}
+      <div id="dashboard-vm-details-connect" class="operation-wrapper">  
+        {% if client_download %}
+        <a id="dashboard-vm-details-connect-button" class="btn btn-xs btn-default operation " href="{{ instance.get_connect_uri}}" title="{% trans "Connect via the CIRCLE Client" %}">
+                <i class="fa fa-external-link"></i> {% trans "Connect" %}
+        </a>
+        <a href="{% url "dashboard.views.client-check" %}?vm={{ instance.pk }}">{% trans "Download client" %}</a>
+        {% else %}
+        <a id="dashboard-vm-details-connect-download-button" class="btn btn-xs btn-default operation " href="{% url "dashboard.views.client-check" %}?vm={{ instance.pk }}" title="{% trans "Download the CIRCLE Client" %}">
+                <i class="fa fa-external-link"></i> {% trans "Connect (download client)" %}
+        </a>
+        {% endif %}
+      </div>
+      {% endif %}
     </div>
     <div class="col-md-8" id="vm-detail-pane">
       <div class="panel panel-default" id="vm-detail-panel">

circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html

 {% load i18n %}
-
+{% load hro %}
 <div id="activity-timeline" class="timeline">
 
 {% for a in activities %}
 <div class="activity{% if a.pk == active.pk %} activity-active{%endif%}" data-activity-id="{{ a.pk }}">
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
-  <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-plus{% endif %}"></i>
+  <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-{{a.icon}}{% endif %}"></i>
 </span>
-<strong{% if a.result %} title="{{ a.result.get_user_text }}"{% endif %}>
+{% spaceless %}
+<strong{% if a.result %} title="{{ a.result|get_text:user }}"{% endif %}>
   <a href="{{ a.get_absolute_url }}">
     {% if a.times > 1 %}({{ a.times }}x){% endif %}
-    {{ a.readable_name.get_user_text|capfirst }}</a>
+    {{ a.readable_name|get_text:user|capfirst }}</a>
 
 {% if a.has_percent %}
   - {{ a.percentage }}%
 {% endif %}
 </strong>
-{% if a.times < 2%}{{ a.started|date:"Y-m-d H:i" }}{% endif %}{% if a.user %},
+{% endspaceless %}{% if a.times < 2%} {{ a.started|date:"Y-m-d H:i" }}{% endif %}{% if a.user %},
   <a class="no-style-link" href="{% url "dashboard.views.profile" username=a.user.username %}">
     {% include "dashboard/_display-name.html" with user=a.user show_org=True %}
   </a>
@@ -33,9 +34,9 @@
     <div class="sub-timeline">
       {% for s in a.children.all %}
       <div data-activity-id="{{ s.pk }}" class="sub-activity{% if s.has_failed %} sub-activity-failed{% endif %}{% if s.pk == active.pk %} sub-activity-active{% endif %}">
-        <span{% if s.result %} title="{{ s.result.get_user_text }}"{% endif %}>
+        <span{% if s.result %} title="{{ s.result|get_text:user }}"{% endif %}>
           <a href="{{ s.get_absolute_url }}">
-              {{ s.readable_name.get_user_text|capfirst }}</a></span> &ndash;
+              {{ s.readable_name|get_text:user|capfirst }}</a></span> &ndash;
         {% if s.finished %}
           {{ s.finished|time:"H:i:s" }}
         {% else %}

circle/dashboard/templates/dashboard/vm-detail/_operations.html

@@ -7,7 +7,7 @@
 <span class="operation operation-{{op.op}} btn btn-default disabled btn-xs">
 {% else %}
 <a href="{{op.get_url}}" class="operation operation-{{op.op}} btn
-    btn-{{op.effect}} btn-xs" title="{{op.name}}: {{op.description}}">
+    btn-{{op.effect}} btn-xs" title="{{op.name|capfirst}}: {{op.description|truncatewords:15}}">
 {% endif %}
     <i class="fa fa-{{op.icon}}"></i>
     <span{% if not op.is_preferred %} class="sr-only"{% endif %}>{{op.name}}</span>

circle/dashboard/templates/dashboard/vm-detail/access.html

@@ -9,8 +9,10 @@
   {% endblocktrans %}
   {% endif %}
   {% if user == instance.owner or user.is_superuser %}
+  <span class="operation-wrapper">
   <a href="{% url "dashboard.views.vm-transfer-ownership" instance.pk %}"
-      class="btn btn-link">{% trans "Transfer ownership..." %}</a>
+      class="btn btn-link operation">{% trans "Transfer ownership..." %}</a>
+  </span>
   {% endif %}
 </p>
 <h3>{% trans "Permissions"|capfirst %}</h3>

circle/dashboard/templates/dashboard/vm-detail/home.html

@@ -90,12 +90,47 @@
         </div>
       </form>
     </div><!-- id:vm-details-tags -->
+    <dl>
+      <dt>{% trans "Template" %}:</dt>
+      <dd>
+        {% if instance.template %}
+          {% if can_link_template %}
+          <a href="{{ instance.template.get_absolute_url }}">
+            {{ instance.template.name }}
+          </a>
+          {% else %}
+            {{ instance.template.name }}
+          {% endif %}
+        {% else %}
+          -
+        {% endif %}
+      </dd>
+    </dl>
+
+    {% if op.mount_store %}
+      <strong>{% trans "Store" %}</strong>
+      <p>
+        {{ op.mount_store.description }}
+      </p>
+      <div class="operation-wrapper">
+        <a href="{{ op.mount_store.get_url }}" class="btn btn-info btn-xs operation"
+        {% if op.mount_store.disabled %}disabled{% endif %}>
+          <i class="fa fa-{{op.mount_store.icon}}"></i>
+          {{ op.mount_store.name }}
+        </a>
+      </div>
+    {% endif %}
   </div>
   <div class="col-md-8">
     {% if graphite_enabled %}
-    <img src="{% url "dashboard.views.vm-graph" instance.pk "cpu" "6h" %}" style="width:100%"/>
-    <img src="{% url "dashboard.views.vm-graph" instance.pk "memory" "6h" %}" style="width:100%"/>
-    <img src="{% url "dashboard.views.vm-graph" instance.pk "network" "6h" %}" style="width:100%"/>
+    <div class="text-center graph-buttons">
+      {% include "dashboard/_graph-time-buttons.html" %}
+    </div>
+    <div class="graph-images text-center">
+      <img src="{% url "dashboard.views.vm-graph" instance.pk "cpu" graph_time %}"/>
+      <img src="{% url "dashboard.views.vm-graph" instance.pk "memory" graph_time %}"/>
+      <img src="{% url "dashboard.views.vm-graph" instance.pk "network" graph_time %}"/>
+    </div>
     {% endif %}
   </div>
 </div>

circle/dashboard/templates/dashboard/vm-detail/resources.html

@@ -6,7 +6,7 @@
   {% csrf_token %}
   {% include "dashboard/_resources-sliders.html" with field_priority=resources_form.priority field_num_cores=resources_form.num_cores field_ram_size=resources_form.ram_size %}
 
-{% if can_change_resources %}
+{% if op.resources_change %}
     <button type="submit" class="btn btn-success btn-sm change-resources-button" 
       id="vm-details-resources-save" data-vm="{{ instance.pk }}"
       {% if op.resources_change.disabled %}disabled{% endif %}>

circle/dashboard/templates/dashboard/vm-detail/tx-owner.html

-{% extends "dashboard/base.html" %}
 {% load i18n %}
 
-{% block content %}
-  <div class="body-content">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="no-margin">
-          {% trans "Transfer ownership" %}
-        </h3>
-      </div>
-      <div class="panel-body">
-        <div class="pull-right">
-          <form action="" method="POST">
-            {% csrf_token %}
-            <label>
-              {% trans "E-mail address or identifier of user" %}:
-              <input name="name">
-            </label>
-            <input type="submit">
-          </form>
+<div class="pull-right">
+    <form action="{% url "dashboard.views.vm-transfer-ownership" pk=instance.pk %}" method="POST" style="max-width: 400px;">
+    {% csrf_token %}
+    <label>
+        {{ form.name.label }}
+    </label>
+    <div class="input-group">
+        {{form.name}}
+        <div class="input-group-btn">
+            <input type="submit" value="{% trans "Save" %}" class="btn btn-primary">
         </div>
-      </div>
-  </div>
-{% endblock %}
+    </div>
+    </form>
+</div>

circle/dashboard/templates/dashboard/vm-list.html

@@ -15,26 +15,42 @@
         </div>
         <h3 class="no-margin"><i class="fa fa-desktop"></i> {% trans "Virtual machines" %}</h3>
       </div>
-      <div class="pull-right" style="max-width: 250px; margin-top: 15px; margin-right: 15px;">
-        <form action="" method="GET" class="input-group">
-          <input type="text" name="s"{% if request.GET.s %} value="{{ request.GET.s }}"{% endif %} class="form-control input-tags" placeholder="{% trans "Search..."%}" />
-          <div class="input-group-btn">
-            <button type="submit" class="form-control btn btn-primary input-tags" title="search"><i class="fa fa-search"></i></button>
-          </div>
-        </form>
-      </div>
-      <div class="panel-body vm-list-group-control">
-        <p>
-        <strong>{% trans "Group actions" %}</strong>
-        <button id="vm-list-group-select-all" class="btn btn-info btn-xs">{% trans "Select all" %}</button>
-        <a class="btn btn-default btn-xs" id="vm-list-group-migrate" disabled><i class="fa fa-truck"></i> {% trans "Migrate" %}</a>
-        <a disabled href="#" class="btn btn-default btn-xs"><i class="fa fa-refresh"></i> {% trans "Reboot" %}</a>
-        <a disabled href="#" class="btn btn-default btn-xs"><i class="fa fa-off"></i> {% trans "Shutdown" %}</a>
-        <a id="vm-list-group-delete" disabled href="#" class="btn btn-danger btn-xs"><i class="fa fa-times"></i> {% trans "Destroy" %}</a>
-        </p>
-      </div>
       <div class="panel-body">
-        <table class="table table-bordered table-striped table-hover vm-list-table">
+        <div class="row">
+          <div class="col-md-8 vm-list-group-control" id="vm-mass-ops">
+            <strong>{% trans "Group actions" %}</strong>
+            <button id="vm-list-group-select-all" class="btn btn-info btn-xs">{% trans "Select all" %}</button>
+            {% for o in ops %}
+              <a href="{{ o.get_url }}" class="btn btn-xs btn-{{ o.effect }} mass-operation"
+               title="{{ o.name|capfirst }}" disabled>
+                <i class="fa fa-{{ o.icon }}"></i>
+              </a>
+            {% endfor %}
+          </div><!-- .vm-list-group-control -->
+          <div class="col-md-4" id="vm-list-search">
+            <form action="" method="GET">
+              <div class="input-group">
+                {{ search_form.s }}
+                <div class="input-group-btn">
+                  {{ search_form.stype }}
+                </div>
+                <label class="input-group-addon input-tags" title="{% trans "Include deleted VMs" %}"
+                  id="vm-list-search-checkbox-span" data-container="body">
+                  {{ search_form.include_deleted }}
+                </label>
+                <div class="input-group-btn">
+                  <button type="submit" class="btn btn-primary input-tags">
+                    <i class="fa fa-search"></i>
+                  </button>
+                </div>
+              </div><!-- .input-group -->
+            </form>
+          </div><!-- .col-md-4 #vm-list-search -->
+        </div><!-- .row -->
+      </div><!-- .panel-body -->
+      <div class="panel-body">
+        <table class="table table-bordered table-striped table-hover vm-list-table"
+         id="vm-list-table">
           <thead><tr>
               <th data-sort="int" class="orderable pk sortable vm-list-table-thin" style="min-width: 50px;">
                 {% trans "ID" as t %}
@@ -52,26 +68,56 @@
                 {% trans "Owner" as t %}
                 {% include "dashboard/vm-list/header-link.html" with name=t sort="owner" %}
               </th>
-              {% if user.is_superuser %}<th data-sort="string" class="orderable sortable">
-                {% trans "Node" as t %}
-                {% include "dashboard/vm-list/header-link.html" with name=t sort="node" %}
-              </th>{% endif %}
+              <th data-sort="string" class="orderable sortable">
+                {% trans "Lease" as t %}
+                {% include "dashboard/vm-list/header-link.html" with name=t sort="lease" %}
+              </th>
+              {% if user.is_superuser %}
+                <th data-sort="string" class="orderable sortable">
+                  {% trans "IP address" as t %}
+                  {% include "dashboard/vm-list/header-link.html" with name=t sort="ip_addr" %}
+                </th>
+                <th data-sort="string" class="orderable sortable">
+                  {% trans "Node" as t %}
+                  {% include "dashboard/vm-list/header-link.html" with name=t sort="node" %}
+                </th>
+              {% endif %}
           </tr></thead><tbody>
           {% for i in object_list %}
           <tr class="{% cycle 'odd' 'even' %}" data-vm-pk="{{ i.pk }}">
             <td class="pk"><div id="vm-{{i.pk}}">{{i.pk}}</div> </td>
             <td class="name"><a class="real-link" href="{% url "dashboard.views.detail" i.pk %}">{{ i.name }}</a>  </td>
-            <td class="state">{{ i.get_status_display }}</td>
+            <td class="state">
+              <i class="fa fa-fw
+                {% if show_acts_in_progress and i.is_in_status_change %}
+                  fa-spin fa-spinner
+                {% else %}
+                {{ i.get_status_icon }}{% endif %}"></i>
+              <span>{{ i.get_status_display }}</span>
+            </td>
             <td>
-              {% include "dashboard/_display-name.html" with user=i.owner show_org=True %}
+              {% if i.owner.profile %}
+                {{ i.owner.profile.get_display_name }}
+              {% else %}
+                {{ i.owner.username }}
+              {% endif %}
+              {# include "dashboard/_display-name.html" with user=i.owner show_org=True #}
+            </td>
+            <td class="lease "data-sort-value="{{ i.lease.name }}">
+              {{ i.lease.name }}
             </td>
             {% if user.is_superuser %}
-            <td data-sort-value="{{ i.node.normalized_name }}">{{ i.node.name|default:"-" }}</td>
+            <td class="ip_addr "data-sort-value="{{ i.ipv4 }}">
+              {{ i.ipv4|default:"-" }}
+            </td>
+            <td class="node "data-sort-value="{{ i.node.normalized_name }}">
+              {{ i.node.name|default:"-" }}
+            </td>
             {% endif %}
           </tr>
           {% empty %}
           <tr>
-            <td colspan="5">
+            <td colspan="7">
               {% if request.GET.s %}
                 <strong>{% trans "No result." %}</strong>
               {% else %}
@@ -87,6 +133,9 @@
 </div>
 </div>
 
+<div class="alert alert-info">
+  You can filter the list by certain attributes (owner, name, status, tags) in the following way: "owner:John Doe name:my little server". If you don't specify any attribute names the filtering will be done by name.
+</div>
 
 <div class="alert alert-info">
   {% trans "You can select multiple vm instances while holding down the <strong>CTRL</strong> key." %}
@@ -97,6 +146,5 @@
 
 {% block extra_js %}
   <script src="{{ STATIC_URL}}dashboard/vm-list.js"></script>
-  <script src="{{ STATIC_URL}}dashboard/vm-common.js"></script>
   <script src="{{ STATIC_URL}}dashboard/js/stupidtable.min.js"></script>
 {% endblock %}

circle/dashboard/templates/django_tables2/table_no_page.html

+{% spaceless %}
+{% load django_tables2 %}
+{% load i18n %}
+{% if table.page %}
+<div class="table-container">
+{% endif %}
+{% block table %}
+<table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
+    {% nospaceless %}
+    {% block table.thead %}
+    <thead>
+        <tr>
+        {% for column in table.columns %}
+            {% if column.orderable %}
+            <th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a></th>
+            {% else %}
+            <th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
+            {% endif %}
+        {% endfor %}
+        </tr>
+    </thead>
+    {% endblock table.thead %}
+    {% block table.tbody %}
+    <tbody>
+        {% for row in table.page.object_list|default:table.rows %} {# support pagination #}
+        {% block table.tbody.row %}
+        <tr class="{{ forloop.counter|divisibleby:2|yesno:"even,odd" }}"> {# avoid cycle for Django 1.2-1.6 compatibility #}
+            {% for column, cell in row.items %}
+                <td {{ column.attrs.td.as_html }}>{% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %}</td>
+            {% endfor %}
+        </tr>
+        {% endblock table.tbody.row %}
+        {% empty %}
+        {% if table.empty_text %}
+        {% block table.tbody.empty_text %}
+        <tr><td colspan="{{ table.columns|length }}">{{ table.empty_text }}</td></tr>
+        {% endblock table.tbody.empty_text %}
+        {% endif %}
+        {% endfor %}
+    </tbody>
+    {% endblock table.tbody %}
+    {% block table.tfoot %}
+    <tfoot></tfoot>
+    {% endblock table.tfoot %}
+    {% endnospaceless %}
+</table>
+{% endblock table %}
+
+{% if table.page %}
+</div>
+{% endif %}
+{% endspaceless %}

circle/dashboard/templatetags/hro.py

+from django.template import Library
+
+
+register = Library()
+
+
+@register.filter
+def get_text(human_readable, user):
+    if human_readable is None:
+        return u""
+    else:
+        return human_readable.get_text(user)

circle/dashboard/tests/test_views.py

@@ -107,20 +107,6 @@ class VmDetailTest(LoginMixin, TestCase):
         response = c.get('/dashboard/vm/1/')
         self.assertEqual(response.status_code, 200)
 
-    def test_unpermitted_vm_mass_delete(self):
-        c = Client()
-        self.login(c, 'user1')
-        response = c.post('/dashboard/vm/mass-delete/', {'vms': [1]})
-        self.assertEqual(response.status_code, 403)
-
-    def test_permitted_vm_mass_delete(self):
-        c = Client()
-        self.login(c, 'user2')
-        inst = Instance.objects.get(pk=1)
-        inst.set_level(self.u2, 'owner')
-        response = c.post('/dashboard/vm/mass-delete/', {'vms': [1]})
-        self.assertEqual(response.status_code, 302)
-
     def test_unpermitted_password_change(self):
         c = Client()
         self.login(c, "user2")
@@ -1148,7 +1134,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         c = Client()
         user_in_group = self.g1.user_set.count()
         response = c.post('/dashboard/group/' +
-                          str(self.g1.pk) + '/', {'list-new-name': 'user3'})
+                          str(self.g1.pk) + '/', {'new_member': 'user3'})
         self.assertEqual(user_in_group,
                          self.g1.user_set.count())
         self.assertEqual(response.status_code, 302)
@@ -1158,7 +1144,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         self.login(c, 'user3')
         user_in_group = self.g1.user_set.count()
         response = c.post('/dashboard/group/' +
-                          str(self.g1.pk) + '/', {'list-new-name': 'user3'})
+                          str(self.g1.pk) + '/', {'new_member': 'user3'})
         self.assertEqual(user_in_group, self.g1.user_set.count())
         self.assertEqual(response.status_code, 403)
 
@@ -1167,7 +1153,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         self.login(c, 'superuser')
         user_in_group = self.g1.user_set.count()
         response = c.post('/dashboard/group/' +
-                          str(self.g1.pk) + '/', {'list-new-name': 'user3'})
+                          str(self.g1.pk) + '/', {'new_member': 'user3'})
         self.assertEqual(user_in_group + 1, self.g1.user_set.count())
         self.assertEqual(response.status_code, 302)
 
@@ -1176,7 +1162,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         self.login(c, 'user0')
         user_in_group = self.g1.user_set.count()
         response = c.post('/dashboard/group/' +
-                          str(self.g1.pk) + '/', {'list-new-name': 'user3'})
+                          str(self.g1.pk) + '/', {'new_member': 'user3'})
         self.assertEqual(user_in_group + 1, self.g1.user_set.count())
         self.assertEqual(response.status_code, 302)
 
@@ -1186,7 +1172,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         user_in_group = self.g1.user_set.count()
         response = c.post('/dashboard/group/' +
                           str(self.g1.pk) + '/',
-                          {'list-new-namelist': 'user1\r\nuser2'})
+                          {'new_members': 'user1\r\nuser2'})
         self.assertEqual(user_in_group + 2, self.g1.user_set.count())
         self.assertEqual(response.status_code, 302)
 
@@ -1196,7 +1182,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         user_in_group = self.g1.user_set.count()
         response = c.post('/dashboard/group/' +
                           str(self.g1.pk) + '/',
-                          {'list-new-namelist': 'user1\r\nnoname\r\nuser2'})
+                          {'new_members': 'user1\r\nnoname\r\nuser2'})
         self.assertEqual(user_in_group + 2, self.g1.user_set.count())
         self.assertEqual(response.status_code, 302)
 
@@ -1206,7 +1192,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         user_in_group = self.g1.user_set.count()
         response = c.post('/dashboard/group/' +
                           str(self.g1.pk) + '/',
-                          {'list-new-namelist': 'user1\r\nuser2'})
+                          {'new_members': 'user1\r\nuser2'})
         self.assertEqual(user_in_group, self.g1.user_set.count())
         self.assertEqual(response.status_code, 403)
 
@@ -1215,7 +1201,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         user_in_group = self.g1.user_set.count()
         response = c.post('/dashboard/group/' +
                           str(self.g1.pk) + '/',
-                          {'list-new-namelist': 'user1\r\nuser2'})
+                          {'new_members': 'user1\r\nuser2'})
         self.assertEqual(user_in_group, self.g1.user_set.count())
         self.assertEqual(response.status_code, 302)
 
@@ -1485,8 +1471,8 @@ class TransferOwnershipViewTest(LoginMixin, TestCase):
         c2 = self.u2.notification_set.count()
         c = Client()
         self.login(c, 'user2')
-        response = c.post('/dashboard/vm/1/tx/')
-        assert response.status_code == 400
+        response = c.post('/dashboard/vm/1/tx/', {'name': 'userx'})
+        assert response.status_code == 403
         self.assertEqual(self.u2.notification_set.count(), c2)
 
     def test_owned_offer(self):

circle/dashboard/urls.py

@@ -25,11 +25,11 @@ from .views import (
     GroupDetailView, GroupList, IndexView,
     InstanceActivityDetail, LeaseCreate, LeaseDelete, LeaseDetail,
     MyPreferencesView, NodeAddTraitView, NodeCreate, NodeDelete,
-    NodeDetailView, NodeFlushView, NodeGraphView, NodeList, NodeStatus,
+    NodeDetailView, NodeList, NodeStatus,
     NotificationView, PortDelete, TemplateAclUpdateView, TemplateCreate,
     TemplateDelete, TemplateDetail, TemplateList, TransferOwnershipConfirmView,
     TransferOwnershipView, vm_activity, VmCreate, VmDetailView,
-    VmDetailVncTokenView, VmGraphView, VmList, VmMassDelete,
+    VmDetailVncTokenView, VmList,
     DiskRemoveView, get_disk_download_status, InterfaceDeleteView,
     GroupRemoveUserView,
     GroupRemoveFutureUserView,
@@ -39,17 +39,21 @@ from .views import (
     get_vm_screenshot,
     ProfileView, toggle_use_gravatar, UnsubscribeFormView,
     UserKeyDelete, UserKeyDetail, UserKeyCreate,
+    ConnectCommandDelete, ConnectCommandDetail, ConnectCommandCreate,
     StoreList, store_download, store_upload, store_get_upload_url, StoreRemove,
     store_new_directory, store_refresh_toplist,
     VmTraitsUpdate, VmRawDataUpdate,
     GroupPermissionsView,
     LeaseAclUpdateView,
+    ClientCheck, TokenLogin,
+    VmGraphView, NodeGraphView, NodeListGraphView,
 )
+from .views.vm import vm_ops, vm_mass_ops
+from .views.node import node_ops
 
 autocomplete_light.autodiscover()
 
 urlpatterns = patterns(
-
     '',
     url(r'^$', IndexView.as_view(), name="dashboard.index"),
     url(r'^lease/(?P<pk>\d+)/$', LeaseDetail.as_view(),
@@ -73,8 +77,6 @@ urlpatterns = patterns(
         name="dashboard.views.template-list"),
     url(r"^template/delete/(?P<pk>\d+)/$", TemplateDelete.as_view(),
         name="dashboard.views.template-delete"),
-
-    url(r'^vm/(?P<pk>\d+)/op/', include('dashboard.vm.urls')),
     url(r'^vm/(?P<pk>\d+)/remove_port/(?P<rule>\d+)/$', PortDelete.as_view(),
         name='dashboard.views.remove-port'),
     url(r'^vm/(?P<pk>\d+)/$', VmDetailView.as_view(),
@@ -88,8 +90,6 @@ urlpatterns = patterns(
     url(r'^vm/list/$', VmList.as_view(), name='dashboard.views.vm-list'),
     url(r'^vm/create/$', VmCreate.as_view(),
         name='dashboard.views.vm-create'),
-    url(r'^vm/mass-delete/', VmMassDelete.as_view(),
-        name='dashboard.view.mass-delete-vm'),
     url(r'^vm/(?P<pk>\d+)/activity/$', vm_activity),
     url(r'^vm/activity/(?P<pk>\d+)/$', InstanceActivityDetail.as_view(),
         name='dashboard.views.vm-activity'),
@@ -111,8 +111,6 @@ urlpatterns = patterns(
         name="dashboard.views.delete-node"),
     url(r'^node/status/(?P<pk>\d+)/$', NodeStatus.as_view(),
         name="dashboard.views.status-node"),
-    url(r'^node/flush/(?P<pk>\d+)/$', NodeFlushView.as_view(),
-        name="dashboard.views.flush-node"),
     url(r'^node/create/$', NodeCreate.as_view(),
         name='dashboard.views.node-create'),
 
@@ -122,14 +120,18 @@ urlpatterns = patterns(
         name="dashboard.views.delete-group"),
     url(r'^group/list/$', GroupList.as_view(),
         name='dashboard.views.group-list'),
-    url((r'^vm/(?P<pk>\d+)/graph/(?P<metric>cpu|memory|network)/'
+    url((r'^vm/(?P<pk>\d+)/graph/(?P<metric>[a-z]+)/'
          r'(?P<time>[0-9]{1,2}[hdwy])$'),
         VmGraphView.as_view(),
         name='dashboard.views.vm-graph'),
-    url((r'^node/(?P<pk>\d+)/graph/(?P<metric>cpu|memory|network)/'
+    url((r'^node/(?P<pk>\d+)/graph/(?P<metric>[a-z]+)/'
          r'(?P<time>[0-9]{1,2}[hdwy])$'),
         NodeGraphView.as_view(),
         name='dashboard.views.node-graph'),
+    url((r'^node/graph/(?P<metric>[a-z]+)/'
+         r'(?P<time>[0-9]{1,2}[hdwy])$'),
+        NodeListGraphView.as_view(),
+        name='dashboard.views.node-list-graph'),
     url(r'^group/(?P<pk>\d+)/$', GroupDetailView.as_view(),
         name='dashboard.views.group-detail'),
     url(r'^group/(?P<pk>\d+)/update/$', GroupProfileUpdate.as_view(),
@@ -180,6 +182,16 @@ urlpatterns = patterns(
         UserKeyCreate.as_view(),
         name="dashboard.views.userkey-create"),
 
+    url(r'^conncmd/delete/(?P<pk>\d+)/$',
+        ConnectCommandDelete.as_view(),
+        name="dashboard.views.connect-command-delete"),
+    url(r'^conncmd/(?P<pk>\d+)/$',
+        ConnectCommandDetail.as_view(),
+        name="dashboard.views.connect-command-detail"),
+    url(r'^conncmd/create/$',
+        ConnectCommandCreate.as_view(),
+        name="dashboard.views.connect-command-create"),
+
     url(r'^autocomplete/', include('autocomplete_light.urls')),
 
     url(r"^store/list/$", StoreList.as_view(),
@@ -196,4 +208,26 @@ urlpatterns = patterns(
         name="dashboard.views.store-new-directory"),
     url(r"^store/refresh_toplist$", store_refresh_toplist,
         name="dashboard.views.store-refresh-toplist"),
+    url(r"^client/check$", ClientCheck.as_view(),
+        name="dashboard.views.client-check"),
+    url(r'^token-login/(?P<token>.*)/$', TokenLogin.as_view(),
+        name="dashboard.views.token-login"),
+)
+
+urlpatterns += patterns(
+    '',
+    *(url(r'^vm/(?P<pk>\d+)/op/%s/$' % op, v.as_view(), name=v.get_urlname())
+        for op, v in vm_ops.iteritems())
+)
+
+urlpatterns += patterns(
+    '',
+    *(url(r'^vm/mass_op/%s/$' % op, v.as_view(), name=v.get_urlname())
+        for op, v in vm_mass_ops.iteritems())
+)
+
+urlpatterns += patterns(
+    '',
+    *(url(r'^node/(?P<pk>\d+)/op/%s/$' % op, v.as_view(), name=v.get_urlname())
+        for op, v in node_ops.iteritems())
 )

circle/dashboard/virtvalidator.py → circle/dashboard/validators.py

 from django.core.exceptions import ValidationError
+from django.utils.translation import ugettext_lazy as _
+
 from lxml import etree as ET
 import logging
 
@@ -29,3 +31,27 @@ def domain_validator(value):
             relaxng.assertValid(parsed_xml)
         except Exception as e:
             raise ValidationError(e.message)
+
+
+def connect_command_template_validator(value):
+    """Validate value as a connect command template.
+
+    >>> try: connect_command_template_validator("%(host)s")
+    ... except ValidationError as e: print e
+    ...
+    >>> connect_command_template_validator("%(host)s")
+    >>> try: connect_command_template_validator("%(host)s %s")
+    ... except ValidationError as e: print e
+    ...
+    [u'Invalid template string.']
+    """
+
+    try:
+        value % {
+            'username': "uname",
+            'password': "pw",
+            'host': "111.111.111.111",
+            'port': 12345,
+        }
+    except (KeyError, TypeError, ValueError):
+        raise ValidationError(_("Invalid template string."))

circle/dashboard/views/__init__.py

+# flake8: noqa
+# from .node import Node
+
+# __all__ = [ ]
+
+from group import *
+from index import *
+from node import *
+from store import *
+from template import *
+from user import *
+from util import *
+from vm import *
+from graph import *

circle/dashboard/views/graph.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import absolute_import, unicode_literals
+
+import logging
+import requests
+
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
+from django.http import HttpResponse, Http404
+from django.utils.translation import ugettext_lazy as _
+from django.views.generic import View
+
+from braces.views import LoginRequiredMixin, SuperuserRequiredMixin
+
+from vm.models import Instance, Node
+
+
+logger = logging.getLogger(__name__)
+
+
+def register_graph(metric_cls, graph_name, graphview_cls):
+    if not hasattr(graphview_cls, 'metrics'):
+        graphview_cls.metrics = {}
+    graphview_cls.metrics[graph_name] = metric_cls
+
+
+class GraphViewBase(LoginRequiredMixin, View):
+    def create_class(self, cls):
+        return type(str(cls.__name__ + 'Metric'), (cls, self.base), {})
+
+    def get(self, request, pk, metric, time, *args, **kwargs):
+        graphite_url = settings.GRAPHITE_URL
+        if graphite_url is None:
+            raise Http404()
+
+        try:
+            metric = self.metrics[metric]
+        except KeyError:
+            raise Http404()
+
+        try:
+            instance = self.get_object(request, pk)
+        except self.model.DoesNotExist:
+            raise Http404()
+
+        metric = self.create_class(metric)(instance)
+
+        return HttpResponse(metric.get_graph(graphite_url, time),
+                            mimetype="image/png")
+
+    def get_object(self, request, pk):
+        instance = self.model.objects.get(id=pk)
+        if not instance.has_level(request.user, 'user'):
+            raise PermissionDenied()
+        return instance
+
+
+class Metric(object):
+    cacti_style = True
+    derivative = False
+    scale_to_seconds = None
+    metric_name = None
+    title = None
+    label = None
+
+    def __init__(self, obj, metric_name=None):
+        self.obj = obj
+        self.metric_name = (
+            metric_name or self.metric_name or self.__class__.__name__.lower())
+
+    def get_metric_name(self):
+        return self.metric_name
+
+    def get_label(self):
+        return self.label or self.get_metric_name()
+
+    def get_title(self):
+        return self.title or self.get_metric_name()
+
+    def get_minmax(self):
+        return (None, None)
+
+    def get_target(self):
+        target = '%s.%s' % (self.obj.metric_prefix, self.get_metric_name())
+        if self.derivative:
+            target = 'nonNegativeDerivative(%s)' % target
+        if self.scale_to_seconds:
+            target = 'scaleToSeconds(%s, %d)' % (target, self.scale_to_seconds)
+        target = 'alias(%s, "%s")' % (target, self.get_label())
+        if self.cacti_style:
+            target = 'cactiStyle(%s)' % target
+        return target
+
+    def get_graph(self, graphite_url, time, width=500, height=200):
+        params = {'target': self.get_target(),
+                  'from': '-%s' % time,
+                  'title': self.get_title().encode('UTF-8'),
+                  'width': width,
+                  'height': height}
+
+        ymin, ymax = self.get_minmax()
+        if ymin is not None:
+            params['yMin'] = ymin
+        if ymax is not None:
+            params['yMax'] = ymax
+
+        logger.debug('%s %s', graphite_url, params)
+        response = requests.get('%s/render/' % graphite_url, params=params)
+        return response.content
+
+
+class VmMetric(Metric):
+    def get_title(self):
+        title = super(VmMetric, self).get_title()
+        return '%s (%s) - %s' % (self.obj.name, self.obj.vm_name, title)
+
+
+class NodeMetric(Metric):
+    def get_title(self):
+        title = super(NodeMetric, self).get_title()
+        return '%s (%s) - %s' % (self.obj.name, self.obj.host.hostname, title)
+
+
+class VmGraphView(GraphViewBase):
+    model = Instance
+    base = VmMetric
+
+
+class NodeGraphView(SuperuserRequiredMixin, GraphViewBase):
+    model = Node
+    base = NodeMetric
+
+    def get_object(self, request, pk):
+        return self.model.objects.get(id=pk)
+
+
+class NodeListGraphView(SuperuserRequiredMixin, GraphViewBase):
+    model = Node
+    base = Metric
+
+    def get_object(self, request, pk):
+        return Node.objects.filter(enabled=True)
+
+    def get(self, request, metric, time, *args, **kwargs):
+        return super(NodeListGraphView, self).get(request, None, metric, time)
+
+
+class Ram(object):
+    metric_name = "memory.usage"
+    title = _("RAM usage (%)")
+    label = _("RAM usage (%)")
+
+    def get_minmax(self):
+        return (0, 105)
+
+register_graph(Ram, 'memory', VmGraphView)
+register_graph(Ram, 'memory', NodeGraphView)
+
+
+class Cpu(object):
+    metric_name = "cpu.percent"
+    title = _("CPU usage (%)")
+    label = _("CPU usage (%)")
+
+    def get_minmax(self):
+        if isinstance(self.obj, Node):
+            return (0, 105)
+        else:
+            return (0, self.obj.num_cores * 100 + 5)
+
+register_graph(Cpu, 'cpu', VmGraphView)
+register_graph(Cpu, 'cpu', NodeGraphView)
+
+
+class VmNetwork(object):
+    title = _("Network")
+
+    def get_minmax(self):
+        return (0, None)
+
+    def get_target(self):
+        metrics = []
+        for n in self.obj.interface_set.all():
+            params = (self.obj.metric_prefix, n.vlan.vid, n.vlan.name)
+            metrics.append(
+                'alias(scaleToSeconds(nonNegativeDerivative('
+                '%s.network.bytes_recv-%s), 10), "out - %s (bits/s)")' % (
+                    params))
+            metrics.append(
+                'alias(scaleToSeconds(nonNegativeDerivative('
+                '%s.network.bytes_sent-%s), 10), "in - %s (bits/s)")' % (
+                    params))
+        return 'group(%s)' % ','.join(metrics)
+
+register_graph(VmNetwork, 'network', VmGraphView)
+
+
+class NodeNetwork(object):
+    title = _("Network")
+
+    def get_minmax(self):
+        return (0, None)
+
+    def get_target(self):
+        return (
+            'aliasSub(scaleToSeconds(nonNegativeDerivative(%s.network.b*),'
+            '10), ".*\.bytes_(sent|recv)-([a-zA-Z0-9]+).*", "\\2 \\1")' % (
+                self.obj.metric_prefix))
+
+register_graph(NodeNetwork, 'network', NodeGraphView)
+
+
+class NodeVms(object):
+    metric_name = "vmcount"
+    title = _("Instance count")
+    label = _("instance count")
+
+    def get_minmax(self):
+        return (0, None)
+
+register_graph(NodeVms, 'vm', NodeGraphView)
+
+
+class NodeAllocated(object):
+    title = _("Allocated memory (bytes)")
+
+    def get_target(self):
+        prefix = self.obj.metric_prefix
+        if self.obj.online and self.obj.enabled:
+            ram_size = self.obj.ram_size
+        else:
+            ram_size = 0
+        used = 'alias(%s.memory.used_bytes, "used")' % prefix
+        allocated = 'alias(%s.memory.allocated, "allocated")' % prefix
+        max = 'threshold(%d, "max")' % ram_size
+        return 'cactiStyle(group(%s, %s, %s))' % (used, allocated, max)
+
+    def get_minmax(self):
+        return (0, None)
+
+register_graph(NodeAllocated, 'alloc', NodeGraphView)
+
+
+class NodeListAllocated(object):
+    title = _("Allocated memory (bytes)")
+
+    def get_target(self):
+        nodes = self.obj
+        used = ','.join('%s.memory.used_bytes' % n.metric_prefix
+                        for n in nodes)
+        allocated = 'alias(sumSeries(%s), "allocated")' % ','.join(
+            '%s.memory.allocated' % n.metric_prefix for n in nodes)
+        max = 'threshold(%d, "max")' % sum(
+            n.ram_size for n in nodes if n.online)
+        return ('group(aliasSub(aliasByNode(stacked(group(%s)), 1), "$",'
+                '"  (used)"), %s, %s)' % (used, allocated, max))
+
+    def get_minmax(self):
+        return (0, None)
+
+register_graph(NodeListAllocated, 'alloc', NodeListGraphView)
+
+
+class NodeListVms(object):
+    title = _("Instance count")
+
+    def get_target(self):
+        vmcount = ','.join('%s.vmcount' % n.metric_prefix for n in self.obj)
+        return 'group(aliasByNode(stacked(group(%s)), 1))' % vmcount
+
+    def get_minmax(self):
+        return (0, None)
+
+register_graph(NodeListVms, 'vm', NodeListGraphView)

circle/dashboard/views/index.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import unicode_literals, absolute_import
+
+import logging
+
+from django.core.cache import get_cache
+from django.conf import settings
+from django.contrib.auth.models import Group
+from django.views.generic import TemplateView
+
+from braces.views import LoginRequiredMixin
+
+from dashboard.models import GroupProfile
+from vm.models import Instance, Node, InstanceTemplate
+
+from ..store_api import Store
+
+logger = logging.getLogger(__name__)
+
+
+class IndexView(LoginRequiredMixin, TemplateView):
+    template_name = "dashboard/index.html"
+
+    def get_context_data(self, **kwargs):
+        user = self.request.user
+        context = super(IndexView, self).get_context_data(**kwargs)
+
+        # instances
+        favs = Instance.objects.filter(favourite__user=self.request.user)
+        instances = Instance.get_objects_with_level(
+            'user', user, disregard_superuser=True).filter(destroyed_at=None)
+        display = list(favs) + list(set(instances) - set(favs))
+        for d in display:
+            d.fav = True if d in favs else False
+        context.update({
+            'instances': display[:5],
+            'more_instances': instances.count() - len(instances[:5])
+        })
+
+        running = instances.filter(status='RUNNING')
+        stopped = instances.exclude(status__in=('RUNNING', 'NOSTATE'))
+
+        context.update({
+            'running_vms': running[:20],
+            'running_vm_num': running.count(),
+            'stopped_vm_num': stopped.count()
+        })
+
+        # nodes
+        if user.is_superuser:
+            nodes = Node.objects.all()
+            context.update({
+                'nodes': nodes[:5],
+                'more_nodes': nodes.count() - len(nodes[:5]),
+                'sum_node_num': nodes.count(),
+                'node_num': {
+                    'running': Node.get_state_count(True, True),
+                    'missing': Node.get_state_count(False, True),
+                    'disabled': Node.get_state_count(True, False),
+                    'offline': Node.get_state_count(False, False)
+                }
+            })
+
+        # groups
+        if user.has_module_perms('auth'):
+            profiles = GroupProfile.get_objects_with_level('operator', user)
+            groups = Group.objects.filter(groupprofile__in=profiles)
+            context.update({
+                'groups': groups[:5],
+                'more_groups': groups.count() - len(groups[:5]),
+            })
+
+        # template
+        if user.has_perm('vm.create_template'):
+            context['templates'] = InstanceTemplate.get_objects_with_level(
+                'operator', user, disregard_superuser=True).all()[:5]
+
+        # toplist
+        if settings.STORE_URL:
+            cache_key = "files-%d" % self.request.user.pk
+            cache = get_cache("default")
+            files = cache.get(cache_key)
+            if not files:
+                try:
+                    store = Store(self.request.user)
+                    toplist = store.toplist()
+                    quota = store.get_quota()
+                    files = {'toplist': toplist, 'quota': quota}
+                except Exception:
+                    logger.exception("Unable to get tolist for %s",
+                                     unicode(self.request.user))
+                    files = {'toplist': []}
+                cache.set(cache_key, files, 300)
+
+            context['files'] = files
+        else:
+            context['no_store'] = True
+
+        return context
+
+
+class HelpView(TemplateView):
+
+    def get_context_data(self, *args, **kwargs):
+        ctx = super(HelpView, self).get_context_data(*args, **kwargs)
+        ctx.update({"saml": hasattr(settings, "SAML_CONFIG"),
+                    "store": settings.STORE_URL})
+        return ctx

circle/dashboard/views/store.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import unicode_literals, absolute_import
+
+import json
+import logging
+from os.path import join, normpath, dirname, basename
+
+from django.conf import settings
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.core.cache import get_cache
+from django.core.exceptions import SuspiciousOperation
+from django.core.urlresolvers import reverse
+from django.http import HttpResponse
+from django.shortcuts import redirect, render_to_response, render
+from django.template import RequestContext
+from django.utils.translation import ugettext as _
+from django.views.decorators.http import require_GET, require_POST
+from django.views.generic import TemplateView
+
+from braces.views import LoginRequiredMixin
+
+from ..store_api import Store, NoStoreException, NotOkException
+
+logger = logging.getLogger(__name__)
+
+
+class StoreList(LoginRequiredMixin, TemplateView):
+    template_name = "dashboard/store/list.html"
+
+    def get_context_data(self, **kwargs):
+        context = super(StoreList, self).get_context_data(**kwargs)
+        directory = self.request.GET.get("directory", "/")
+        directory = "/" if not len(directory) else directory
+
+        store = Store(self.request.user)
+        context['root'] = store.list(directory)
+        context['quota'] = store.get_quota()
+        context['up_url'] = self.create_up_directory(directory)
+        context['current'] = directory
+        context['next_url'] = "%s%s?directory=%s" % (
+            settings.DJANGO_URL.rstrip("/"),
+            reverse("dashboard.views.store-list"), directory)
+        return context
+
+    def get(self, *args, **kwargs):
+        try:
+            if self.request.is_ajax():
+                context = self.get_context_data(**kwargs)
+                return render_to_response(
+                    "dashboard/store/_list-box.html",
+                    RequestContext(self.request, context),
+                )
+            else:
+                return super(StoreList, self).get(*args, **kwargs)
+        except NoStoreException:
+            messages.warning(self.request, _("No store."))
+        except NotOkException:
+            messages.warning(self.request, _("Store has some problems now."
+                                             " Try again later."))
+        except Exception as e:
+            logger.critical("Something is wrong with store: %s", unicode(e))
+            messages.warning(self.request, _("Unknown store error."))
+        return redirect("/")
+
+    def create_up_directory(self, directory):
+        path = normpath(join('/', directory, '..'))
+        if not path.endswith("/"):
+            path += "/"
+        return path
+
+
+@require_GET
+@login_required
+def store_download(request):
+    path = request.GET.get("path")
+    try:
+        url = Store(request.user).request_download(path)
+    except Exception:
+        messages.error(request, _("Something went wrong during download."))
+        logger.exception("Unable to download, "
+                         "maybe it is already deleted")
+        return redirect(reverse("dashboard.views.store-list"))
+    return redirect(url)
+
+
+@require_GET
+@login_required
+def store_upload(request):
+    directory = request.GET.get("directory", "/")
+    try:
+        action = Store(request.user).request_upload(directory)
+    except Exception:
+        logger.exception("Unable to upload")
+        messages.error(request, _("Unable to upload file."))
+        return redirect("/")
+
+    next_url = "%s%s?directory=%s" % (
+        settings.DJANGO_URL.rstrip("/"),
+        reverse("dashboard.views.store-list"), directory)
+
+    return render(request, "dashboard/store/upload.html",
+                  {'directory': directory, 'action': action,
+                   'next_url': next_url})
+
+
+@require_GET
+@login_required
+def store_get_upload_url(request):
+    current_dir = request.GET.get("current_dir")
+    try:
+        url = Store(request.user).request_upload(current_dir)
+    except Exception:
+        logger.exception("Unable to upload")
+        messages.error(request, _("Unable to upload file."))
+        return redirect("/")
+    return HttpResponse(
+        json.dumps({'url': url}), content_type="application/json")
+
+
+class StoreRemove(LoginRequiredMixin, TemplateView):
+    template_name = "dashboard/store/remove.html"
+
+    def get_context_data(self, *args, **kwargs):
+        context = super(StoreRemove, self).get_context_data(*args, **kwargs)
+        path = self.request.GET.get("path", "/")
+        if path == "/":
+            SuspiciousOperation()
+
+        context['path'] = path
+        context['is_dir'] = path.endswith("/")
+        if context['is_dir']:
+            context['directory'] = path
+        else:
+            context['directory'] = dirname(path)
+            context['name'] = basename(path)
+
+        return context
+
+    def get(self, *args, **kwargs):
+        try:
+            return super(StoreRemove, self).get(*args, **kwargs)
+        except NoStoreException:
+            return redirect("/")
+
+    def post(self, *args, **kwargs):
+        path = self.request.POST.get("path")
+        try:
+            Store(self.request.user).remove(path)
+        except Exception:
+            logger.exception("Unable to remove %s", path)
+            messages.error(self.request, _("Unable to remove %s.") % path)
+
+        return redirect("%s?directory=%s" % (
+            reverse("dashboard.views.store-list"),
+            dirname(dirname(path)),
+        ))
+
+
+@require_POST
+@login_required
+def store_new_directory(request):
+    path = request.POST.get("path")
+    name = request.POST.get("name")
+
+    try:
+        Store(request.user).new_folder(join(path, name))
+    except Exception:
+        logger.exception("Unable to create folder %s in %s for %s",
+                         name, path, unicode(request.user))
+        messages.error(request, _("Unable to create folder."))
+    return redirect("%s?directory=%s" % (
+        reverse("dashboard.views.store-list"), path))
+
+
+@require_POST
+@login_required
+def store_refresh_toplist(request):
+    cache_key = "files-%d" % request.user.pk
+    cache = get_cache("default")
+    try:
+        store = Store(request.user)
+        toplist = store.toplist()
+        quota = store.get_quota()
+        files = {'toplist': toplist, 'quota': quota}
+    except Exception:
+        logger.exception("Can't get toplist of %s", unicode(request.user))
+        files = {'toplist': []}
+    cache.set(cache_key, files, 300)
+
+    return redirect(reverse("dashboard.index"))