Merge branch 'issue-410'

closes #410

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

@@ -82,6 +82,17 @@
     </h1>
     </h1>
     <div style="clear: both;"></div>
     <div style="clear: both;"></div>
   </div>
   </div>
+  {% if instance.node and not instance.node.online %}
+    <div class="alert alert-warning">
+      {% if user.is_superuser %}
+        {% blocktrans with name=instance.node.name %}
+        The node <strong>{{ name }}</strong> is missing.
+        {% endblocktrans %}
+      {% else %}
+        {% trans "Currently you cannot execute any operations because the virtual machine's node is missing." %}
+      {% endif %}
+    </div>
+  {% endif %}
   <div class="row">
   <div class="row">
     <div class="col-md-4" id="vm-info-pane">
     <div class="col-md-4" id="vm-info-pane">
       <div class="big">
       <div class="big">

circle/templates/info/help/faq_toc.html

@@ -9,6 +9,6 @@
 
 
   <li><a href="#how-can-i-have-more-cpumemory">{% trans "How can I have more CPU/memory?" %}</a></li>
   <li><a href="#how-can-i-have-more-cpumemory">{% trans "How can I have more CPU/memory?" %}</a></li>
 
 
-  <li><a href="#how-can-i-get-access-to-a-template">{% trans "How can I get acces to a template?" %}</a></li>
+  <li><a href="#how-can-i-get-access-to-a-template">{% trans "How can I get access to a template?" %}</a></li>
 </li>
 </li>
 </ul>
 </ul>

circle/templates/info/help/overview.html

@@ -37,7 +37,7 @@
 <h4 id="virtual-machines-box">{% trans "Virtual Machines box" %}</h4>
 <h4 id="virtual-machines-box">{% trans "Virtual Machines box" %}</h4>
 <p>
 <p>
   {% blocktrans %}
   {% blocktrans %}
-    In the virtual machines box you will find your recent virtual machines.
+    In the <em>virtual machines</em> box you will find your recent virtual machines.
     A summary view is also available by clicking the dashboard button (<i class="fa fa-dashboard"></i>).
     A summary view is also available by clicking the dashboard button (<i class="fa fa-dashboard"></i>).
     Click on the name of a virtual machine to see its connection details, preferences,
     Click on the name of a virtual machine to see its connection details, preferences,
     or to change its state.
     or to change its state.
@@ -91,7 +91,7 @@
   <p>
   <p>
     {% blocktrans %}
     {% blocktrans %}
       If you select a virtual machine, you get to a page with all the details and operations listed.
       If you select a virtual machine, you get to a page with all the details and operations listed.
-      On the left, you will see the state of the machine and a summary about how you can connect to the machine.
+      On the left, you will see the state of the machine and a summary about how you can <strong>connect</strong> to the machine.
       In the middle there is a tabbed pane, which contains details about the machine in categories.
       In the middle there is a tabbed pane, which contains details about the machine in categories.
     {% endblocktrans %}
     {% endblocktrans %}
   </p>
   </p>
@@ -332,7 +332,8 @@
     <p>
     <p>
       {% blocktrans %}
       {% blocktrans %}
         You can create templates from any virtual machine with the save as template button.
         You can create templates from any virtual machine with the save as template button.
-        Additionally, you can also click on the new button of the template box, and follow the template creation wizard.
+        Additionally, you can also click on the <span class="btn btn-success disabled btn-xs"><i class="fa fa-plus-circle"></i> new</span>
+        button of the template box, and follow the template creation wizard.
       {% endblocktrans %}
       {% endblocktrans %}
     </p>
     </p>
   </blockquote>
   </blockquote>
@@ -475,7 +476,7 @@
 
 
   <h4 id="how-can-i-share-my-files-with-a-vm">{% trans "How can I share my files with a VM?" %}</h4>
   <h4 id="how-can-i-share-my-files-with-a-vm">{% trans "How can I share my files with a VM?" %}</h4>
   <blockquote>
   <blockquote>
-    <p>{% blocktrans %}To access the file store press the mount store button on the virtual machine's home panel.{% endblocktrans %}</p>
+    <p>{% blocktrans %}To access the file store press the <span class="btn btn-info disabled btn-xs"><i class="fa fa-briefcase"></i> mount store</span> button on the virtual machine's home panel.{% endblocktrans %}</p>
   </blockquote>
   </blockquote>
 </div>
 </div>
 
 

circle/templates/info/help/overview_toc.html

@@ -69,7 +69,7 @@
     <li><a href="#how-can-i-create-templates">{% trans "How can I create templates?" %}</a></li>
     <li><a href="#how-can-i-create-templates">{% trans "How can I create templates?" %}</a></li>
     <li><a href="#what-kind-of-options-are-customizable-in-the-template">{% trans "What kind of options are customizable in the template?" %}</a></li>
     <li><a href="#what-kind-of-options-are-customizable-in-the-template">{% trans "What kind of options are customizable in the template?" %}</a></li>
     <li><a href="#how-can-i-change-the-expiration-of-the-templates-vms">{% trans "How can I change the expiration of the tempalte's VMs" %}</a></li>
     <li><a href="#how-can-i-change-the-expiration-of-the-templates-vms">{% trans "How can I change the expiration of the tempalte's VMs" %}</a></li>
-    <li><a href="#how-can-i-give-the-template-to-other-user">{% trans "How can I give the template to other user" %}</a></li>
+    <li><a href="#how-can-i-give-the-template-to-other-user">{% trans "How can I give the template to other user?" %}</a></li>
     <li><a href="#how-can-i-give-access-to-users-or-groups-to-the-template">{% trans "How can I give access to users or groups to the template?"%}</a></li>
     <li><a href="#how-can-i-give-access-to-users-or-groups-to-the-template">{% trans "How can I give access to users or groups to the template?"%}</a></li>
   </ul>
   </ul>
   </li>
   </li>
@@ -92,7 +92,7 @@
   <ul><a href="#profile">{% trans "Profile" %}</a>
   <ul><a href="#profile">{% trans "Profile" %}</a>
   <li><a href="#how-can-i-change-my-password">{% trans "How can I change my password?" %}</a></li>
   <li><a href="#how-can-i-change-my-password">{% trans "How can I change my password?" %}</a></li>
   <li><a href="#how-can-i-store-public-keys-on-the-vms">{% trans "How can I store public keys on the VMs?" %}</a></li>
   <li><a href="#how-can-i-store-public-keys-on-the-vms">{% trans "How can I store public keys on the VMs?" %}</a></li>
-  <li><a href="#how-can-i-change-connection-template">{% trans "How can I change connection template" %}</a></li>
+  <li><a href="#how-can-i-change-connection-template">{% trans "How can I change connection template?" %}</a></li>
   </ul>
   </ul>
   </li>
   </li>
 
 

circle/vm/operations.py

@@ -133,6 +133,10 @@ class InstanceOperation(Operation):
 
 
         super(InstanceOperation, self).check_auth(user=user)
         super(InstanceOperation, self).check_auth(user=user)
 
 
+        if (self.instance.node and not self.instance.node.online
+                and not user.is_superuser):
+            raise self.instance.WrongStateError(self.instance)
+
     def create_activity(self, parent, user, kwargs):
     def create_activity(self, parent, user, kwargs):
         name = self.get_activity_name(kwargs)
         name = self.get_activity_name(kwargs)
         if parent:
         if parent: