From 557052dd2d162b60735d2a2ad37447aac89cd6ba Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Wed, 25 May 2011 01:01:52 -0400
Subject: [PATCH] Changed document index links icons and index rebuild
 confirmation icon, updated list view to display icon for the type of index
 instance content

---
 .../templates/generic_list_subtemplate.html    |  17 +++++++++++++++++
 apps/document_indexing/__init__.py             |   4 ++--
 apps/document_indexing/views.py                |  16 +++++++++++++++-
 site_media/images/icons/folder_link.png        | Bin 1800 -> 0 bytes
 site_media/images/icons/folder_page.png        | Bin 0 -> 1334 bytes
 5 files changed, 34 insertions(+), 3 deletions(-)
 delete mode 100644 site_media/images/icons/folder_link.png
 create mode 100644 site_media/images/icons/folder_page.png

diff --git a/apps/common/templates/generic_list_subtemplate.html b/apps/common/templates/generic_list_subtemplate.html
index b92eb13b04..4a7e32a575 100644
--- a/apps/common/templates/generic_list_subtemplate.html
+++ b/apps/common/templates/generic_list_subtemplate.html
@@ -36,15 +36,23 @@
                             {% if multi_select or multi_select_as_buttons %}
                                 <th class="first"><input type="checkbox" class="checkbox toggle" /></th>
                             {% endif %}
+
                             {% if not hide_object %}
                                 <th>{% trans "Identifier" %}</th>
                             {% endif %}
+
+                            {% for column in extra_columns_preffixed %}
+                                <th>{{ column.name|capfirst }}</th>
+                            {% endfor %}
+
                             {% for column in object_list.0|get_model_list_columns %}
                                 <th>{{ column.name|capfirst }}</th>
                             {% endfor %}            
+
                             {% for column in extra_columns %}
                                 <th>{{ column.name|capfirst }}</th>
                             {% endfor %}        
+
                             {% if not hide_links %}
                                 <th class="">&nbsp;</th>
                             {% endif %}
@@ -64,6 +72,15 @@
                                 <td>{% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}</td>
                             {% endif %}
                         {% endif %}
+                        {% for column in extra_columns_preffixed %}
+                            {% if column.keep_together %}
+                                <td>
+                                    {{ object|object_property:column.attribute|safe|make_non_breakable }}
+                                </td>
+                            {% else %}
+                                <td>{{ object|object_property:column.attribute|safe }}</td>
+                            {% endif %}
+                        {% endfor %}                        
                         {% if not hide_columns %}
                             {% for column in object|get_model_list_columns %}
                                 <td>{{ object|object_property:column.attribute|safe }}</td>
diff --git a/apps/document_indexing/__init__.py b/apps/document_indexing/__init__.py
index 52b63f1a73..206d3b8e5d 100644
--- a/apps/document_indexing/__init__.py
+++ b/apps/document_indexing/__init__.py
@@ -11,12 +11,12 @@ set_namespace_title('document_indexing', _(u'indexing'))
 register_permission(PERMISSION_DOCUMENT_INDEXING_VIEW)
 register_permission(PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES)
 
-index_list = {'text': _(u'index list'), 'view': 'index_instance_list', 'famfam': 'folder_link', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]}
+index_list = {'text': _(u'index list'), 'view': 'index_instance_list', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]}
 
 register_menu([
     {'text': _('indexes'), 'view': 'index_instance_list', 'links': [
     ], 'famfam': 'folder_link', 'position': 2, 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]}])
 
-rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'rebuild_index_instances', 'famfam': 'folder_link', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')}
+rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'rebuild_index_instances', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')}
 
 register_tool(rebuild_index_instances, namespace='document_indexing', title=_(u'Indexes'))
diff --git a/apps/document_indexing/views.py b/apps/document_indexing/views.py
index 068dfa7af3..ca53733ee2 100644
--- a/apps/document_indexing/views.py
+++ b/apps/document_indexing/views.py
@@ -15,6 +15,12 @@ from document_indexing.api import get_breadcrumbs, get_instance_link, \
     do_rebuild_all_indexes
 
 
+def _index_instance_item_link(index_instance_item):
+    icon = u'folder_page' if isinstance(index_instance_item, IndexInstance) else u'page'
+    return u'<span class="famfam active famfam-%(icon)s"></span><a href="%(url)s">%(text)s</a>' % {
+        'url': index_instance_item.get_absolute_url(), 'icon': icon, 'text': index_instance_item}
+
+    
 def index_instance_list(request, index_id=None):
     check_permissions(request.user, [PERMISSION_DOCUMENT_INDEXING_VIEW])
 
@@ -33,8 +39,15 @@ def index_instance_list(request, index_id=None):
 
     return render_to_response('generic_list.html', {
         'object_list': index_instance_list,
+        'extra_columns_preffixed': [
+            {
+                'name': _(u'item'),
+                'attribute': lambda x: _index_instance_item_link(x)
+            }
+        ],
         'title': title,
         'hide_links': True,
+        'hide_object': True,
     }, context_instance=RequestContext(request))
 
 
@@ -48,8 +61,9 @@ def rebuild_index_instances(request):
         return render_to_response('generic_confirm.html', {
             'previous': previous,
             'next': next,
+            'title': _(u'Are you sure you wish to rebuild all indexes?'),
             'message': _(u'On large databases this operation may take some time to execute.'),
-            'form_icon': u'folder_link.png',
+            'form_icon': u'folder_page.png',
         }, context_instance=RequestContext(request))
     else:
         try:
diff --git a/site_media/images/icons/folder_link.png b/site_media/images/icons/folder_link.png
deleted file mode 100644
index 06e95f2cb56778416d89fd1d54cd37de8421b5b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1800
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

diff --git a/site_media/images/icons/folder_page.png b/site_media/images/icons/folder_page.png
new file mode 100644
index 0000000000000000000000000000000000000000..959fa1f1f31fb66a03cf1050802888452440d357
GIT binary patch
literal 1334
zcmV-61<Cq}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$*hxe|RCwCNS50hGRTTd2&zladwAd0Y
zhO|YkRbx^ST>vg@WPw5&2yEPFjKtU=8{N5ar->|#Q6nbmLK71bFo+NmHU7ll!U{@a
zWSUBxwsdglluoCewlnkIyPkXBn>Rn5UueQjZf4$nckcPlcfNDZ9j27R?Hr7zyzs%$
zDFJ(ra$R~<6}K_Y;Xt0*_Ue!OX~AAA0Fvf9ZG7;R&*)e>SFtKE1ulK`;$FR<=E7P6
z2piAIc=qyJ<iGGO77qt4z0bqWtl;8%+f$6O=4j?Zvv-!*+gHw>46L~}6c5ppMYG6&
zj)-#LW)j$T_{-JU>RP7*q($t#u%{AxvS5gSae8F3lmYXVBbWFInE9be>xzEvAk_al
zJbfWt9RRZAIM;kt2!UP~MU(`{>JXwl#@$qYC#$3ZZ{5w29Z>~9rMOaNFlIh$GeBp$
zOQm70%z$lD&3Ib}fHuknNA%)2ZcJR$0;*1c2Eoo#bOi}`N8AI=15p-f!0{L`bTgg#
z71PnYA>$Jl#(-P~k01Hm2pF{r8Y@F(ktmNHGNLSmK;=xFnVv#;j8zDm_8|IOgf#1*
zXRr_1v7@M7z{-aU(bfxeK7-^!c9a%EvN+c{F~Eg|=<k0c@$WR5u5>6zXV2Z}eRK<4
zR~gofY)riC<ODG#?zk5-S4Q#IRQhXev{VBWr}<a{_DUL0jJ!*LoiYZP0bs|D!&S^P
zN%7RHf-7*QsxzT<ln89=W~8Q$<I``a&d}<LENF!o5E65-8Qj_T2t{NGcKlSSDDxrF
zDakyQcvad(*5-Aiz{8s$?JSbh<JbTAXFj2GzrX;u4V|fY0{1+&i?B`8bI8wsR#jC@
zdu_QG{Avi1M61tQ84@ihS{mqP_<8%Uh(r@#(CV@lh4g!!DVfXjX%eVFOUEYIi{oTF
z<TFsiE2194LF9TX)X|}udrw|Y;?RjdA%D55sa+|p1KdIKY8)H-1`HUcs~49I)C6U8
z;CT*wGxlHb3!NLo1KnUpPU6Np!#MEJ2H@aJI5>CzYZ%@490K>4NpQ?f#?ZN?pCU8s
zRYY!iAnHxZoO~TvM?!A3{3(6*=rfhE5ns$05a&jo+~5Aj=@a^m%;&aRN>aPcA-u7h
zzQ@VFY^WrIE5Cqwqs8Ks4Ss{o7bkjN%GrkS<Z=$X`@7%@vA0l&Xv5;Q7&<oh8c&qg
z2bYaCJOe-m!V6QC%-<JGouKjTgLmQKx4-vd;<!-nAAtWV>@h$woQ+PPOVf`uo!6lE
zLBB7kJ}gC$Cl2%0&%V54by@J(VL=Fz(Mj~}rt+L2@yWL4E*w_I@1g|&`T7z`ES5BG
zP0j;dZ9$?M0FGh{!m`$1`uG^p<~DWZ5Oh>Kr*<p1n&%LOKo#+)%BmqNd!Yejw~l=G
z)ZyX#cCKWdrtj#k<GQoSbOulJPYeSj!kUedt-cSWX+}RhePyO@)v4a~+p){511;1^
z-5LmZ83GM}`Y`5b&ffxn9Ai1;8F1X{0EB;oQe`(HW%{u<Z)P|l<^*X7(LnaH;I_Fo
zqeV1#U$+D=zZ2flP~lASe8-#TcIK$i)QEubTpQQ>Q<eXR-PBl5vxnx!2A$G%S>FdH
s*9w62|Mi3$ETPJ8$IH0g<9`7L0Q%OmG&o_<DgXcg07*qoM6N<$f*2@`bpQYW

literal 0
HcmV?d00001