Merge branch 'feature-new-pw-style' into 'master'

Old style new password operation link

The button looks strange, a simple link looks better.

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

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

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

@@ -307,6 +307,10 @@ $(function() {
     $("#vm-details-connection-string").focus();
     $("#vm-details-connection-string").focus();
   });
   });
 
 
+  $("a.operation-password_reset").click(function() {
+    if(Boolean($(this).data("disabled"))) return false;
+  });
+
 });
 });
 
 
 
 
@@ -327,6 +331,7 @@ function removePort(data) {
 
 
     }
     }
   });
   });
+
 }
 }
 
 
 function decideActivityRefresh() {
 function decideActivityRefresh() {

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

@@ -100,7 +100,7 @@
         <dd style="font-size: 10px; text-align: right; padding-top: 8px;">
         <dd style="font-size: 10px; text-align: right; padding-top: 8px;">
           <div id="vm-details-pw-reset">
           <div id="vm-details-pw-reset">
           {% with op=op.password_reset %}{% if op %}
           {% with op=op.password_reset %}{% if op %}
-            <a href="{{op.get_url}}" class="btn operation btn-default btn-xs" {% if op.disabled %}disabled{% endif %}>{% trans "Generate new password!" %}</a>
+          <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>
           {% endif %}{% endwith %}
           {% endif %}{% endwith %}
           </div>
           </div>
         </dd>
         </dd>