Merge branch 'ci-integration' into 'master'

permissions cloud-init

See merge request !13

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

@@ -2,10 +2,10 @@
 {% load sizefieldtags %}
 {% load sizefieldtags %}
 {% load crispy_forms_tags %}
 {% load crispy_forms_tags %}
 {% load static %}
 {% load static %}
-
-{% if instance.cloud_init %}
-{% include "dashboard/_ci-data-help.html" %}
-<div class="row">
+{% if is_operator %}
+  {% if instance.cloud_init %}
+    {% include "dashboard/_ci-data-help.html" %}
+    <div class="row">
       <div class="col-sm-12">
       <div class="col-sm-12">
         <h3>
         <h3>
           {% trans "Cloud-init" %}
           {% trans "Cloud-init" %}
@@ -23,10 +23,17 @@
             id="vm-details-cidata-save" data-vm="{{ instance.pk }}"
             id="vm-details-cidata-save" data-vm="{{ instance.pk }}"
             {% if not save_resources_enabled %}disabled{% endif %}>
             {% if not save_resources_enabled %}disabled{% endif %}>
             <i class="fa fa-floppy-o"></i> {% trans "Validate & Save" %}
             <i class="fa fa-floppy-o"></i> {% trans "Validate & Save" %}
-      </button>
+          </button>{% if not save_resources_enabled %} Stop your VM to change cloud-init options.{% endif %}
         </form>
         </form>
       </div>
       </div>
-</div>
+    </div>
+  {% else %}
+    <div class="alert alert-warning">
+      {% trans "Cloud-init is inactive" %}
+    </div>
+  {% endif %}
 {% else %}
 {% else %}
-<p>Cloud-init is inactive</p>
+<div class="alert alert-warning">
+  {% trans "You are not authorized to access the cloud-init options." %}
+</div>
 {% endif %}
 {% endif %}
\ No newline at end of file