eliminate line break between icon and slice name

[plstackapi.git] / planetstack / core / admin.py

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 4634d16..62aa96a 100644 (file)
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -24,9 +24,9 @@ def backend_icon(obj): # backend_status, enacted, updated):
         return '<img src="/static/admin/img/icon_success.gif">'
     else:
         if obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
-            return '<div title="%s"><img src="/static/admin/img/icon_clock.gif"></div>' % obj.backend_status
+            return '<span title="%s"><img src="/static/admin/img/icon_clock.gif"></span>' % obj.backend_status
         else:
-            return '<div title="%s"><img src="/static/admin/img/icon_error.gif"></div>' % obj.backend_status
+            return '<span title="%s"><img src="/static/admin/img/icon_error.gif"></span>' % obj.backend_status
 
 def backend_text(obj):
     icon = backend_icon(obj)
@@ -732,8 +732,8 @@ class SliceAdmin(PlanetStackBaseAdmin):
     fieldList = ['backend_status_text', 'name', 'site', 'serviceClass', 'enabled','description', 'service', 'slice_url', 'max_slivers']
     fieldsets = [('Slice Details', {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}),]
     readonly_fields = ('backend_status_text', )
-    list_display = ('backend_status_icon', 'name', 'site','serviceClass', 'slice_url', 'max_slivers')
-    list_display_links = ('backend_status_icon', 'name', )
+    list_display = ('backend_status_icon', 'slicename', 'site','serviceClass', 'slice_url', 'max_slivers')
+    list_display_links = ('backend_status_icon', 'slicename', )
     inlines = [SlicePrivilegeInline,SliverInline, TagInline, ReservationInline,SliceNetworkInline]
 
     user_readonly_fields = fieldList