From 4199c31985af6a322f219cec0e6f909382761af8 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Tue, 5 Jul 2011 19:32:37 -0400
Subject: [PATCH] Merged settings actual value column and existing column

---
 apps/smart_settings/views.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/smart_settings/views.py b/apps/smart_settings/views.py
index c57e79c678..d8075fcc1b 100644
--- a/apps/smart_settings/views.py
+++ b/apps/smart_settings/views.py
@@ -30,8 +30,11 @@ def setting_list(request):
         'extra_columns': [
             {'name': _(u'name'), 'attribute': lambda x: mark_safe(u'<span style="font-weight: bold;">%s</span><br>%s' % (x.get('global_name'), x.get('description')))},
             {'name': _(u'default'), 'attribute': lambda x: return_type(x['default'])},
-            {'name': _(u'value'), 'attribute': lambda x: return_type(getattr(x['module'], x['name']))},
-            {'name': _(u'exists'), 'attribute': lambda x: exists_with_famfam(getattr(x['module'], x['name'])) if x['exists'] else ''},
+            {'name': _(u'value'), 'attribute': lambda x: mark_safe(u'<div class="nowrap">%s&nbsp;%s</div>' % (
+                    return_type(getattr(x['module'], x['name'])),
+                    exists_with_famfam(getattr(x['module'], x['name'])) if x['exists'] else ''
+                ))
+            },
         ]
     }