Merge branch 'master' into feature-voms-occi

Conflicts: circle/vm/models/instance.py

Merge branch 'master' into feature-voms-occi
Conflicts: circle/vm/models/instance.py
4d56b18f · Kálmán Viktor · 1877c381 · d66ecb5a · 4d56b18f · 4d56b18f
Commit 4d56b18f authored Nov 12, 2014 by Kálmán Viktor
74 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ celerybeat-schedule
 .coverage
 *,cover
 coverage.xml
+.noseids
 # Gettext object file:
 *.mo

--- a/circle/acl/models.py
+++ b/circle/acl/models.py
@@ -71,6 +71,17 @@ class AclBase(Model):
    """Define permission levels for Users/Groups per object."""
    object_level_set = GenericRelation(ObjectLevel)
+    def clone_acl(self, other):
+        """Clone full ACL from other object."""
+        assert self.id != other.id or type(self) != type(other)
+        self.object_level_set.clear()
+        for i in other.object_level_set.all():
+            ol = self.object_level_set.create(level=i.level)
+            for j in i.users.all():
+                ol.users.add(j)
+            for j in i.groups.all():
+                ol.groups.add(j)
    @classmethod
    def get_level_object(cls, level):

--- a/circle/circle/settings/local.py
+++ b/circle/circle/settings/local.py
@@ -64,6 +64,13 @@ CACHES = {
 ########## END CACHE CONFIGURATION
+########## ROSETTA CONFIGURATION
+INSTALLED_APPS += (
+    'rosetta',
+)
+########## END ROSETTA CONFIGURATION
 ########## TOOLBAR CONFIGURATION
 # https://github.com/django-debug-toolbar/django-debug-toolbar#installation
 if get_env_variable('DJANGO_TOOLBAR', 'FALSE') == 'TRUE':

--- a/circle/circle/urls.py
+++ b/circle/circle/urls.py
@@ -18,9 +18,11 @@
 from django.conf.urls import patterns, include, url
 from django.views.generic import TemplateView
+from django.conf import settings
 from django.contrib import admin
-from django.shortcuts import redirect
 from django.core.urlresolvers import reverse
+from django.shortcuts import redirect
 from circle.settings.base import get_env_variable
 from dashboard.views import circle_login, HelpView
@@ -72,6 +74,13 @@ urlpatterns = patterns(
 )
+if 'rosetta' in settings.INSTALLED_APPS:
+    urlpatterns += patterns(
+        '',
+        url(r'^rosetta/', include('rosetta.urls')),
+    )
 if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
    urlpatterns += patterns(
        '',

--- a/circle/common/models.py
+++ b/circle/common/models.py
@@ -32,6 +32,7 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models import (
    CharField, DateTimeField, ForeignKey, NullBooleanField
 )
+from django.template import defaultfilters
 from django.utils import timezone
 from django.utils.encoding import force_text
 from django.utils.functional import Promise
@@ -48,7 +49,15 @@ class WorkerNotFound(Exception):
    pass
+def get_error_msg(exception):
+    try:
+        return unicode(exception)
+    except UnicodeDecodeError:
+        return unicode(str(exception), encoding='utf-8', errors='replace')
 def activitycontextimpl(act, on_abort=None, on_commit=None):
+    result = None
    try:
        try:
            yield act
@@ -61,7 +70,7 @@ def activitycontextimpl(act, on_abort=None, on_commit=None):
            result = create_readable(
                ugettext_noop("Failure."),
                ugettext_noop("Unhandled exception: %(error)s"),
-                error=unicode(e))
+                error=get_error_msg(e))
            raise
    except:
        logger.exception("Failed activity %s" % unicode(act))
@@ -428,6 +437,14 @@ class HumanReadableObject(object):
            admin_text_template = admin_text_template._proxy____args[0]
        self.user_text_template = user_text_template
        self.admin_text_template = admin_text_template
+        for k, v in params.iteritems():
+            try:
+                v = timezone.datetime.strptime(
+                    v, "%Y-%m-%dT%H:%M:%S.%fZ").replace(tzinfo=timezone.UTC())
+            except (ValueError, TypeError):  # Mock raises TypeError
+                pass
+            if isinstance(v, timezone.datetime):
+                params[k] = defaultfilters.date(v, "DATETIME_FORMAT")
        self.params = params
    @classmethod
@@ -444,24 +461,27 @@ class HumanReadableObject(object):
    def from_dict(cls, d):
        return None if d is None else cls(**d)
-    def get_admin_text(self):
+    def _get_parsed_text(self, key):
-        if self.admin_text_template == "":
+        value = getattr(self, key)
+        if value == "":
            return ""
        try:
-            return _(self.admin_text_template) % self.params
+            return _(value) % self.params
+        except KeyError:
+            logger.exception("Can't render %s '%s' %% %s",
+                             key, value, unicode(self.params))
+            raise
+    def get_admin_text(self):
+        try:
+            return self._get_parsed_text("admin_text_template")
        except KeyError:
-            logger.exception("Can't render admin_text_template '%s' %% %s",
-                             self.admin_text_template, unicode(self.params))
            return self.get_user_text()
    def get_user_text(self):
-        if self.user_text_template == "":
-            return ""
        try:
-            return _(self.user_text_template) % self.params
+            return self._get_parsed_text("user_text_template")
        except KeyError:
-            logger.exception("Can't render user_text_template '%s' %% %s",
-                             self.user_text_template, unicode(self.params))
            return self.user_text_template
    def get_text(self, user):

--- a/circle/common/tests/test_models.py
+++ b/circle/common/tests/test_models.py
@@ -22,6 +22,7 @@ from mock import MagicMock
 from .models import TestClass
 from ..models import HumanSortField
+from ..models import activitycontextimpl
 class MethodCacheTestCase(TestCase):
@@ -80,3 +81,22 @@ class TestHumanSortField(TestCase):
            test_result = HumanSortField.get_normalized_value(obj, val)
            self.assertEquals(test_result, result)
+class ActivityContextTestCase(TestCase):
+    class MyException(Exception):
+        pass
+    def test_unicode(self):
+        act = MagicMock()
+        gen = activitycontextimpl(act)
+        gen.next()
+        with self.assertRaises(self.MyException):
+            gen.throw(self.MyException(u'test\xe1'))
+    def test_str(self):
+        act = MagicMock()
+        gen = activitycontextimpl(act)
+        gen.next()
+        with self.assertRaises(self.MyException):
+            gen.throw(self.MyException('test\xbe'))
--- a/circle/dashboard/forms.py
+++ b/circle/dashboard/forms.py
--- a/circle/dashboard/static/dashboard/bootstrap-tour.min.css
+++ b/circle/dashboard/static/dashboard/bootstrap-tour.min.css
-/* ===========================================================
-# bootstrap-tour - v0.9.1
-# http://bootstraptour.com
-# ==============================================================
-# Copyright 2012-2013 Ulrich Sossou
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/
-.tour-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1100;background-color:#000;opacity:.8}.tour-step-backdrop{position:relative;z-index:1101;background:inherit}.tour-step-background{position:absolute;z-index:1100;background:inherit;border-radius:6px}.popover[class*=tour-]{z-index:1100}.popover[class*=tour-] .popover-navigation{padding:9px 14px}.popover[class*=tour-] .popover-navigation [data-role=end]{float:right}.popover[class*=tour-] .popover-navigation [data-role=prev],.popover[class*=tour-] .popover-navigation [data-role=next],.popover[class*=tour-] .popover-navigation [data-role=end]{cursor:pointer}.popover[class*=tour-] .popover-navigation [data-role=prev].disabled,.popover[class*=tour-] .popover-navigation [data-role=next].disabled,.popover[class*=tour-] .popover-navigation [data-role=end].disabled{cursor:default}.popover[class*=tour-].orphan{position:fixed;margin-top:0}.popover[class*=tour-].orphan .arrow{display:none}
\ No newline at end of file
--- a/circle/dashboard/static/dashboard/bootstrap-tour.min.js
+++ b/circle/dashboard/static/dashboard/bootstrap-tour.min.js
--- a/circle/dashboard/static/dashboard/dashboard.css
+++ b/circle/dashboard/static/dashboard/dashboard.css
@@ -216,7 +216,7 @@ html {
 }
 #vm-list-rename-name, #node-list-rename-name, #group-list-rename-name {
-  max-width: 100px;
+  max-width: 150px;
 }
 .label-tag {
@@ -688,7 +688,7 @@ textarea[name="new_members"] {
 .dashboard-vm-details-connect-command {
  /* for mobile view */
-  margin-bottom: 20px;
+  padding-bottom: 20px;
 }
 #store-list-list {
@@ -961,6 +961,14 @@ textarea[name="new_members"] {
  cursor: pointer
 }
+#vm-details-resources-disk {
+  padding: 2px 5px 10px 5px;
+}
+#vm-details-start-template-tour {
+  margin-right: 5px;
+}
 #vm-activity-state {
  margin-bottom: 15px;
 }
@@ -974,6 +982,24 @@ textarea[name="new_members"] {
  color: orange;
 }
+.introjs-skipbutton {
+  color: #333;
+}
+.introjs-button:focus {
+  text-decoration: none;
+  color: #333;
+  outline: none;
+}
+.introjs-button:hover:not(.introjs-disabled) {
+  color: #428bca;
+}
+.introjs-tooltip {
+  min-width: 250px;
+}
 #vm-info-pane {
  margin-bottom: 20px;
 }
@@ -1016,3 +1042,12 @@ textarea[name="new_members"] {
 #vm-migrate-node-list li {
  cursor: pointer;
 }
+.group-list-table .actions,
+.group-list-table .admin,
+.group-list-table .number_of_users,
+.group-list-table .pk {
+  width: 1px;
+  white-space: nowrap;
+  text-align: center;
+}
--- a/circle/dashboard/static/dashboard/dashboard.js
+++ b/circle/dashboard/static/dashboard/dashboard.js
@@ -50,6 +50,21 @@ $(function () {
    return false;
  });
+  $('.tx-tpl-ownership').click(function(e) {
+    $.ajax({
+      type: 'GET',
+      url: $('.tx-tpl-ownership').attr('href'),
+      success: function(data) {
+        $('body').append(data);
+        $('#confirmation-modal').modal('show');
+        $('#confirmation-modal').on('hidden.bs.modal', function() {
+          $('#confirmation-modal').remove();
+        });
+      }
+    });
+    return false;
+  });
  $('.template-choose').click(function(e) {
    $.ajax({
      type: 'GET',
@@ -117,7 +132,7 @@ $(function () {
  $('.js-hidden').hide();
  /* favourite star */
-  $("#dashboard-vm-list").on('click', '.dashboard-vm-favourite', function(e) {
+  $("#dashboard-vm-list, .page-header").on('click', '.dashboard-vm-favourite', function(e) {
    var star = $(this).children("i");
    var pk = $(this).data("vm");
    if(star.hasClass("fa-star-o")) {
@@ -428,7 +443,7 @@ function generateVmHTML(pk, name, host, icon, _status, fav, is_last) {
  return '<a href="/dashboard/vm/' + pk + '/" class="list-group-item' +
         (is_last ? ' list-group-item-last' : '') + '">' +      
        '<span class="index-vm-list-name">' + 
-          '<i class="fa ' + icon + '" title="' + _status + '"></i> ' + name +
+          '<i class="fa ' + icon + '" title="' + _status + '"></i> ' + safe_tags_replace(name) +
        '</span>' + 
        '<small class="text-muted"> ' + host + '</small>' +
        '<div class="pull-right dashboard-vm-favourite" data-vm="' + pk + '">' +  
@@ -441,14 +456,14 @@ function generateVmHTML(pk, name, host, icon, _status, fav, is_last) {
 function generateGroupHTML(url, name, is_last) {
  return '<a href="' + url + '" class="list-group-item real-link' + (is_last ? " list-group-item-last" : "") +'">'+
-         '<i class="fa fa-users"></i> '+ name +
+         '<i class="fa fa-users"></i> '+ safe_tags_replace(name) +
         '</a>';
 }
 function generateNodeHTML(name, icon, _status, url, is_last) {
  return '<a href="' + url + '" class="list-group-item real-link' + (is_last ? ' list-group-item-last' : '') + '">' +
        '<span class="index-node-list-name">' +
-        '<i class="fa ' + icon + '" title="' + _status + '"></i> ' + name +
+        '<i class="fa ' + icon + '" title="' + _status + '"></i> ' + safe_tags_replace(name) +
        '</span>' +
        '<div style="clear: both;"></div>' +
        '</a>';
@@ -456,7 +471,7 @@ function generateNodeHTML(name, icon, _status, url, is_last) {
 function generateNodeTagHTML(name, icon, _status, label , url) {
  return '<a href="' + url + '" class="label ' + label + '" >' +
-        '<i class="fa ' + icon + '" title="' + _status + '"></i> ' + name +
+        '<i class="fa ' + icon + '" title="' + _status + '"></i> ' + safe_tags_replace(name) +
        '</a> ';
 }
@@ -678,3 +693,18 @@ function getParameterByName(name) {
        results = regex.exec(location.search);
    return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
 }
+var tagsToReplace = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;'
+};
+function replaceTag(tag) {
+    return tagsToReplace[tag] || tag;
+}
+function safe_tags_replace(str) {
+    return str.replace(/[&<>]/g, replaceTag);
+}
--- a/circle/dashboard/static/dashboard/disk-list.js
+++ b/circle/dashboard/static/dashboard/disk-list.js
-$(function() {
-  $(".disk-list-disk-percentage").each(function() {
-    var disk = $(this).data("disk-pk");
-    var element = $(this);
-    refreshDisk(disk, element);
-  });
-});
-function refreshDisk(disk, element) {
-    $.get("/dashboard/disk/" + disk + "/status/", function(result) {
-      if(result.percentage == null || result.failed == "True") {
-        location.reload(); 
-      } else {
-        var diff = result.percentage - parseInt(element.html());
-        var refresh = 5 - diff;
-        refresh = refresh < 1 ? 1 : (result.percentage == 0 ? 1 : refresh);
-        if(isNaN(refresh)) refresh = 2; // this should not happen
-        element.html(result.percentage);
-        setTimeout(function() {refreshDisk(disk, element)}, refresh * 1000);
-      }
-    });
-}
--- a/circle/dashboard/static/dashboard/group-details.js
+++ b/circle/dashboard/static/dashboard/group-details.js
@@ -14,7 +14,7 @@
      data: {'new_name': name},
      headers: {"X-CSRFToken": getCookie('csrftoken')},
      success: function(data, textStatus, xhr) {
-        $("#group-details-h1-name").html(data['new_name']).show();
+        $("#group-details-h1-name").text(data['new_name']).show();
        $('#group-details-rename').hide();
        // addMessage(data['message'], "success");
      },

--- a/circle/dashboard/static/dashboard/group-list.js
+++ b/circle/dashboard/static/dashboard/group-list.js
@@ -3,6 +3,7 @@ $(function() {
  $("#group-list-rename-button, .group-details-rename-button").click(function() {
    $("#group-list-column-name", $(this).closest("tr")).hide();
    $("#group-list-rename", $(this).closest("tr")).css('display', 'inline');
+    $("#group-list-rename").find("input").select();
  });
  /* rename ajax */

--- a/circle/dashboard/static/dashboard/introjs/intro.min.js
+++ b/circle/dashboard/static/dashboard/introjs/intro.min.js
--- a/circle/dashboard/static/dashboard/introjs/introjs.min.css
+++ b/circle/dashboard/static/dashboard/introjs/introjs.min.css
+.introjs-overlay{position:absolute;z-index:999999;background-color:#000;opacity:0;background:-moz-radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);background:-webkit-gradient(radial,center center,0px,center center,100%,color-stop(0%,rgba(0,0,0,0.4)),color-stop(100%,rgba(0,0,0,0.9)));background:-webkit-radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);background:-o-radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);background:-ms-radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);background:radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#66000000',endColorstr='#e6000000',GradientType=1);-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out}.introjs-fixParent{z-index:auto !important;opacity:1.0 !important}.introjs-showElement,tr.introjs-showElement>td,tr.introjs-showElement>th{z-index:9999999 !important}.introjs-relativePosition,tr.introjs-showElement>td,tr.introjs-showElement>th{position:relative}.introjs-helperLayer{position:absolute;z-index:9999998;background-color:#FFF;background-color:rgba(255,255,255,.9);border:1px solid #777;border:1px solid rgba(0,0,0,.5);border-radius:4px;box-shadow:0 2px 15px rgba(0,0,0,.4);-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out}.introjs-helperNumberLayer{position:absolute;top:-16px;left:-16px;z-index:9999999999 !important;padding:2px;font-family:Arial,verdana,tahoma;font-size:13px;font-weight:bold;color:white;text-align:center;text-shadow:1px 1px 1px rgba(0,0,0,.3);background:#ff3019;background:-webkit-linear-gradient(top,#ff3019 0,#cf0404 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ff3019),color-stop(100%,#cf0404));background:-moz-linear-gradient(top,#ff3019 0,#cf0404 100%);background:-ms-linear-gradient(top,#ff3019 0,#cf0404 100%);background:-o-linear-gradient(top,#ff3019 0,#cf0404 100%);background:linear-gradient(to bottom,#ff3019 0,#cf0404 100%);width:20px;height:20px;line-height:20px;border:3px solid white;border-radius:50%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3019',endColorstr='#cf0404',GradientType=0);filter:progid:DXImageTransform.Microsoft.Shadow(direction=135,strength=2,color=ff0000);box-shadow:0 2px 5px rgba(0,0,0,.4)}.introjs-arrow{border:5px solid white;content:'';position:absolute}.introjs-arrow.top{top:-10px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:white;border-left-color:transparent}.introjs-arrow.top-right{top:-10px;right:10px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:white;border-left-color:transparent}.introjs-arrow.top-middle{top:-10px;left:50%;margin-left:-5px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:white;border-left-color:transparent}.introjs-arrow.right{right:-10px;top:10px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:transparent;border-left-color:white}.introjs-arrow.bottom{bottom:-10px;border-top-color:white;border-right-color:transparent;border-bottom-color:transparent;border-left-color:transparent}.introjs-arrow.left{left:-10px;top:10px;border-top-color:transparent;border-right-color:white;border-bottom-color:transparent;border-left-color:transparent}.introjs-tooltip{position:absolute;padding:10px;background-color:white;min-width:200px;max-width:300px;border-radius:3px;box-shadow:0 1px 10px rgba(0,0,0,.4);-webkit-transition:opacity .1s ease-out;-moz-transition:opacity .1s ease-out;-ms-transition:opacity .1s ease-out;-o-transition:opacity .1s ease-out;transition:opacity .1s ease-out}.introjs-tooltipbuttons{text-align:right}.introjs-button{position:relative;overflow:visible;display:inline-block;padding:.3em .8em;border:1px solid #d4d4d4;margin:0;text-decoration:none;text-shadow:1px 1px 0 #fff;font:11px/normal sans-serif;color:#333;white-space:nowrap;cursor:pointer;outline:0;background-color:#ececec;background-image:-webkit-gradient(linear,0 0,0 100%,from(#f4f4f4),to(#ececec));background-image:-moz-linear-gradient(#f4f4f4,#ececec);background-image:-o-linear-gradient(#f4f4f4,#ececec);background-image:linear-gradient(#f4f4f4,#ececec);-webkit-background-clip:padding;-moz-background-clip:padding;-o-background-clip:padding-box;-webkit-border-radius:.2em;-moz-border-radius:.2em;border-radius:.2em;zoom:1;*display:inline;margin-top:10px}.introjs-button:hover{border-color:#bcbcbc;text-decoration:none;box-shadow:0 1px 1px #e3e3e3}.introjs-button:focus,.introjs-button:active{background-image:-webkit-gradient(linear,0 0,0 100%,from(#ececec),to(#f4f4f4));background-image:-moz-linear-gradient(#ececec,#f4f4f4);background-image:-o-linear-gradient(#ececec,#f4f4f4);background-image:linear-gradient(#ececec,#f4f4f4)}.introjs-button::-moz-focus-inner{padding:0;border:0}.introjs-skipbutton{margin-right:5px;color:#7a7a7a}.introjs-prevbutton{-webkit-border-radius:.2em 0 0 .2em;-moz-border-radius:.2em 0 0 .2em;border-radius:.2em 0 0 .2em;border-right:0}.introjs-nextbutton{-webkit-border-radius:0 .2em .2em 0;-moz-border-radius:0 .2em .2em 0;border-radius:0 .2em .2em 0}.introjs-disabled,.introjs-disabled:hover,.introjs-disabled:focus{color:#9a9a9a;border-color:#d4d4d4;box-shadow:none;cursor:default;background-color:#f4f4f4;background-image:none;text-decoration:none}.introjs-bullets{text-align:center}.introjs-bullets ul{clear:both;margin:15px auto 0;padding:0;display:inline-block}.introjs-bullets ul li{list-style:none;float:left;margin:0 2px}.introjs-bullets ul li a{display:block;width:6px;height:6px;background:#ccc;border-radius:10px;-moz-border-radius:10px;-webkit-border-radius:10px;text-decoration:none}.introjs-bullets ul li a:hover{background:#999}.introjs-bullets ul li a.active{background:#999}.introjsFloatingElement{position:absolute;height:0;width:0;left:50%;top:50%}
+.introjs-helperLayer *,
+.introjs-helperLayer *:before,
+.introjs-helperLayer *:after {
+  -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+      -ms-box-sizing: content-box;
+      -o-box-sizing: content-box;
+          box-sizing: content-box;
+}
--- a/circle/dashboard/static/dashboard/node-details.js
+++ b/circle/dashboard/static/dashboard/node-details.js
@@ -15,7 +15,7 @@ $(function() {
      data: {'new_name': name},
      headers: {"X-CSRFToken": getCookie('csrftoken')},
      success: function(data, textStatus, xhr) {
- 	$("#node-details-h1-name").html(data['new_name']).show();
+        $("#node-details-h1-name").text(data['new_name']).show();
        $('#node-details-rename').hide();
        // addMessage(data['message'], "success");
      },

--- a/circle/dashboard/static/dashboard/node-list.js
+++ b/circle/dashboard/static/dashboard/node-list.js
@@ -12,40 +12,6 @@ $(function() {
 	tr.removeClass('danger');
  }
-  /* rename */
-  $("#node-list-rename-button, .node-details-rename-button").click(function() {
-    $("#node-list-column-name", $(this).closest("tr")).hide();
-    $("#node-list-rename", $(this).closest("tr")).css('display', 'inline');
-  });
-  /* rename ajax */
-  $('.node-list-rename-submit').click(function() {
-    var row = $(this).closest("tr")
-    var name = $('#node-list-rename-name', row).val();
-    var url = '/dashboard/node/' + 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) {
-        $("#node-list-column-name", row).html(
-          $("<a/>", {
-            'class': "real-link",
-            href: "/dashboard/node/" + data['node_pk'] + "/",
-            text: data['new_name']
-          })
-        ).show();
-        $('#node-list-rename', row).hide();
-        // addMessage(data['message'], "success");
-      },
-      error: function(xhr, textStatus, error) {
-	 addMessage("Error during renaming!", "danger");
-      }
-    });
-    return false;
-  });
  function statuschangeSuccess(tr){
   var tspan=tr.children('.enabled').children();

--- a/circle/dashboard/static/dashboard/template-list.js
+++ b/circle/dashboard/static/dashboard/template-list.js
@@ -2,7 +2,7 @@ $(function() {
  /* for template removes buttons */
  $('.template-delete').click(function() {
    var template_pk = $(this).data('template-pk');
-    addModalConfirmation(deleteTemplate,
+    addModalConfirmationOrDisplayMessage(deleteTemplate,
      { 'url': '/dashboard/template/delete/' + template_pk + '/',
        'data': [],
        'template_pk': template_pk,
@@ -13,7 +13,7 @@ $(function() {
  /* for lease removes buttons */
  $('.lease-delete').click(function() {
    var lease_pk = $(this).data('lease-pk');
-    addModalConfirmation(deleteLease,
+    addModalConfirmationOrDisplayMessage(deleteLease,
      { 'url': '/dashboard/lease/delete/' + lease_pk + '/',
        'data': [],
        'lease_pk': lease_pk,
@@ -81,3 +81,29 @@ function deleteLease(data) {
    }
  });
 }
+function addModalConfirmationOrDisplayMessage(func, data) {
+  $.ajax({
+    type: 'GET',
+    url: data['url'],
+    data: jQuery.param(data['data']),
+    success: function(result) {
+      $('body').append(result);
+      $('#confirmation-modal').modal('show');
+      $('#confirmation-modal').on('hidden.bs.modal', function() {
+        $('#confirmation-modal').remove();
+      });
+      $('#confirmation-modal-button').click(function() {
+        func(data);
+        $('#confirmation-modal').modal('hide');
+      });
+    },
+    error: function(xhr, textStatus, error) {
+      if(xhr.status === 403) {
+        addMessage(gettext("Only the owners can delete the selected object."), "warning");
+      } else {
+        addMessage(gettext("An error occurred. (") + xhr.status + ")", 'danger')
+      }
+    }
+  });
+}
--- a/circle/dashboard/static/dashboard/vm-common.js
+++ b/circle/dashboard/static/dashboard/vm-common.js
@@ -19,7 +19,7 @@ $(function() {
        $('#vm-migrate-node-list li input:checked').closest('li').addClass('panel-primary');
      }
    });
-    return false;
+    e.preventDefault();
  });
  /* if the operation fails show the modal again */

--- a/circle/dashboard/static/dashboard/vm-details.js
+++ b/circle/dashboard/static/dashboard/vm-details.js
@@ -28,7 +28,7 @@ $(function() {
  });
  /* save resources */
-  $('#vm-details-resources-save').click(function() {
+  $('#vm-details-resources-save').click(function(e) {
    var error = false;
    $(".cpu-count-input, .ram-input").each(function() {
      if(!$(this)[0].checkValidity()) {
@@ -61,7 +61,7 @@ $(function() {
        }  
      }
    });
-    return false;
+    e.preventDefault();
  });
  /* remove tag */
@@ -205,11 +205,11 @@ $(function() {
  });
  /* rename in home tab */
-  $(".vm-details-home-edit-name-click").click(function() {
+  $(".vm-details-home-edit-name-click").click(function(e) {
    $(".vm-details-home-edit-name-click").hide();
    $("#vm-details-home-rename").show();
    $("input", $("#vm-details-home-rename")).select();
-    return false;
+    e.preventDefault();
  });
  /* rename ajax */
@@ -236,7 +236,7 @@ $(function() {
  });
  /* update description click */
-  $(".vm-details-home-edit-description-click").click(function() {
+  $(".vm-details-home-edit-description-click").click(function(e) {
    $(".vm-details-home-edit-description-click").hide();
    $("#vm-details-home-description").show();
    var ta = $("#vm-details-home-description textarea");
@@ -244,7 +244,7 @@ $(function() {
    ta.val("");
    ta.focus();
    ta.val(tmp)
-    return false;
+    e.preventDefault();
  });
  /* description update ajax */
@@ -316,6 +316,24 @@ $(function() {
    if(Boolean($(this).data("disabled"))) return false;
  });
+  $("#dashboard-tutorial-toggle").click(function() {
+    var box = $("#alert-new-template");
+    var list = box.find("ol")
+    list.stop().slideToggle(function() {
+      var url = box.find("form").prop("action");
+      var hidden = list.css("display") === "none";
+      box.find("button i").prop("class", "fa fa-caret-" + (hidden ? "down" : "up"));
+      $.ajax({
+        type: 'POST',
+        url: url,
+        data: {'hidden': hidden},
+        headers: {"X-CSRFToken": getCookie('csrftoken')},
+        success: function(re, textStatus, xhr) {}
+      });
+    }); 
+    return false;
+  });
 });
@@ -344,10 +362,7 @@ function decideActivityRefresh() {
  /* if something is still spinning */
  if($('.timeline .activity i').hasClass('fa-spin'))
    check = true;
-  /* if there is only one activity */
-  if($('#activity-timeline div[class="activity"]').length < 2)
-    check = true;
  return check;
 }
@@ -377,6 +392,7 @@ function checkNewActivity(runs) {
      } else {
        icon.prop("class", "fa " + data['icon']);
      }
+      $("#vm-details-state").data("status", data['status']);
      $("#vm-details-state span").html(data['human_readable_status'].toUpperCase());
      if(data['status'] == "RUNNING") {
        if(data['connect_uri']) {

--- a/circle/dashboard/static/dashboard/vm-tour.js
+++ b/circle/dashboard/static/dashboard/vm-tour.js
--- a/circle/dashboard/tables.py
+++ b/circle/dashboard/tables.py
@@ -88,18 +88,21 @@ class GroupListTable(Table):
    number_of_users = TemplateColumn(
        orderable=False,
+        verbose_name=_("Number of users"),
        template_name='dashboard/group-list/column-users.html',
        attrs={'th': {'class': 'group-list-table-admin'}},
    )
    admin = TemplateColumn(
        orderable=False,
+        verbose_name=_("Admin"),
        template_name='dashboard/group-list/column-admin.html',
        attrs={'th': {'class': 'group-list-table-admin'}},
    )
    actions = TemplateColumn(
        orderable=False,
+        verbose_name=_("Actions"),
        attrs={'th': {'class': 'group-list-table-thin'}},
        template_code=('{% include "dashboard/group-list/column-'
                       'actions.html" with btn_size="btn-xs" %}'),

--- a/circle/dashboard/templates/dashboard/_disk-list-element.html
+++ b/circle/dashboard/templates/dashboard/_disk-list-element.html
@@ -8,7 +8,7 @@
  <span class="operation-wrapper">
    <a href="{{ op.remove_disk.get_url }}?disk={{d.pk}}"
      class="btn btn-xs btn-{{ op.remove_disk.effect}} pull-right operation disk-remove-btn
-      {% if op.resize_disk.disabled %}disabled{% endif %}">
+      {% if op.remove_disk.disabled %}disabled{% endif %}">
      <i class="fa fa-{{ op.remove_disk.icon }}"></i> {% trans "Remove" %}
    </a>
  </span>

--- a/circle/dashboard/templates/dashboard/_vm-remove-port.html
+++ b/circle/dashboard/templates/dashboard/_vm-remove-port.html
+{% extends "dashboard/operate.html" %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+{% block formfields %}
+  {% if form %}
+    {% crispy form %}
+  {% endif %}
+  {% if form.fields.rule.initial != None %}
+    {% with rule=form.fields.rule.initial %}
+      <dl>
+        <dt>{% trans "Port" %}:</dt>
+        <dd>{{ rule.dport }}/{{ rule.proto }}</dd>
+        <dt>{% trans "Host" %}:</dt>
+        <dd>{{ rule.host.hostname }}</dd>
+        <dt>{% trans "Vlan" %}:</dt>
+        <dd>{{ rule.host.vlan.name }}</dd>
+      </dl>
+    {% endwith %}
+  {% endif %}
+{% endblock %}
--- a/circle/dashboard/templates/dashboard/base.html
+++ b/circle/dashboard/templates/dashboard/base.html
@@ -6,7 +6,7 @@
 {% block extra_link %}
  <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/loopj-jquery-simple-slider/css/simple-slider.css"/>
-  <link href="{{ STATIC_URL }}dashboard/bootstrap-tour.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/introjs/introjs.min.css">
  <link href="{{ STATIC_URL }}dashboard/dashboard.css" rel="stylesheet">
 {% endblock %}

--- a/circle/dashboard/templates/dashboard/confirm/ajax-node-status.html
+++ b/circle/dashboard/templates/dashboard/confirm/ajax-node-status.html
@@ -15,11 +15,11 @@
          <form action="{% url "dashboard.views.status-node" pk=object.pk %}" method="POST">
            {% csrf_token %}
            <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
-	    <input type="hidden" name="change_status" value=""/>
+            <input type="hidden" name="change_status" value=""/>
            <button class="btn btn-warning">{% blocktrans with status=status %}Yes, {{status}}{% endblocktrans %}</button>
          </form>
        </div>
-	<div class="clearfix"></div>
+        <div class="clearfix"></div>
      </div>
    </div><!-- /.modal-content -->

--- a/circle/dashboard/templates/dashboard/confirm/ajax-remove.html
+++ b/circle/dashboard/templates/dashboard/confirm/ajax-remove.html
@@ -7,7 +7,7 @@
          {{ text }}
        {% else %}
          {%blocktrans with object=object%}
-	  Are you sure you want to remove <strong>{{ member }}</strong> from <strong>{{ object }}</strong>?
+            Are you sure you want to remove <strong>{{ member }}</strong> from <strong>{{ object }}</strong>?
          {%endblocktrans%}
        {% endif %}
        <br />

--- a/circle/dashboard/templates/dashboard/confirm/node-flush.html
+++ b/circle/dashboard/templates/dashboard/confirm/node-flush.html
@@ -23,9 +23,9 @@
        <div class="pull-right">
          <form action="" method="POST">
            {% csrf_token %}
-	    <a class="btn btn-default">{% trans "Back" %}</a>
+            <a class="btn btn-default">{% trans "Back" %}</a>
-	    <input type="hidden" name="flush" value=""/>
+            <input type="hidden" name="flush" value=""/>
-	    <button class="btn btn-warning">{% trans "Yes" %}</button>
+            <button class="btn btn-warning">{% trans "Yes" %}</button>
          </form>
        </div>
      </div>

--- a/circle/dashboard/templates/dashboard/confirm/node-status.html
+++ b/circle/dashboard/templates/dashboard/confirm/node-status.html
@@ -26,7 +26,7 @@
            {% csrf_token %}
            <a class="btn btn-default">{% trans "Cancel" %}</a>
            <button type="button" class="btn btn-default" data-dismiss="modal"></button>
-	    <input type="hidden" name="change_status" value=""/>
+            <input type="hidden" name="change_status" value=""/>
            <button class="btn btn-warning">{% blocktrans with status=status %}Yes, {{status}}{% endblocktrans %}</button>
          </form>
        </div>

--- a/circle/dashboard/templates/dashboard/confirm/base-transfer-ownership.html
+++ b/circle/dashboard/templates/dashboard/confirm/base-transfer-ownership.html
@@ -6,15 +6,15 @@
    <div class="panel panel-default">
      <div class="panel-heading">
        <h3 class="no-margin">
-            {% trans "Ownership transfer" %}
+          {% trans "Ownership transfer" %}
        </h3>
      </div>
      <div class="panel-body">
-          {% blocktrans with owner=instance.owner name=instance.name id=instance.id%}
+        {% blocktrans with owner=instance.owner name=instance.name id=instance.id%}
-          <strong>{{ owner }}</strong> offered to take the ownership of
+        <strong>{{ owner }}</strong> offered to take the ownership of
-          virtual machine <strong>{{name}} ({{id}})</strong>.
+        virtual machine <strong>{{name}} ({{id}})</strong>.
-          Do you accept the responsility of being the host's owner?
+        Do you accept the responsility of being the host's owner?
-          {% endblocktrans %}
+        {% endblocktrans %}
        <div class="pull-right">
          <form action="" method="POST">
            {% csrf_token %}

--- a/circle/dashboard/templates/dashboard/confirm/transfer-template-ownership.html
+++ b/circle/dashboard/templates/dashboard/confirm/transfer-template-ownership.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 "Ownership transfer" %}
+        </h3>
+      </div>
+      <div class="panel-body">
+        {% blocktrans with owner=instance.owner name=instance.name id=instance.id%}
+        <strong>{{ owner }}</strong> offered to take the ownership of
+        template <strong>{{name}} ({{id}})</strong>.
+        Do you accept the responsility of being the template's owner?
+        {% endblocktrans %}
+        <div class="pull-right">
+          <form action="" method="POST">
+            {% csrf_token %}
+            <a class="btn btn-default" href="{% url "dashboard.index" %}">{% trans "No" %}</a>
+            <input type="hidden" name="key" value="{{ key }}"/>
+            <button class="btn btn-danger" type="submit">{% trans "Yes" %}</button>
+          </form>
+        </div>
+      </div>
+  </div>
+{% endblock %}
--- a/circle/dashboard/templates/dashboard/group-detail.html
+++ b/circle/dashboard/templates/dashboard/group-detail.html
--- a/circle/dashboard/templates/dashboard/group-list.html
+++ b/circle/dashboard/templates/dashboard/group-list.html
@@ -10,10 +10,10 @@
  <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>
+        <h3 class="no-margin"><i class="fa fa-group"></i> {% trans "Groups" %}</h3>
      </div>
      <div class="panel-body">
-	<div id="table_container">
+        <div id="table_container">
          <div id="rendered_table" class="panel-body">
            {% render_table table %}
          </div>

--- a/circle/dashboard/templates/dashboard/index-groups.html
+++ b/circle/dashboard/templates/dashboard/index-groups.html
@@ -26,7 +26,7 @@
        <div class="col-sm-6 text-right">
          <a class="btn btn-primary btn-xs" href="{% url "dashboard.views.group-list" %}">
            <i class="fa fa-chevron-circle-right"></i>
-	    {% if more_groups > 0 %}
+            {% if more_groups > 0 %}
              {% blocktrans count more=more_groups %}
                <strong>{{ more }}</strong>  more
              {% plural %}

--- a/circle/dashboard/templates/dashboard/index-nodes.html
+++ b/circle/dashboard/templates/dashboard/index-nodes.html
@@ -74,9 +74,11 @@
              {% trans "list" %}
          {% endif %}
        </a>
+        {% if request.user.is_superuser %}
        <a class="btn btn-success btn-xs node-create" href="{% url "dashboard.views.node-create" %}">
          <i class="fa fa-plus-circle"></i> {% trans "new" %}
        </a>
+        {% endif  %}
      </div>
    </div>
  </div>

--- a/circle/dashboard/templates/dashboard/index.html
+++ b/circle/dashboard/templates/dashboard/index.html
@@ -35,7 +35,7 @@
    </div>
    {% endif %}
-    {% if user.is_superuser %}
+    {% if perms.vm.view_statistics %}
    <div class="col-lg-4 col-sm-6">
      {% include "dashboard/index-nodes.html" %}
    </div>

--- a/circle/dashboard/templates/dashboard/instanceactivity_detail.html
+++ b/circle/dashboard/templates/dashboard/instanceactivity_detail.html
@@ -50,7 +50,7 @@
            <dd>{{ object.task_uuid|default:'n/a' }}</dd>
            <dt>{% trans "status" %}</dt>
-            <dd>{{ object.get_status_id }}</dd>
+            <dd id="activity_status">{{ object.get_status_id }}</dd>
            <dt>{% trans "result" %}</dt>

--- a/circle/dashboard/templates/dashboard/node-add-trait.html
+++ b/circle/dashboard/templates/dashboard/node-add-trait.html
@@ -16,7 +16,7 @@
  <div class="col-md-12">
    <div class="panel panel-default">
      <div class="panel-heading">
-	      <h3 class="no-margin"><i class="fa fa-plus"></i> {% trans "Add Trait" %}</h3>
+        <h3 class="no-margin"><i class="fa fa-plus"></i> {% trans "Add Trait" %}</h3>
      </div>
      <div class="panel-body">
        {% with form=form %}

--- a/circle/dashboard/templates/dashboard/node-detail.html
+++ b/circle/dashboard/templates/dashboard/node-detail.html
@@ -6,14 +6,16 @@
 {% block content %}
 <div class="body-content">
  <div class="page-header">
+    {% if request.user.is_superuser %}
    <div class="pull-right" id="ops">
      {% include "dashboard/vm-detail/_operations.html" %}
    </div>
-     <div class="pull-right" style="padding-top: 15px;">
+    <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 "Rename" %}" href="#" class="btn btn-default btn-xs node-details-rename-button"><i class="fa fa-pencil"></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 "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>
    </div>
-   <h1>
+    {% endif  %}
+    <h1>
      <div id="node-details-rename">
       <form action="" method="POST" id="node-details-rename-form">
         {% csrf_token %}
@@ -69,26 +71,26 @@
              {% trans "Resources" %}
            </a>
          </li>
-	  <li>
+          <li>
            <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>
- 	  <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>
-	</ul>
+        </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="resources">{% include "dashboard/node-detail/resources.html" %}</div>
          <div class="tab-pane" id="activity">{% include "dashboard/node-detail/activity.html" %}</div>
-  	</div>
+        </div>
      </div>
    </div>
  </div>

--- a/circle/dashboard/templates/dashboard/node-detail/home.html
+++ b/circle/dashboard/templates/dashboard/node-detail/home.html
@@ -8,24 +8,27 @@
          {% for t in node.traits.all %}
            <div class="label label-success label-tag" style="display: inline-block">
              {{ t }}
-	      <a data-trait-pk="{{ t.pk }}" href="#" class="node-details-remove-trait"><i class="fa fa-times"></i></a>
+              <a data-trait-pk="{{ t.pk }}" href="#" class="node-details-remove-trait"><i class="fa fa-times"></i></a>
            </div>
          {% endfor %}
        {% else %}
-	<small>{% trans "No trait added!" %}</small>
+          <small>{% trans "No trait added!" %}</small>
        {% endif %}
      </div>
 {% load crispy_forms_tags %}
 <style>
  .row {
    margin-bottom: 15px;
  }
 </style>
-  <form action="{% url "dashboard.views.node-addtrait" node.pk %}" method="POST">
+  {% if request.user.is_superuser %}
-  {% csrf_token %}
+    <form action="{% url "dashboard.views.node-addtrait" node.pk %}" method="POST">
-  {% crispy trait_form %}
+    {% csrf_token %}
-  </form>
+    {% crispy trait_form %}
+    </form>
+  {% endif %}
    </div><!-- id:node-details-traits -->
  </div>
  <div class="col-md-8">

--- a/circle/dashboard/templates/dashboard/node-detail/resources.html
+++ b/circle/dashboard/templates/dashboard/node-detail/resources.html
@@ -10,6 +10,16 @@
    <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 "Driver Version:" %}</dt>
+    <dd>
+      {% if node.driver_version %}
+        {{ node.driver_version.branch }} at
+        {{ node.driver_version.commit }} ({{ node.driver_version.commit_text }})
+        {% if node.driver_version.is_dirty %}
+          <span class="label label-danger">{% trans "with uncommitted changes!" %}</span>
+        {% endif %}
+      {% endif %}
+    </dd>
    <dt>{% trans "Host owner" %}:</dt>
    <dd>
      {% include "dashboard/_display-name.html" with user=node.host.owner show_org=True %}
@@ -18,10 +28,12 @@
    <dt>{% trans "Host name" %}:</dt>
    <dd>
      {{ node.host.hostname }}
+      {% if request.user.is_superuser %}
      <a href="{{ node.host.get_absolute_url }}" class="btn btn-default btn-xs">
        <i class="fa fa-pencil"></i>
        {% trans "Edit host" %}
      </a>
+      {% endif  %}
    </dd>
    </dl>

--- a/circle/dashboard/templates/dashboard/store/_list-box.html
+++ b/circle/dashboard/templates/dashboard/store/_list-box.html
@@ -4,23 +4,23 @@
  <div class="list-group-item">
    <div class="row">
      <div class="col-sm-6">
-        <a href="{% url "dashboard.views.store-upload"%}?directory={{ current }}"
+        <a href="{% url "dashboard.views.store-upload"%}?directory={{ current|urlencode }}"
          class="btn btn-info btn-xs js-hidden">
          {% trans "Upload" %}
        </a>
-        <form action="" data-action="{% url "dashboard.views.store-upload-url" %}" 
+        <form action="" data-action="{% url "dashboard.views.store-upload-url" %}"
          method="POST" enctype="multipart/form-data" class="no-js-hidden"
          id="store-upload-form">
          {% csrf_token %}
-          <input type="hidden" name="current_dir" value="{{ current }}"/>
+          <input type="hidden" name="current_dir" value="{{ current|urlencode }}"/>
          <input type="hidden" name="next" value="{{ next_url }}"/>
          <div class="input-group" style="max-width: 350px;">
            <span class="input-group-btn" id="store-upload-browse">
              <span class="btn btn-primary btn-xs">
                {% trans "Browse..." %}
-              </span>     
+              </span>
            </span>
-            <input type="text" class="form-control input-tags" 
+            <input type="text" class="form-control input-tags"
             id="store-upload-filename"/>
            <span class="input-group-btn">
              <button type="submit" class="btn btn-primary btn-xs" disabled>
@@ -33,13 +33,13 @@
      </div><!-- .col-sm-6 upload -->
      <div class="col-sm-6">
-        <a href="{% url "dashboard.views.store-remove" %}?path={{ current }}" 
+        <a href="{% url "dashboard.views.store-remove" %}?path={{ current|urlencode }}"
-          class="btn btn-danger btn-xs pull-right store-action-button" 
+          class="btn btn-danger btn-xs pull-right store-action-button"
          title="{% trans "Remove directory" %}">
          <i class="fa fa-times"></i>
        </a>
-        <a href="{% url "dashboard.views.store-download" %}?path={{ current }}" 
+        <a href="{% url "dashboard.views.store-download" %}?path={{ current|urlencode }}"
-          class="btn btn-primary btn-xs pull-right store-action-button" 
+          class="btn btn-primary btn-xs pull-right store-action-button"
          title="{% trans "Download directory" %}">
          <i class="fa fa-cloud-download"></i>
        </a>
@@ -51,7 +51,7 @@
            <span class="input-group-addon input-tags" title="{% trans "New directory" %}">
              <i class="fa fa-folder-open"></i>
            </span>
-            <input type="text" class="form-control input-tags" name="name" 
+            <input type="text" class="form-control input-tags" name="name"
             placeholder="{% trans "Name "%}" required/>
            <span class="input-group-btn">
              <input type="submit" class="btn btn-success btn-xs" value="{% trans "Create" %}"/>
@@ -64,7 +64,7 @@
 </div><!-- .list-group -->
 <div class="list-group" id="store-list-list">
-  <a href="{% url "dashboard.views.store-list" %}?directory={{ up_url }}" 
+  <a href="{% url "dashboard.views.store-list" %}?directory={{ up_url|urlencode }}"
    class="list-group-item store-list-item" data-item-type="D">
    {% if current == "/" %}
      <div class="store-list-item-icon">
@@ -85,8 +85,8 @@
  {% for f in root %}
  <a class="list-group-item store-list-item" data-item-type="{{ f.TYPE }}"
-    href="{% if f.TYPE == "D" %}{% url "dashboard.views.store-list" %}?directory={{ f.path }}{% else %}
+    href="{% if f.TYPE == "D" %}{% url "dashboard.views.store-list" %}?directory={{ f.path|urlencode }}{% else %}
-    {% url "dashboard.views.store-download" %}?path={{ f.path }}{% endif %}"
+    {% url "dashboard.views.store-download" %}?path={{ f.path|urlencode }}{% endif %}"
    >
    <div class="store-list-item-icon">
      <i class="
@@ -101,7 +101,7 @@
        <span class="badge badge-pulse">{% trans "new" %}</span>
      {% endif %}
    </div>
    <div class="store-list-item-size">
      {{ f.human_readable_size }}
    </div>
@@ -122,12 +122,12 @@
        </dl>
      </div>
      <div class="col-sm-2" style="text-align: right;">
-        <a href="{% url "dashboard.views.store-download" %}?path={{ f.path }}" 
+        <a href="{% url "dashboard.views.store-download" %}?path={{ f.path|urlencode }}"
          class="btn btn-primary btn-sm store-download-button">
          <i class="fa fa-download"></i>
          {% trans "Download" %}
        </a>
-        <a href="{% url "dashboard.views.store-remove" %}?path={{ f.path }}" 
+        <a href="{% url "dashboard.views.store-remove" %}?path={{ f.path|urlencode }}"
          class="btn btn-danger btn-xs store-remove-button">
          <i class="fa fa-times"></i>
          {% trans "Remove" %}

--- a/circle/dashboard/templates/dashboard/template-edit.html
+++ b/circle/dashboard/templates/dashboard/template-edit.html
@@ -11,7 +11,9 @@
  <div class="col-md-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>
+        <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-puzzle-piece"></i> {% trans "Edit template" %}</h3>
      </div>
      <div class="panel-body">
@@ -65,6 +67,38 @@
  </div>
  <div class="col-md-5">
+    {% if is_owner %}
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <a href="{% url "dashboard.views.template-delete" pk=object.pk %}" 
+         class="btn btn-xs btn-danger pull-right">
+          {% trans "Delete" %}
+        </a>
+        <h4 class="no-margin"><i class="fa fa-times"></i> {% trans "Delete template"  %}</h4>
+      </div>
+    </div>
+    {% endif %}
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="no-margin"><i class="fa fa-user"></i> {% trans "Owner"  %}</h4>
+      </div>
+      <div class="panel-body">
+        {% if user == object.owner %}
+        {% blocktrans %}You are the current owner of this template.{% endblocktrans %}
+        {% else %}
+        {% url "dashboard.views.profile" username=object.owner.username as url %}
+        {% blocktrans with owner=object.owner name=object.owner.get_full_name%}
+          The current owner of this template is <a href="{{url}}">{{name}} ({{owner}})</a>.
+        {% endblocktrans %}
+        {% endif %}
+        {% if user == object.owner or user.is_superuser %}
+        <a href="{% url "dashboard.views.template-transfer-ownership" object.pk %}"
+           class="btn btn-link tx-tpl-ownership">{% trans "Transfer ownership..." %}</a>
+        {% endif %}
+      </div>
+    </div>
    <div class="panel panel-default">
      <div class="panel-heading">
        <h4 class="no-margin"><i class="fa fa-group"></i> {% trans "Manage access"  %}</h4>

--- a/circle/dashboard/templates/dashboard/template-tx-owner.html
+++ b/circle/dashboard/templates/dashboard/template-tx-owner.html
+{% load i18n %}
+<div class="pull-right">
+  <form action="{% url "dashboard.views.template-transfer-ownership" pk=object.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>
+  </form>
+</div>
--- a/circle/dashboard/templates/dashboard/vm-detail.html
+++ b/circle/dashboard/templates/dashboard/vm-detail.html
@@ -6,14 +6,25 @@
 {% block content %}
 {% if instance.is_base %}
-<div class="alert alert-info alert-new-template">
+<div class="alert alert-info alert-new-template" id="alert-new-template" style="position: relative;">
-  <strong>{% trans "This is the master vm of your new template" %}</strong>
+  <form action="{% url "dashboard.views.vm-toggle-tutorial" pk=instance.pk %}"
-  <div id="vm-details-template-tour-button" class="pull-right">
+    method="POST">
-    <a href="#" class="btn btn-default btn-lg pull-right vm-details-start-template-tour">
+    {% csrf_token %}
+    <input name="hidden" type="hidden"
+     value="{{ hide_tutorial|yesno:"false,true" }}"/>
+    <button type="submit"
+      id="dashboard-tutorial-toggle" class="btn btn-sm pull-right btn-success">
+      <i class="fa fa-caret-{% if hide_tutorial %}down{% else %}up{% endif %}"></i>
+      {% trans "Toggle tutorial panel" %}
+    </button>
+    <a href="#" class="btn btn-default btn-sm pull-right"
+      id="vm-details-start-template-tour">
      <i class="fa fa-play"></i> {% trans "Start template tutorial" %}
    </a>
-  </div>
+  </form>
-  <ol>
+  <strong>{% trans "This is the master vm of your new template" %}</strong>
+  <ol {% if hide_tutorial %}style="display: none;"{% endif %}>
    <li>{% trans "Modify the virtual machine to suit your needs <strong>(optional)</strong>" %}
      <ul>
        <li>{% trans "Change the description" %}</li>
@@ -59,13 +70,20 @@
        {{ instance.name }}
      </div>
      <small>{{ instance.primary_host.get_fqdn }}</small>
+      <small class="dashboard-vm-favourite" style="line-height: 39.6px;" data-vm="{{ instance.pk }}">
+        {% if fav %}
+          <i class="fa fa-star text-primary title-favourite" title="{% trans "Unfavourite" %}"></i>
+        {% else %}
+          <i class="fa fa-star-o text-primary title-favourite" title="{% trans "Mark as favorite" %}"></i>
+        {% endif %}
+      </small>
    </h1>
    <div style="clear: both;"></div>
  </div>
  <div class="row">
    <div class="col-md-4" id="vm-info-pane">
      <div class="big">
-        <span id="vm-details-state" class="label label-success">
+        <span id="vm-details-state" class="label label-success" data-status="{{ instance.status }}">
          <i class="fa
            {% if is_new_state %}
            fa-spinner fa-spin
@@ -110,7 +128,14 @@
        <dd style="font-size: 10px; text-align: right; padding-top: 8px;">
          <div id="vm-details-pw-reset">
          {% with op=op.password_reset %}{% if op %}
-          <a href="{% if op.disabled %}#{% else %}{{op.get_url}}{% endif %}" class="operation operation-{{op.op}}" data-disabled="{% if op.disabled %}true" title="{% trans "Start the VM to change the password." %}"{% else %}false" {% endif %}>{% trans "Generate new password!" %}</a>
+          <a href="{% if op.disabled %}#{% else %}{{op.get_url}}{% endif %}"
+            class="operation operation-{{op.op}}"
+            {% if op.disabled %}
+            data-disabled="true"
+            title="{% if instance.has_agent %}{% trans "Start the VM to change the password." %}{% else %}{% trans "This machine has no agent installed." %}{% endif %}"
+            {% endif %}>
+            {% trans "Generate new password!" %}
+          </a>
          {% endif %}{% endwith %}
          </div>
        </dd>
@@ -138,7 +163,7 @@
      </div>
      {% endfor %}
      {% if instance.get_connect_uri %}
-      <div id="dashboard-vm-details-connect" class="operation-wrapper">  
+      <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" %}
@@ -202,7 +227,7 @@
 {% endblock %}
 {% block extra_js %}
-  <script src="{{ STATIC_URL }}dashboard/bootstrap-tour.min.js"></script>
+  <script src="{{ STATIC_URL }}dashboard/introjs/intro.min.js"></script>
  <script src="{{ STATIC_URL }}dashboard/vm-details.js"></script>
  <script src="{{ STATIC_URL }}dashboard/vm-common.js"></script>
  <script src="{{ STATIC_URL }}dashboard/vm-console.js"></script>

--- a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
+++ b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
@@ -3,7 +3,8 @@
 <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 }}">
+<div class="activity{% if a.pk == active.pk %} activity-active{%endif%}"
+  data-activity-id="{{ a.pk }}" data-activity-code="{{ a.activity_code }}">
  <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-{{a.icon}}{% endif %}"></i>
 </span>
@@ -33,7 +34,8 @@
  {% 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 s.pk == active.pk %} sub-activity-active{% endif %}">
+      <div data-activity-id="{{ s.pk }}" data-activity-code="{{ s.activity_code }}"
+        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_text:user }}"{% endif %}>
          <a href="{{ s.get_absolute_url }}">
              {{ s.readable_name|get_text:user|capfirst }}</a></span> &ndash;

--- a/circle/dashboard/templates/dashboard/vm-detail/_network-port-add.html
+++ b/circle/dashboard/templates/dashboard/vm-detail/_network-port-add.html
 {% load i18n %}
 <div class="vm-details-network-port-add pull-right">
-  <form action="" method="POST">
+  <form action="{{ op.add_port.get_url }}" method="POST">
    {% csrf_token %}
-    <input type="hidden" name="host_pk" value="{{ i.host.pk }}"/>
+    <input type="hidden" name="host" value="{{ i.host.pk }}"/>
    <div class="input-group input-group-sm">
      <span class="input-group-addon">
        <i class="fa fa-plus"></i> <i class="fa fa-long-arrow-right"></i>
      </span>
-      <input type="text" class="form-control" size="5" style="width: 80px;" name="port"/>
+      <input type="number" class="form-control" size="5" min="1" max="65535"
+             style="width: 80px;" name="port" required/>
      <span class="input-group-addon">/</span>
      <select class="form-control" name="proto" style="width: 70px;"><option>tcp</option><option>udp</option></select>
      <div class="input-group-btn">

--- a/circle/dashboard/templates/dashboard/vm-detail/access.html
+++ b/circle/dashboard/templates/dashboard/vm-detail/access.html
@@ -4,8 +4,9 @@
  {% if user == instance.owner %}
  {% blocktrans %}You are the current owner of this instance.{% endblocktrans %}
  {% else %}
-  {% blocktrans with owner=instance.owner %}
+  {% url "dashboard.views.profile" username=instance.owner.username as url %}
-    The current owner of this instance is {{owner}}.
+  {% blocktrans with owner=instance.owner name=instance.owner.get_full_name%}
+    The current owner of this instance is <a href="{{url}}">{{name}} ({{owner}})</a>.
  {% endblocktrans %}
  {% endif %}
  {% if user == instance.owner or user.is_superuser %}

--- a/circle/dashboard/templates/dashboard/vm-detail/home.html
+++ b/circle/dashboard/templates/dashboard/vm-detail/home.html
 {% load i18n %}
 <div class="row">
  <div class="col-md-4">
-    <dl>
+    <dl id="home_name_and_description">
      <dt>{% trans "System" %}:</dt>
      <dd><i class="fa fa-{{ os_type_icon }}"></i> {{ instance.system }}</dd>
      <dt style="margin-top: 5px;">
@@ -52,30 +52,34 @@
      </dd>
    </dl>
-    <h4>{% trans "Expiration" %} {% if instance.is_expiring %}<i class="fa fa-warning-sign text-danger"></i>{% endif %}
+    <div id="home_expiration_and_lease">
-      <span id="vm-details-renew-op">
+      <h4>
-        {% with op=op.renew %}{% if op %}
+        {% trans "Expiration" %}
-          <a href="{{op.get_url}}" class="btn btn-success btn-xs
+        {% if instance.is_expiring %}<i class="fa fa-warning-sign text-danger"></i>{% endif %}
-                  operation operation-{{op.op}}">
+        <span id="vm-details-renew-op">
-            <i class="fa fa-{{op.icon}}"></i>
+          {% with op=op.renew %}{% if op %}
-                  {{op.name}} </a>
+            <a href="{{op.get_url}}" class="btn btn-success btn-xs
-        {% endif %}{% endwith %}
+                    operation operation-{{op.op}}">
-      </span>
+              <i class="fa fa-{{op.icon}}"></i>
-    </h4>
+                    {{op.name}} </a>
-    <dl>
+          {% endif %}{% endwith %}
-      <dt>{% trans "Suspended at:" %}</dt>
-      <dd>
-        <span title="{{ instance.time_of_suspend }}">
-          <i class="fa fa-moon-o"></i> {{ instance.time_of_suspend|timeuntil }}
        </span>
-      </dd>
+      </h4>
-      <dt>{% trans "Destroyed at:" %}</dt>
+      <dl>
-      <dd>
+        <dt>{% trans "Suspended at:" %}</dt>
-        <span title="{{ instance.time_of_delete }}">
+        <dd>
-          <i class="fa fa-times"></i> {{ instance.time_of_delete|timeuntil }}
+          <span title="{{ instance.time_of_suspend }}">
-        </span>
+            <i class="fa fa-moon-o"></i> {{ instance.time_of_suspend|timeuntil }}
-      </dd>
+          </span>
-    </dl>
+        </dd>
+        <dt>{% trans "Destroyed at:" %}</dt>
+        <dd>
+          <span title="{{ instance.time_of_delete }}">
+            <i class="fa fa-times"></i> {{ instance.time_of_delete|timeuntil }}
+          </span>
+        </dd>
+      </dl>
+    </div>
    <div style="font-weight: bold;">{% trans "Tags" %}</div>
    <div id="vm-details-tags" style="margin-bottom: 20px;">

--- a/circle/dashboard/templates/dashboard/vm-detail/network.html
+++ b/circle/dashboard/templates/dashboard/vm-detail/network.html
@@ -78,7 +78,7 @@
                        {{ l.private }}/{{ l.proto }}
                      </td>
                      <td>
-                        <a href="{% url "dashboard.views.remove-port" pk=instance.pk rule=l.ipv4.pk %}" class="btn btn-link btn-xs vm-details-remove-port" data-rule="{{ l.ipv4.pk }}" title="{% trans "Remove" %}"><i class="fa fa-times"><span class="sr-only">{% trans "Remove" %}</span></i></a>
+                        <a href="{{ op.remove_port.get_url }}?rule={{ l.ipv4.pk }}" class="btn btn-link btn-xs vm-details-remove-port" data-rule="{{ l.ipv4.pk }}" title="{% trans "Remove" %}"><i class="fa fa-times"><span class="sr-only">{% trans "Remove" %}</span></i></a>
                      </td>
                    </tr>
                  {% endif %}
@@ -110,7 +110,7 @@
                        {{ l.private }}/{{ l.proto }}
                      </td>
                      <td>
-                        <a href="{% url "dashboard.views.remove-port" pk=instance.pk rule=l.ipv4.pk %}" class="btn btn-link btn-xs vm-details-remove-port" data-rule="{{ l.ipv6.pk }}" title="{% trans "Remove" %}"><i class="fa fa-times"><span class="sr-only">{% trans "Remove" %}</span></i></a>
+                        <a href="{{ op.remove_port.get_url }}?rule={{ l.ipv4.pk }}" class="btn btn-link btn-xs vm-details-remove-port" data-rule="{{ l.ipv6.pk }}" title="{% trans "Remove" %}"><i class="fa fa-times"><span class="sr-only">{% trans "Remove" %}</span></i></a>
                      </td>
                    </tr>
                  {% endif %}

--- a/circle/dashboard/templates/dashboard/vm-detail/resources.html
+++ b/circle/dashboard/templates/dashboard/vm-detail/resources.html
@@ -18,34 +18,28 @@
 {% endif %}
 </form>
 <hr />
+<div id="vm-details-resources-disk">
-<div class="row" id="vm-details-resources-disk">
+  <h3>
-  <div class="col-sm-11">
+    {% trans "Disks" %}
-    <h3>
+    <div class="pull-right">
-      {% trans "Disks" %}
+      <div id="disk-ops">
-      <div class="pull-right">
+        {% include "dashboard/vm-detail/_disk-operations.html" %}
-        <div id="disk-ops">
-          {% include "dashboard/vm-detail/_disk-operations.html" %}
-        </div>
      </div>
-    </h3>
+    </div>
+  </h3>
-    <div class="row" id="vm-details-disk-add-for-form"></div>
+  {% if not instance.disks.all %}
-    {% if not instance.disks.all %}
+    {% trans "No disks are added." %}
-      {% trans "No disks are added!" %}
+  {% endif %}
-    {% endif %}
+  {% for d in instance.disks.all %}
-    {% for d in instance.disks.all %}
+    <h4 class="list-group-item-heading dashboard-vm-details-network-h3">
-      <h4 class="list-group-item-heading dashboard-vm-details-network-h3">
+      {% with long_remove=True %}
-        {% with long_remove=True %}
+        {% include "dashboard/_disk-list-element.html" %}
-          {% include "dashboard/_disk-list-element.html" %}
+      {% endwith %}
-        {% endwith %}
+    </h4>
-      </h4>
+  {% endfor %}
-    {% endfor %}
-  </div>
 </div>
 {% if user.is_superuser %}

--- a/circle/dashboard/tests/test_templates.py
+++ b/circle/dashboard/tests/test_templates.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 os import listdir
+from os.path import isfile, isdir, join
+import unittest
+from django.conf import settings
+from django.template import Template, Context, VariableDoesNotExist
+from django.template.loader import find_template_loader
+from django.core.urlresolvers import NoReverseMatch
+class TemplateSyntaxTestCase(unittest.TestCase):
+    def test_templates(self):
+        """Test all templates for syntax errors."""
+        for loader_name in settings.TEMPLATE_LOADERS:
+            print loader_name
+            loader = find_template_loader(loader_name)
+            self._test_dir(loader.get_template_sources(''))
+    def _test_dir(self, dir, path="/"):
+        for i in dir:
+            i = join(path, i)
+            if isfile(i):
+                self._test_template(join(path, i))
+            elif isdir(i):
+                print "%s:" % i
+                self._test_dir(listdir(i), i)
+    def _test_template(self, path):
+        print path
+        try:
+            Template(open(path).read()).render(Context({}))
+        except (NoReverseMatch, VariableDoesNotExist, KeyError, AttributeError,
+                ValueError, ) as e:
+            print e
--- a/circle/dashboard/tests/test_views.py
+++ b/circle/dashboard/tests/test_views.py
@@ -26,7 +26,8 @@ from django.contrib.auth import authenticate
 from dashboard.views import VmAddInterfaceView
 from vm.models import Instance, InstanceTemplate, Lease, Node, Trait
-from vm.operations import WakeUpOperation, AddInterfaceOperation
+from vm.operations import (WakeUpOperation, AddInterfaceOperation,
+                           AddPortOperation)
 from ..models import Profile
 from firewall.models import Vlan, Host, VlanGroup
 from mock import Mock, patch
@@ -299,7 +300,7 @@ class VmDetailTest(LoginMixin, TestCase):
        leases = Lease.objects.count()
        response = c.post("/dashboard/lease/delete/1/")
        # redirect to the login page
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 403)
        self.assertEqual(leases, Lease.objects.count())
    def test_notification_read(self):
@@ -335,51 +336,48 @@ class VmDetailTest(LoginMixin, TestCase):
        self.login(c, "user2")
        inst = Instance.objects.get(pk=1)
        inst.set_level(self.u2, 'owner')
-        response = c.post("/dashboard/vm/1/", {'port': True,
+        vlan = Vlan.objects.get(id=1)
-                                               'proto': 'tcp',
+        vlan.set_level(self.u2, 'user')
-                                               'port': '1337'})
+        inst.add_interface(user=self.u2, vlan=vlan)
+        host = Host.objects.get(
+            interface__in=inst.interface_set.all())
+        with patch.object(AddPortOperation, 'async') as mock_method:
+            mock_method.side_effect = inst.add_port
+            response = c.post("/dashboard/vm/1/op/add_port/", {
+                'proto': 'tcp', 'host': host.pk, 'port': '1337'})
        self.assertEqual(response.status_code, 403)
    def test_unpermitted_add_port_wo_obj_levels(self):
        c = Client()
        self.login(c, "user2")
-        self.u2.user_permissions.add(Permission.objects.get(
-            name='Can configure port forwards.'))
-        response = c.post("/dashboard/vm/1/", {'port': True,
-                                               'proto': 'tcp',
-                                               'port': '1337'})
-        self.assertEqual(response.status_code, 403)
-    def test_unpermitted_add_port_w_bad_host(self):
-        c = Client()
-        self.login(c, "user2")
        inst = Instance.objects.get(pk=1)
-        inst.set_level(self.u2, 'owner')
+        vlan = Vlan.objects.get(id=1)
+        vlan.set_level(self.u2, 'user')
+        inst.add_interface(user=self.u2, vlan=vlan, system=True)
+        host = Host.objects.get(
+            interface__in=inst.interface_set.all())
        self.u2.user_permissions.add(Permission.objects.get(
            name='Can configure port forwards.'))
-        response = c.post("/dashboard/vm/1/", {'proto': 'tcp',
+        with patch.object(AddPortOperation, 'async') as mock_method:
-                                               'host_pk': '9999',
+            mock_method.side_effect = inst.add_port
-                                               'port': '1337'})
+            response = c.post("/dashboard/vm/1/op/add_port/", {
+                'proto': 'tcp', 'host': host.pk, 'port': '1337'})
+            assert not mock_method.called
        self.assertEqual(response.status_code, 403)
-    def test_permitted_add_port_w_unhandled_exception(self):
+    def test_unpermitted_add_port_w_bad_host(self):
        c = Client()
        self.login(c, "user2")
        inst = Instance.objects.get(pk=1)
        inst.set_level(self.u2, 'owner')
-        vlan = Vlan.objects.get(id=1)
-        vlan.set_level(self.u2, 'user')
-        inst.add_interface(user=self.u2, vlan=vlan)
-        host = Host.objects.get(
-            interface__in=inst.interface_set.all())
        self.u2.user_permissions.add(Permission.objects.get(
            name='Can configure port forwards.'))
-        port_count = len(host.list_ports())
+        with patch.object(AddPortOperation, 'async') as mock_method:
-        response = c.post("/dashboard/vm/1/", {'proto': 'tcp',
+            mock_method.side_effect = inst.add_port
-                                               'host_pk': host.pk,
+            response = c.post("/dashboard/vm/1/op/add_port/", {
-                                               'port': 'invalid_port'})
+                'proto': 'tcp', 'host': '9999', 'port': '1337'})
-        self.assertEqual(response.status_code, 302)
+            assert not mock_method.called
-        self.assertEqual(len(host.list_ports()), port_count)
+        self.assertEqual(response.status_code, 200)
    def test_permitted_add_port(self):
        c = Client()
@@ -394,9 +392,11 @@ class VmDetailTest(LoginMixin, TestCase):
        self.u2.user_permissions.add(Permission.objects.get(
            name='Can configure port forwards.'))
        port_count = len(host.list_ports())
-        response = c.post("/dashboard/vm/1/", {'proto': 'tcp',
+        with patch.object(AddPortOperation, 'async') as mock_method:
-                                               'host_pk': host.pk,
+            mock_method.side_effect = inst.add_port
-                                               'port': '1337'})
+            response = c.post("/dashboard/vm/1/op/add_port/", {
+                'proto': 'tcp', 'host': host.pk, 'port': '1337'})
+            assert mock_method.called
        self.assertEqual(response.status_code, 302)
        self.assertEqual(len(host.list_ports()), port_count + 1)
@@ -637,7 +637,7 @@ class NodeDetailTest(LoginMixin, TestCase):
        c = Client()
        self.login(c, 'user1')
        response = c.get('/dashboard/node/25555/')
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 403)
    def test_anon_node_page(self):
        c = Client()
@@ -667,7 +667,7 @@ class NodeDetailTest(LoginMixin, TestCase):
        node = Node.objects.get(pk=1)
        old_name = node.name
        response = c.post("/dashboard/node/1/", {'new_name': 'test1235'})
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 403)
        self.assertEqual(Node.objects.get(pk=1).name, old_name)
    def test_permitted_set_name(self):
@@ -721,7 +721,7 @@ class NodeDetailTest(LoginMixin, TestCase):
        c = Client()
        self.login(c, "user2")
        response = c.post("/dashboard/node/1/", {'to_remove': traitid})
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 403)
        self.assertEqual(Node.objects.get(pk=1).traits.count(), trait_count)
    def test_permitted_remove_trait(self):

--- a/circle/dashboard/urls.py
+++ b/circle/dashboard/urls.py
@@ -26,9 +26,9 @@ from .views import (
    InstanceActivityDetail, LeaseCreate, LeaseDelete, LeaseDetail,
    MyPreferencesView, NodeAddTraitView, NodeCreate, NodeDelete,
    NodeDetailView, NodeList, NodeStatus,
-    NotificationView, PortDelete, TemplateAclUpdateView, TemplateCreate,
+    NotificationView, TemplateAclUpdateView, TemplateCreate,
-    TemplateDelete, TemplateDetail, TemplateList, TransferOwnershipConfirmView,
+    TemplateDelete, TemplateDetail, TemplateList,
-    TransferOwnershipView, vm_activity, VmCreate, VmDetailView,
+    vm_activity, VmCreate, VmDetailView,
    VmDetailVncTokenView, VmList,
    DiskRemoveView, get_disk_download_status, InterfaceDeleteView,
    GroupRemoveUserView,
@@ -45,8 +45,11 @@ from .views import (
    VmTraitsUpdate, VmRawDataUpdate,
    GroupPermissionsView,
    LeaseAclUpdateView,
+    toggle_template_tutorial,
    ClientCheck, TokenLogin,
    VmGraphView, NodeGraphView, NodeListGraphView,
+    TransferInstanceOwnershipView, TransferInstanceOwnershipConfirmView,
+    TransferTemplateOwnershipView, TransferTemplateOwnershipConfirmView,
 )
 from .views.vm import vm_ops, vm_mass_ops
 from .views.node import node_ops
@@ -77,15 +80,15 @@ 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+)/remove_port/(?P<rule>\d+)/$', PortDelete.as_view(),
+    url(r'^template/(?P<pk>\d+)/tx/$', TransferTemplateOwnershipView.as_view(),
-        name='dashboard.views.remove-port'),
+        name='dashboard.views.template-transfer-ownership'),
    url(r'^vm/(?P<pk>\d+)/$', VmDetailView.as_view(),
        name='dashboard.views.detail'),
    url(r'^vm/(?P<pk>\d+)/vnctoken/$', VmDetailVncTokenView.as_view(),
        name='dashboard.views.detail-vnc'),
    url(r'^vm/(?P<pk>\d+)/acl/$', AclUpdateView.as_view(model=Instance),
        name='dashboard.views.vm-acl'),
-    url(r'^vm/(?P<pk>\d+)/tx/$', TransferOwnershipView.as_view(),
+    url(r'^vm/(?P<pk>\d+)/tx/$', TransferInstanceOwnershipView.as_view(),
        name='dashboard.views.vm-transfer-ownership'),
    url(r'^vm/list/$', VmList.as_view(), name='dashboard.views.vm-list'),
    url(r'^vm/create/$', VmCreate.as_view(),
@@ -99,14 +102,20 @@ urlpatterns = patterns(
        name='dashboard.views.vm-traits'),
    url(r'^vm/(?P<pk>\d+)/raw_data/$', VmRawDataUpdate.as_view(),
        name='dashboard.views.vm-raw-data'),
+    url(r'^vm/(?P<pk>\d+)/toggle_tutorial/$', toggle_template_tutorial,
+        name='dashboard.views.vm-toggle-tutorial'),
    url(r'^node/list/$', NodeList.as_view(), name='dashboard.views.node-list'),
    url(r'^node/(?P<pk>\d+)/$', NodeDetailView.as_view(),
        name='dashboard.views.node-detail'),
    url(r'^node/(?P<pk>\d+)/add-trait/$', NodeAddTraitView.as_view(),
        name='dashboard.views.node-addtrait'),
-    url(r'^tx/(?P<key>.*)/?$', TransferOwnershipConfirmView.as_view(),
+    url(r'^vm/tx/(?P<key>.*)/?$',
+        TransferInstanceOwnershipConfirmView.as_view(),
        name='dashboard.views.vm-transfer-ownership-confirm'),
+    url(r'^template/tx/(?P<key>.*)/?$',
+        TransferTemplateOwnershipConfirmView.as_view(),
+        name='dashboard.views.template-transfer-ownership-confirm'),
    url(r'^node/delete/(?P<pk>\d+)/$', NodeDelete.as_view(),
        name="dashboard.views.delete-node"),
    url(r'^node/status/(?P<pk>\d+)/$', NodeStatus.as_view(),

--- a/circle/dashboard/views/graph.py
+++ b/circle/dashboard/views/graph.py
@@ -26,7 +26,7 @@ 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 braces.views import LoginRequiredMixin
 from vm.models import Instance, Node
@@ -142,22 +142,28 @@ class VmGraphView(GraphViewBase):
    base = VmMetric
-class NodeGraphView(SuperuserRequiredMixin, GraphViewBase):
+class NodeGraphView(GraphViewBase):
    model = Node
    base = NodeMetric
    def get_object(self, request, pk):
+        if not self.request.user.has_perm('vm.view_statistics'):
+            raise PermissionDenied()
        return self.model.objects.get(id=pk)
-class NodeListGraphView(SuperuserRequiredMixin, GraphViewBase):
+class NodeListGraphView(GraphViewBase):
    model = Node
    base = Metric
    def get_object(self, request, pk):
+        if not self.request.user.has_perm('vm.view_statistics'):
+            raise PermissionDenied()
        return Node.objects.filter(enabled=True)
    def get(self, request, metric, time, *args, **kwargs):
+        if not self.request.user.has_perm('vm.view_statistics'):
+            raise PermissionDenied()
        return super(NodeListGraphView, self).get(request, None, metric, time)

--- a/circle/dashboard/views/index.py
+++ b/circle/dashboard/views/index.py
@@ -62,7 +62,7 @@ class IndexView(LoginRequiredMixin, TemplateView):
        })
        # nodes
-        if user.is_superuser:
+        if user.has_perm('vm.view_statistics'):
            nodes = Node.objects.all()
            context.update({
                'nodes': nodes[:5],

--- a/circle/dashboard/views/node.py
+++ b/circle/dashboard/views/node.py
@@ -75,13 +75,18 @@ node_ops = OrderedDict([
 ])
-class NodeDetailView(LoginRequiredMixin, SuperuserRequiredMixin,
+class NodeDetailView(LoginRequiredMixin,
                     GraphMixin, DetailView):
    template_name = "dashboard/node-detail.html"
    model = Node
    form = None
    form_class = TraitForm
+    def get(self, *args, **kwargs):
+        if not self.request.user.has_perm('vm.view_statistics'):
+            raise PermissionDenied()
+        return super(NodeDetailView, self).get(*args, **kwargs)
    def get_context_data(self, form=None, **kwargs):
        if form is None:
            form = self.form_class()
@@ -98,6 +103,8 @@ class NodeDetailView(LoginRequiredMixin, SuperuserRequiredMixin,
        return context
    def post(self, request, *args, **kwargs):
+        if not request.user.is_superuser:
+            raise PermissionDenied()
        if request.POST.get('new_name'):
            return self.__set_name(request)
        if request.POST.get('to_remove'):
@@ -145,13 +152,14 @@ class NodeDetailView(LoginRequiredMixin, SuperuserRequiredMixin,
            return redirect(self.object.get_absolute_url())
-class NodeList(LoginRequiredMixin, SuperuserRequiredMixin,
+class NodeList(LoginRequiredMixin, GraphMixin, SingleTableView):
-               GraphMixin, SingleTableView):
    template_name = "dashboard/node-list.html"
    table_class = NodeListTable
    table_pagination = False
    def get(self, *args, **kwargs):
+        if not self.request.user.has_perm('vm.view_statistics'):
+            raise PermissionDenied()
        if self.request.is_ajax():
            nodes = Node.objects.all()
            nodes = [{

--- a/circle/dashboard/views/store.py
+++ b/circle/dashboard/views/store.py
@@ -23,6 +23,7 @@ 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.template.defaultfilters import urlencode
 from django.core.cache import get_cache
 from django.core.exceptions import SuspiciousOperation
 from django.core.urlresolvers import reverse
@@ -55,7 +56,7 @@ class StoreList(LoginRequiredMixin, TemplateView):
        context['current'] = directory
        context['next_url'] = "%s%s?directory=%s" % (
            settings.DJANGO_URL.rstrip("/"),
-            reverse("dashboard.views.store-list"), directory)
+            reverse("dashboard.views.store-list"), urlencode(directory))
        return context
    def get(self, *args, **kwargs):
@@ -112,7 +113,7 @@ def store_upload(request):
    next_url = "%s%s?directory=%s" % (
        settings.DJANGO_URL.rstrip("/"),
-        reverse("dashboard.views.store-list"), directory)
+        reverse("dashboard.views.store-list"), urlencode(directory))
    return render(request, "dashboard/store/upload.html",
                  {'directory': directory, 'action': action,
@@ -168,7 +169,7 @@ class StoreRemove(LoginRequiredMixin, TemplateView):
        return redirect("%s?directory=%s" % (
            reverse("dashboard.views.store-list"),
-            dirname(dirname(path)),
+            urlencode(dirname(dirname(path))),
        ))
@@ -185,7 +186,7 @@ def store_new_directory(request):
                         name, path, unicode(request.user))
        messages.error(request, _("Unable to create folder."))
    return redirect("%s?directory=%s" % (
-        reverse("dashboard.views.store-list"), path))
+        reverse("dashboard.views.store-list"), urlencode(path)))
 @require_POST

--- a/circle/dashboard/views/template.py
+++ b/circle/dashboard/views/template.py
@@ -26,13 +26,13 @@ from django.core.urlresolvers import reverse, reverse_lazy
 from django.core.exceptions import PermissionDenied, SuspiciousOperation
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect, get_object_or_404
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext as _, ugettext_noop
 from django.views.generic import (
    TemplateView, CreateView, DeleteView, UpdateView,
 )
 from braces.views import (
-    LoginRequiredMixin, PermissionRequiredMixin, SuperuserRequiredMixin,
+    LoginRequiredMixin, PermissionRequiredMixin,
 )
 from django_tables2 import SingleTableView
@@ -44,7 +44,10 @@ from ..forms import (
 )
 from ..tables import TemplateListTable, LeaseListTable
-from .util import AclUpdateView, FilterMixin
+from .util import (
+    AclUpdateView, FilterMixin,
+    TransferOwnershipConfirmView, TransferOwnershipView,
+)
 logger = logging.getLogger(__name__)
@@ -240,6 +243,16 @@ class TemplateDelete(LoginRequiredMixin, DeleteView):
        else:
            return ['dashboard/confirm/base-delete.html']
+    def get(self, request, *args, **kwargs):
+        if not self.get_object().has_level(request.user, "owner"):
+            message = _("Only the owners can delete the selected template.")
+            if request.is_ajax():
+                raise PermissionDenied()
+            else:
+                messages.warning(request, message)
+                return redirect(self.get_success_url())
+        return super(TemplateDelete, self).get(request, *args, **kwargs)
    def delete(self, request, *args, **kwargs):
        object = self.get_object()
        if not object.has_level(request.user, 'owner'):
@@ -382,13 +395,17 @@ class LeaseCreate(LoginRequiredMixin, PermissionRequiredMixin,
    def get_success_url(self):
        return reverse_lazy("dashboard.views.template-list")
+    def form_valid(self, form):
+        retval = super(LeaseCreate, self).form_valid(form)
+        self.object.set_level(self.request.user, "owner")
+        return retval
 class LeaseAclUpdateView(AclUpdateView):
    model = Lease
-class LeaseDetail(LoginRequiredMixin, SuperuserRequiredMixin,
+class LeaseDetail(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
-                  SuccessMessageMixin, UpdateView):
    model = Lease
    form_class = LeaseForm
    template_name = "dashboard/lease-edit.html"
@@ -404,8 +421,21 @@ class LeaseDetail(LoginRequiredMixin, SuperuserRequiredMixin,
    def get_success_url(self):
        return reverse_lazy("dashboard.views.lease-detail", kwargs=self.kwargs)
+    def get(self, request, *args, **kwargs):
+        if not self.get_object().has_level(request.user, "owner"):
+            message = _("Only the owners can modify the selected lease.")
+            messages.warning(request, message)
+            return redirect(reverse_lazy("dashboard.views.template-list"))
+        return super(LeaseDetail, self).get(request, *args, **kwargs)
+    def post(self, request, *args, **kwargs):
+        if not self.get_object().has_level(request.user, "owner"):
+            raise PermissionDenied()
+        return super(LeaseDetail, self).post(request, *args, **kwargs)
-class LeaseDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
+class LeaseDelete(LoginRequiredMixin, DeleteView):
    model = Lease
    def get_success_url(self):
@@ -431,10 +461,22 @@ class LeaseDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
            c['disable_submit'] = True
        return c
+    def get(self, request, *args, **kwargs):
+        if not self.get_object().has_level(request.user, "owner"):
+            message = _("Only the owners can delete the selected lease.")
+            if request.is_ajax():
+                raise PermissionDenied()
+            else:
+                messages.warning(request, message)
+                return redirect(self.get_success_url())
+        return super(LeaseDelete, self).get(request, *args, **kwargs)
    def delete(self, request, *args, **kwargs):
        object = self.get_object()
-        if (object.instancetemplate_set.count() > 0):
+        if not object.has_level(request.user, "owner"):
+            raise PermissionDenied()
+        if object.instancetemplate_set.count() > 0:
            raise SuspiciousOperation()
        object.delete()
@@ -449,3 +491,20 @@ class LeaseDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
        else:
            messages.success(request, success_message)
            return HttpResponseRedirect(success_url)
+class TransferTemplateOwnershipConfirmView(TransferOwnershipConfirmView):
+    template = "dashboard/confirm/transfer-template-ownership.html"
+    model = InstanceTemplate
+class TransferTemplateOwnershipView(TransferOwnershipView):
+    confirm_view = TransferTemplateOwnershipConfirmView
+    model = InstanceTemplate
+    notification_msg = ugettext_noop(
+        '%(user)s offered you to take the ownership of '
+        'his/her template called %(instance)s. '
+        '<a href="%(token)s" '
+        'class="btn btn-success btn-small">Accept</a>')
+    token_url = 'dashboard.views.template-transfer-ownership-confirm'
+    template = "dashboard/template-tx-owner.html"
--- a/circle/dashboard/views/util.py
+++ b/circle/dashboard/views/util.py
@@ -24,14 +24,15 @@ from urlparse import urljoin
 from django.conf import settings
 from django.contrib.auth.models import User, Group
-from django.core.exceptions import PermissionDenied
+from django.core import signing
+from django.core.exceptions import PermissionDenied, SuspiciousOperation
 from django.core.urlresolvers import reverse
 from django.contrib import messages
 from django.contrib.auth.views import redirect_to_login
 from django.db.models import Q
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, Http404, HttpResponseRedirect
-from django.shortcuts import redirect
+from django.shortcuts import redirect, render
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ugettext_noop
 from django.views.generic import DetailView, View
 from django.views.generic.detail import SingleObjectMixin
@@ -40,7 +41,8 @@ from braces.views._access import AccessMixin
 from celery.exceptions import TimeoutError
 from common.models import HumanReadableException, HumanReadableObject
-from ..models import GroupProfile
+from ..models import GroupProfile, Profile
+from ..forms import TransferOwnershipForm
 logger = logging.getLogger(__name__)
 saml_available = hasattr(settings, "SAML_CONFIG")
@@ -563,3 +565,132 @@ class GraphMixin(object):
 def absolute_url(url):
    return urljoin(settings.DJANGO_URL, url)
+class TransferOwnershipView(CheckedDetailView, DetailView):
+    def get_template_names(self):
+        if self.request.is_ajax():
+            return ['dashboard/_modal.html']
+        else:
+            return ['dashboard/nojs-wrapper.html']
+    def get_context_data(self, *args, **kwargs):
+        context = super(TransferOwnershipView, self).get_context_data(
+            *args, **kwargs)
+        context['form'] = TransferOwnershipForm()
+        context.update({
+            'box_title': _("Transfer ownership"),
+            'ajax_title': True,
+            'template': self.template,
+        })
+        return context
+    def post(self, request, *args, **kwargs):
+        form = TransferOwnershipForm(request.POST)
+        if not form.is_valid():
+            return self.get(request)
+        try:
+            new_owner = search_user(request.POST['name'])
+        except User.DoesNotExist:
+            messages.error(request, _('Can not find specified user.'))
+            return self.get(request, *args, **kwargs)
+        except KeyError:
+            raise SuspiciousOperation()
+        obj = self.get_object()
+        if not (obj.owner == request.user or
+                request.user.is_superuser):
+            raise PermissionDenied()
+        token = signing.dumps(
+            (obj.pk, new_owner.pk),
+            salt=self.confirm_view.get_salt())
+        token_path = reverse(self.token_url, args=[token])
+        try:
+            new_owner.profile.notify(
+                ugettext_noop('Ownership offer'),
+                self.notification_msg,
+                {'instance': obj, 'token': token_path})
+        except Profile.DoesNotExist:
+            messages.error(request, _('Can not notify selected user.'))
+        else:
+            messages.success(request,
+                             _('User %s is notified about the offer.') % (
+                                 unicode(new_owner), ))
+        return redirect(obj.get_absolute_url())
+class TransferOwnershipConfirmView(LoginRequiredMixin, View):
+    """User can accept an ownership offer."""
+    max_age = 3 * 24 * 3600
+    success_message = _("Ownership successfully transferred to you.")
+    @classmethod
+    def get_salt(cls):
+        return unicode(cls) + unicode(cls.model)
+    def get(self, request, key, *args, **kwargs):
+        """Confirm ownership transfer based on token.
+        """
+        logger.debug('Confirm dialog for token %s.', key)
+        try:
+            instance, new_owner = self.get_instance(key, request.user)
+        except PermissionDenied:
+            messages.error(request, _('This token is for an other user.'))
+            raise
+        except SuspiciousOperation:
+            messages.error(request, _('This token is invalid or has expired.'))
+            raise PermissionDenied()
+        return render(request, self.template,
+                      dictionary={'instance': instance, 'key': key})
+    def change_owner(self, instance, new_owner):
+        instance.owner = new_owner
+        instance.clean()
+        instance.save()
+    def post(self, request, key, *args, **kwargs):
+        """Really transfer ownership based on token.
+        """
+        instance, owner = self.get_instance(key, request.user)
+        old = instance.owner
+        self.change_owner(instance, request.user)
+        messages.success(request, self.success_message)
+        logger.info('Ownership of %s transferred from %s to %s.',
+                    unicode(instance), unicode(old), unicode(request.user))
+        if old.profile:
+            old.profile.notify(
+                ugettext_noop('Ownership accepted'),
+                ugettext_noop('Your ownership offer of %(instance)s has been '
+                              'accepted by %(user)s.'),
+                {'instance': instance})
+        return redirect(instance.get_absolute_url())
+    def get_instance(self, key, user):
+        """Get object based on signed token.
+        """
+        try:
+            instance, new_owner = (
+                signing.loads(key, max_age=self.max_age,
+                              salt=self.get_salt()))
+        except (signing.BadSignature, ValueError, TypeError) as e:
+            logger.error('Tried invalid token. Token: %s, user: %s. %s',
+                         key, unicode(user), unicode(e))
+            raise SuspiciousOperation()
+        try:
+            instance = self.model.objects.get(id=instance)
+        except self.model.DoesNotExist as e:
+            logger.error('Tried token to nonexistent instance %d. '
+                         'Token: %s, user: %s. %s',
+                         instance, key, unicode(user), unicode(e))
+            raise Http404()
+        if new_owner != user.pk:
+            logger.error('%s (%d) tried the token for %s. Token: %s.',
+                         unicode(user), user.pk, new_owner, key)
+            raise PermissionDenied()
+        return (instance, new_owner)
--- a/circle/dashboard/views/vm.py
+++ b/circle/dashboard/views/vm.py
--- a/circle/fabfile.py
+++ b/circle/fabfile.py
@@ -84,6 +84,10 @@ def make_messages():
 def test(test=""):
    "Run portal tests"
    with _workon("circle"), cd("~/circle/circle"):
+        if test == "f":
+            test = "--failed"
+        else:
+            test += " --with-id"
        run("./manage.py test --settings=circle.settings.test %s" % test)
@@ -99,10 +103,12 @@ def pull(dir="~/circle/circle"):
 @roles('portal')
-def update_portal(test=False):
+def update_portal(test=False, git=True):
    "Update and restart portal+manager"
    with _stopped("portal", "manager"):
-        pull()
+        if git:
+            pull()
+        cleanup()
        pip("circle", "~/circle/requirements.txt")
        migrate()
        compile_things()
@@ -111,6 +117,12 @@ def update_portal(test=False):
 @roles('portal')
+def build_portal():
+    "Update portal without pulling from git"
+    return update_portal(False, False)
+@roles('portal')
 def stop_portal(test=False):
    "Stop portal and manager"
    _stop_services("portal", "manager")
@@ -122,10 +134,15 @@ def update_node():
    with _stopped("node", "agentdriver", "monitor-client"):
        pull("~/vmdriver")
        pip("vmdriver", "~/vmdriver/requirements/production.txt")
+        _cleanup("~/vmdriver")
        pull("~/agentdriver")
        pip("agentdriver", "~/agentdriver/requirements.txt")
+        _cleanup("~/agentdriver")
        pull("~/monitor-client")
        pip("monitor-client", "~/monitor-client/requirements.txt")
+        _cleanup("~/monitor-client")
 @parallel
@@ -147,6 +164,18 @@ def checkout(vmdriver="master", agent="master"):
        run("git checkout %s" % agent)
+@roles('portal')
+def cleanup():
+    "Clean pyc files of portal"
+    _cleanup()
+def _cleanup(dir="~/circle/circle"):
+    "Clean pyc files"
+    with cd("~/circle/circle"):
+        run("find -name '*.py[co]' -exec rm -f {} +")
 def _stop_services(*services):
    "Stop given services (warn only if not running)"
    with settings(warn_only=True):
@@ -175,3 +204,12 @@ def _stopped(*services):
 def _workon(name):
    return prefix("source ~/.virtualenvs/%s/bin/activate && "
                  "source ~/.virtualenvs/%s/bin/postactivate" % (name, name))
+@roles('portal')
+def install_bash_completion_script():
+    sudo("wget https://raw.githubusercontent.com/marcelor/fabric-bash-"
+         "autocompletion/48baf5735bafbb2be5be8787d2c2c04a44b6cdb0/fab "
+         "-O /etc/bash_completion.d/fab")
+    print("To have bash completion instantly, run\n"
+          "  source /etc/bash_completion.d/fab")
--- a/circle/firewall/fields.py
+++ b/circle/firewall/fields.py
@@ -34,6 +34,10 @@ reverse_domain_re = re.compile(r'^(%\([abcd]\)d|[a-z0-9.-])+$')
 ipv6_template_re = re.compile(r'^(%\([abcd]\)[dxX]|[A-Za-z0-9:-])+$')
+class mac_custom(mac_unix):
+    word_fmt = '%.2X'
 class MACAddressFormField(forms.Field):
    default_error_messages = {
        'invalid': _(u'Enter a valid MAC address. %s'),
@@ -51,9 +55,6 @@ class MACAddressField(models.Field):
    description = _('MAC Address object')
    __metaclass__ = models.SubfieldBase
-    class mac_custom(mac_unix):
-        word_fmt = '%.2X'
    def __init__(self, *args, **kwargs):
        kwargs['max_length'] = 17
        super(MACAddressField, self).__init__(*args, **kwargs)
@@ -65,7 +66,7 @@ class MACAddressField(models.Field):
        if isinstance(value, EUI):
            return value
-        return EUI(value, dialect=MACAddressField.mac_custom)
+        return EUI(value, dialect=mac_custom)
    def get_internal_type(self):
        return 'CharField'

--- a/circle/firewall/models.py
+++ b/circle/firewall/models.py
@@ -243,6 +243,13 @@ class Rule(models.Model):
        return retval
+    @classmethod
+    def portforwards(cls, host=None):
+        qs = cls.objects.filter(dport__isnull=False, direction='in')
+        if host is not None:
+            qs = qs.filter(host=host)
+        return qs
    class Meta:
        verbose_name = _("rule")
        verbose_name_plural = _("rules")
@@ -762,7 +769,7 @@ class Host(models.Model):
        Return a list of ports with forwarding rules set.
        """
        retval = []
-        for rule in self.rules.filter(dport__isnull=False, direction='in'):
+        for rule in Rule.portforwards(host=self):
            forward = {
                'proto': rule.proto,
                'private': rule.dport,

--- a/circle/locale/hu/LC_MESSAGES/django.po
+++ b/circle/locale/hu/LC_MESSAGES/django.po
--- a/circle/locale/hu/LC_MESSAGES/djangojs.po
+++ b/circle/locale/hu/LC_MESSAGES/djangojs.po
--- a/circle/network/views.py
+++ b/circle/network/views.py
@@ -655,12 +655,7 @@ class VlanDetail(LoginRequiredMixin, SuperuserRequiredMixin,
    def get_context_data(self, **kwargs):
        context = super(VlanDetail, self).get_context_data(**kwargs)
+        context['host_list'] = SmallHostTable(self.object.host_set.all())
-        q = Host.objects.filter(interface__in=Interface.objects.filter(
-            vlan=self.object
-        ))
-        context['host_list'] = SmallHostTable(q)
        context['vlan_vid'] = self.kwargs.get('vid')
        context['acl'] = AclUpdateView.get_acl_data(
            self.object, self.request.user, 'network.vlan-acl')

--- a/circle/storage/models.py
+++ b/circle/storage/models.py
@@ -416,6 +416,7 @@ class Disk(TimeStampedModel):
                        "Operation aborted by user."), e)
        disk.size = result['size']
        disk.type = result['type']
+        disk.checksum = result.get('checksum', None)
        disk.is_ready = True
        disk.save()
        return disk

--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
@@ -817,8 +817,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
        return acts
    def get_merged_activities(self, user=None):
-        whitelist = ("create_disk", "download_disk", "attach_disk",
+        whitelist = ("create_disk", "download_disk",
-                     "detach_disk", )
+                     "add_port", "remove_port",
+                     "attach_disk", "detach_disk", )
        acts = self.get_activities(user)
        merged_acts = []
        latest = None

--- a/circle/vm/models/node.py
+++ b/circle/vm/models/node.py
@@ -88,7 +88,9 @@ class Node(OperatedMixin, TimeStampedModel):
    class Meta:
        app_label = 'vm'
        db_table = 'vm_node'
-        permissions = ()
+        permissions = (
+            ('view_statistics', _('Can view Node box and statistics.')),
+        )
        ordering = ('-enabled', 'normalized_name')
    def __unicode__(self):
@@ -288,6 +290,11 @@ class Node(OperatedMixin, TimeStampedModel):
    @property
    @node_available
+    def driver_version(self):
+        return self.info.get('driver_version')
+    @property
+    @node_available
    def cpu_usage(self):
        return self.monitor_info.get('cpu.percent') / 100

--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
--- a/circle/vm/tasks/local_agent_tasks.py
+++ b/circle/vm/tasks/local_agent_tasks.py
@@ -15,226 +15,26 @@
 # You should have received a copy of the GNU General Public License along
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
-from common.models import create_readable
-from manager.mancelery import celery
-from vm.tasks.agent_tasks import (restart_networking, change_password,
-                                  set_time, set_hostname, start_access_server,
-                                  cleanup, update, append,
-                                  change_ip, update_legacy)
-from firewall.models import Host
-import time
-import os
-from base64 import encodestring
-from hashlib import md5
-from StringIO import StringIO
-from tarfile import TarFile, TarInfo
-from django.conf import settings
-from django.db.models import Q
-from django.utils import timezone
 from django.utils.translation import ugettext_noop
-from celery.result import TimeoutError
-from monitor.client import Client
-def send_init_commands(instance, act):
-    vm = instance.vm_name
-    queue = instance.get_remote_queue_name("agent")
-    with act.sub_activity('cleanup', readable_name=ugettext_noop('cleanup')):
-        cleanup.apply_async(queue=queue, args=(vm, ))
-    with act.sub_activity('change_password',
-                          readable_name=ugettext_noop('change password')):
-        change_password.apply_async(queue=queue, args=(vm, instance.pw))
-    with act.sub_activity('set_time', readable_name=ugettext_noop('set time')):
-        set_time.apply_async(queue=queue, args=(vm, time.time()))
-    with act.sub_activity('set_hostname',
-                          readable_name=ugettext_noop('set hostname')):
-        set_hostname.apply_async(
-            queue=queue, args=(vm, instance.short_hostname))
-def send_networking_commands(instance, act):
-    queue = instance.get_remote_queue_name("agent")
-    with act.sub_activity('change_ip',
-                          readable_name=ugettext_noop('change ip')):
-        change_ip.apply_async(queue=queue, args=(
-            instance.vm_name, ) + get_network_configs(instance))
-    with act.sub_activity('restart_networking',
-                          readable_name=ugettext_noop('restart networking')):
-        restart_networking.apply_async(queue=queue, args=(instance.vm_name, ))
-def create_linux_tar():
-    def exclude(tarinfo):
-        ignored = ('./.', './misc', './windows')
-        if any(tarinfo.name.startswith(x) for x in ignored):
-            return None
-        else:
-            return tarinfo
-    f = StringIO()
-    with TarFile.open(fileobj=f, mode='w:gz') as tar:
+from manager.mancelery import celery
-        agent_path = os.path.join(settings.AGENT_DIR, "agent-linux")
-        tar.add(agent_path, arcname='.', filter=exclude)
-        version_fileobj = StringIO(settings.AGENT_VERSION)
-        version_info = TarInfo(name='version.txt')
-        version_info.size = len(version_fileobj.buf)
-        tar.addfile(version_info, version_fileobj)
-    return encodestring(f.getvalue()).replace('\n', '')
-def create_windows_tar():
-    f = StringIO()
-    agent_path = os.path.join(settings.AGENT_DIR, "agent-win")
-    with TarFile.open(fileobj=f, mode='w|gz') as tar:
-        tar.add(agent_path, arcname='.')
-        version_fileobj = StringIO(settings.AGENT_VERSION)
-        version_info = TarInfo(name='version.txt')
-        version_info.size = len(version_fileobj.buf)
-        tar.addfile(version_info, version_fileobj)
-    return encodestring(f.getvalue()).replace('\n', '')
 @celery.task
 def agent_started(vm, version=None, system=None):
-    from vm.models import Instance, InstanceActivity
+    from vm.models import Instance
    instance = Instance.objects.get(id=int(vm.split('-')[-1]))
-    queue = instance.get_remote_queue_name("agent")
+    instance.agent_started(
-    initialized = instance.activity_log.filter(
+        user=instance.owner, old_version=version, agent_system=system)
-        activity_code='vm.Instance.agent.cleanup').exists()
-    with instance.activity(code_suffix='agent',
-                           readable_name=ugettext_noop('agent'),
-                           concurrency_check=False) as act:
-        with act.sub_activity('starting',
-                              readable_name=ugettext_noop('starting')):
-            pass
-        for i in InstanceActivity.objects.filter(
-                (Q(activity_code__endswith='.os_boot') |
-                 Q(activity_code__endswith='.agent_wait')),
-                instance=instance, finished__isnull=True):
-            i.finish(True)
-        if version and version != settings.AGENT_VERSION:
-            try:
-                update_agent(instance, act, system, settings.AGENT_VERSION)
-            except TimeoutError:
-                pass
-            else:
-                act.sub_activity('agent_wait', readable_name=ugettext_noop(
-                    "wait agent restarting"), interruptible=True)
-                return  # agent is going to restart
-        if not initialized:
-            measure_boot_time(instance)
-            send_init_commands(instance, act)
-        send_networking_commands(instance, act)
-        with act.sub_activity('start_access_server',
-                              readable_name=ugettext_noop(
-                                  'start access server')):
-            start_access_server.apply_async(queue=queue, args=(vm, ))
-def measure_boot_time(instance):
-    if not instance.template:
-        return
-    from vm.models import InstanceActivity
-    deploy_time = InstanceActivity.objects.filter(
-        instance=instance, activity_code="vm.Instance.deploy"
-    ).latest("finished").finished
-    total_boot_time = (timezone.now() - deploy_time).total_seconds()
-    Client().send([
-        "template.%(pk)d.boot_time %(val)f %(time)s" % {
-            'pk': instance.template.pk,
-            'val': total_boot_time,
-            'time': time.time(),
-        }
-    ])
 @celery.task
 def agent_stopped(vm):
    from vm.models import Instance, InstanceActivity
-    from vm.models.activity import ActivityInProgressError
    instance = Instance.objects.get(id=int(vm.split('-')[-1]))
-    qs = InstanceActivity.objects.filter(instance=instance,
+    qs = InstanceActivity.objects.filter(
-                                         activity_code='vm.Instance.agent')
+        instance=instance, activity_code='vm.Instance.agent')
    act = qs.latest('id')
-    try:
+    with act.sub_activity('stopping', concurrency_check=False,
-        with act.sub_activity('stopping',
+                          readable_name=ugettext_noop('stopping')):
-                              readable_name=ugettext_noop('stopping')):
-            pass
-    except ActivityInProgressError:
        pass
-def get_network_configs(instance):
-    interfaces = {}
-    for host in Host.objects.filter(interface__instance=instance):
-        interfaces[str(host.mac)] = host.get_network_config()
-    return (interfaces, settings.FIREWALL_SETTINGS['rdns_ip'])
-def update_agent(instance, act=None, system=None, version=None):
-    if act:
-        act = act.sub_activity(
-            'update',
-            readable_name=create_readable(
-                ugettext_noop('update to %(version)s'),
-                version=settings.AGENT_VERSION))
-    else:
-        act = instance.activity(
-            code_suffix='agent.update',
-            readable_name=create_readable(
-                ugettext_noop('update agent to %(version)s'),
-                version=settings.AGENT_VERSION))
-    with act:
-        queue = instance.get_remote_queue_name("agent")
-        if system == "Windows":
-            executable = os.listdir(os.path.join(settings.AGENT_DIR,
-                                                 "agent-win"))[0]
-            # executable = "agent-winservice-%(version)s.exe" % {
-            #   'version': version}
-            data = create_windows_tar()
-        elif system == "Linux":
-            executable = ""
-            data = create_linux_tar()
-        else:
-            executable = ""
-            # Legacy update method
-            return update_legacy.apply_async(
-                queue=queue,
-                args=(instance.vm_name, create_linux_tar())
-            ).get(timeout=60)
-        checksum = md5(data).hexdigest()
-        chunk_size = 1024 * 1024
-        chunk_number = 0
-        index = 0
-        filename = version + ".tar"
-        while True:
-            chunk = data[index:index+chunk_size]
-            if chunk:
-                append.apply_async(
-                    queue=queue,
-                    args=(instance.vm_name, chunk,
-                          filename, chunk_number)).get(timeout=60)
-                index = index + chunk_size
-                chunk_number = chunk_number + 1
-            else:
-                update.apply_async(
-                    queue=queue,
-                    args=(instance.vm_name, filename, executable, checksum)
-                ).get(timeout=60)
-                break
--- a/requirements/local.txt
+++ b/requirements/local.txt
@@ -2,4 +2,5 @@
 -r base.txt
 coverage==3.7.1
 django-debug-toolbar==1.1
+django-rosetta==0.7.4
 Sphinx==1.2.2