Merge lp:~jakedahn/horizon/760072 into lp:~hudson-openstack/horizon/trunk

[Jake Dahn]

Added close link to the image detail ui, so users do not have to go to the main navigation to return to the standard image list.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'django-nova/src/django_nova/templates/django_nova/images/_list.html'
--- django-nova/src/django_nova/templates/django_nova/images/_list.html	2011-03-18 01:25:14 +0000
+++ django-nova/src/django_nova/templates/django_nova/images/_list.html	2011-04-13 19:16:35 +0000
@@ -21,7 +21,7 @@
                   <span class="data">{{ ami.description }}</span>
                 </div>
 
-                <div class="image_detail_item">
+                <div id="location" class="image_detail_item">
                   <span class="label">Location: </span>
                   <span class="data">{{ ami.location }}</span>
                 </div>
@@ -59,7 +59,8 @@
                 {% endif %}
 
               </div>
-
+              <a id="close_detail" href="{% url nova_images project.projectname %}">[x] close</a>
+              
               {% if user.username == ami.ownerId %}
                 <span class="image_privacy">
                   <form id="privacy_{{ ami.id }}" action="{% url nova_images_privacy project.projectname ami.id %}" method="post" accept-charset="utf-8">
@@ -78,7 +79,7 @@
                     <input type="submit" value="Remove Image" />
                   </form>
                 </span>
-              {% endif %}
+              {% endif %}              
             </div>
           </td>
         {% else %}

=== modified file 'django-nova/src/django_nova/views/images.py'
--- django-nova/src/django_nova/views/images.py	2011-03-18 01:25:14 +0000
+++ django-nova/src/django_nova/views/images.py	2011-04-13 19:16:35 +0000
@@ -33,7 +33,7 @@
 from django_nova import forms
 from django_nova import shortcuts
 from django_nova.exceptions import handle_nova_error
-
+from django_nova.urls import project
 
 def _image_lists(images, project_id):
     def image_is_project(i):

=== modified file 'openstack-dashboard/media/dashboard/css/openstack.css'
--- openstack-dashboard/media/dashboard/css/openstack.css	2011-03-30 04:47:34 +0000
+++ openstack-dashboard/media/dashboard/css/openstack.css	2011-04-13 19:16:35 +0000
@@ -603,7 +603,7 @@
 	margin: -25px 0 0 0px !important;
 }
 
-.image_detail .delete input, #user_edit .deletelink, #update_profile input[type="reset"], .image_detail .image_privacy input, .instance_detail .form-terminate input[type="submit"], .cancel a {
+.image_detail .delete input, #user_edit .deletelink, #update_profile input[type="reset"], .image_detail .image_privacy input, .instance_detail .form-terminate input[type="submit"], .cancel a, #image_launch .image_detail a#close_detail {
   background: none;
   border: none;
   color: #FF8885;
@@ -616,6 +616,16 @@
   color: red;
 }
 
+#location .data {
+	width: 180px;
+}
+
+#close_detail {
+	float: left;
+	margin-top: -4px !important;
+	margin-right: 10px;
+}
+
 .cancel {
   margin-top: 5px;
   float: left;