Merge lp:~jakedahn/django-nova/fb660 into lp:django-nova

[Jake Dahn]

This branch improves the usability of the 'connection error' modal dialog box on the instances page, which occurs during an ajax refresh.

[Devin Carlen (devcamcar)]

Grammar nit:

9 + <p><span class="ui-icon ui-icon-alert"></span> A connection error has occurred, please ensure you are still connected to VPN.</p>

Fix the comma splice please. :)

review: Needs Fixing

[lp:~jakedahn/django-nova/fb660]

21. By Jake Dahn on 2011-02-27

Fixing grammar error

[Jake Dahn (jakedahn)]

Fixed. However should the second sentence even exist? It's more generic/usable by others without the second sentence. Thoughts?

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'src/django_nova/templates/django_nova/images/_list.html'
--- src/django_nova/templates/django_nova/images/_list.html	2011-01-12 20:02:06 +0000
+++ src/django_nova/templates/django_nova/images/_list.html	2011-02-27 21:55:31 +0000
@@ -34,7 +34,7 @@
                 </div>
                 <div class="image_detail_item">
                   <span class="label">Name: </span>
-                  <span class="data">{{ ami.displayName }}</span>
+                  <span class="data">{% if ami.displayName %}{{ ami.displayName }}{%else%}{{ ami.id }}{% endif %}</span>
                 </div>
                 <div class="image_detail_item">
                   <span class="label">Type: </span>

=== modified file 'src/django_nova/templates/django_nova/images/detail_list.html'
--- src/django_nova/templates/django_nova/images/detail_list.html	2011-01-16 21:28:02 +0000
+++ src/django_nova/templates/django_nova/images/detail_list.html	2011-02-27 21:55:31 +0000
@@ -52,7 +52,7 @@
                 </div>
                 <div class="image_detail_item">
                   <span class="label">Name: </span>
-                  <span class="data">{{ ami.displayName }}</span>
+                  <span class="data">{% if ami.displayName %}{{ ami.displayName }}{%else%}{{ ami.id }}{% endif %}</span>
                 </div>
                 <div class="image_detail_item">
                   <span class="label">Type: </span>

=== modified file 'src/django_nova/templates/django_nova/instances/index.html'
--- src/django_nova/templates/django_nova/instances/index.html	2011-01-17 05:55:41 +0000
+++ src/django_nova/templates/django_nova/instances/index.html	2011-02-27 21:55:31 +0000
@@ -22,7 +22,7 @@
   </div>
 
   <div id="connection_error" style="display:none;" title="Connection Error">
-    <p><span class="ui-icon ui-icon-alert"></span> A connection error has occured, please ensure you are still connected to VPN.</p>
+    <p><span class="ui-icon ui-icon-alert"></span>A connection error has occurred. Please ensure you are still connected to VPN.</p>
   </div>
 {% endblock %}
 
@@ -80,7 +80,9 @@
       default:
         $('#connection_error').dialog({
           dialogClass: 'alert',
-          modal: true
+          modal: true,
+          closeOnEscape: true,
+          buttons:{ "Close": function() { $(this).dialog("close"); } },
         });
         $('#connection_error').dialog('open');
         break;

=== modified file 'src/django_nova/views/images.py'
--- src/django_nova/views/images.py	2011-01-31 20:08:02 +0000
+++ src/django_nova/views/images.py	2011-02-27 21:55:31 +0000
@@ -120,7 +120,6 @@
         raise http.Http404()
     return render_to_response('django_nova/images/index.html', {
         'form': forms.LaunchInstanceForm(project),
-        'update_form': forms.UpdateImageForm(ami),
         'region': project.region,
         'project': project,
         'images': images,