Merge remote-tracking branch 'origin/feature-helptexts'

Conflicts:
	circle/dashboard/static/dashboard/dashboard.less

circle/dashboard/static/dashboard/dashboard.less

@@ -1264,3 +1264,8 @@ textarea[name="new_members"] {
   margin-bottom: 20px;
   display: none;
 }
+
+#vm-detail-access-help {
+  background: #f9f9f9;
+  margin-top: 20px;
+}

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

@@ -109,6 +109,39 @@
       </div>
     </div>
 
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="no-margin">
+          <i class="fa fa-question-circle"></i>
+          {% trans "Access level rights" %}
+        </h4>
+      </div>
+      <div class="panel-body">
+        <dl>
+          <dt>{% trans "User" %}</dt>
+          <dd>
+            {% blocktrans %}
+            Can create instances from this template but cannot manage access or edit the attributes.
+            {% endblocktrans %}
+          </dd>
+          <dt>{% trans "Operator" %}</dt>
+          <dd>
+            {% blocktrans %}
+            Same as user, however operators can grant user level access to this template
+            for groups or users and they can revoke user level accesses.
+            {% endblocktrans %}
+          </dd>
+          <dt>{% trans "Owner" %}</dt>
+          <dd>
+            {% blocktrans %}
+            Owners can edit the template's attributes, delete it,
+            transfer the ownership and also grant user,
+            operator and owner level access to the template.
+            {% endblocktrans %}
+          </dd>
+        </dl>
+      </div>
+    </div>
 
     <div class="panel panel-default">
       <div class="panel-heading">
@@ -122,7 +155,7 @@
         {% for d in disks %}
           <li>
             <i class="fa fa-file"></i>
-            {{ d.name }} (#{{ d.id }}) -
+            {{ d.name }} (#{{ d.id }})
             <a href="{% url "dashboard.views.disk-remove" pk=d.pk %}?next={{ request.path }}"
               data-disk-pk="{{ d.pk }}" class="btn btn-xs btn-danger pull-right disk-remove"
               {% if not long_remove %}title="{% trans "Remove" %}"{% endif %}>

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

@@ -18,3 +18,24 @@
 </p>
 <h3>{% trans "Permissions"|capfirst %}</h3>
 {% include "dashboard/_manage_access.html" with table_id="vm-access-table" %}
+
+<dl class="well well-sm" id="vm-detail-access-help">
+  <dt>{% trans "User" %}</dt>
+  <dd>
+    {% trans "Grants access to the detail page so the users can connect to the virtual machine." %}
+  </dd>
+  <dt>{% trans "Operator" %}</dt>
+  <dd>
+    {% blocktrans %}
+    Users or groups with operator access can modify the the name and description, open ports and grant user level access to the virtual machine.
+    {% endblocktrans %}
+  </dd>
+  <dt>{% trans "Owner" %}</dt>
+  <dd>
+    {% blocktrans %}
+    Full access to the virtual machine. They can use operations, change resources and grant operator level access to users or groups.
+    Besides the access levels the instance also has an original owner.
+    The original owner's access cannot be revoked however the ownership is transferable.
+    {% endblocktrans %}
+  </dd>
+</dl>