From 1f784aa6b0860aa39671d0faa64bb5510e57d09b Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Fri, 18 Nov 2011 18:29:59 -0400
Subject: [PATCH] Started the rename of the document grouping app to smart
 linking

---
 apps/grouping/__init__.py                     |  26 ++++++-------
 apps/grouping/forms.py                        |   2 +-
 apps/grouping/models.py                       |  10 ++---
 apps/grouping/static/images/icons/link.png    | Bin 0 -> 1282 bytes
 .../static/images/icons/link_delete.png       | Bin 0 -> 1921 bytes
 apps/grouping/static/images/icons/package.png | Bin 972 -> 0 bytes
 .../static/images/icons/package_delete.png    | Bin 1538 -> 0 bytes
 apps/grouping/views.py                        |  35 ++++++++----------
 8 files changed, 35 insertions(+), 38 deletions(-)
 create mode 100644 apps/grouping/static/images/icons/link.png
 create mode 100644 apps/grouping/static/images/icons/link_delete.png
 delete mode 100644 apps/grouping/static/images/icons/package.png
 delete mode 100644 apps/grouping/static/images/icons/package_delete.png

diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py
index 4bfe65aea0..a30c52586d 100644
--- a/apps/grouping/__init__.py
+++ b/apps/grouping/__init__.py
@@ -9,22 +9,22 @@ from documents.models import Document
 from grouping.models import DocumentGroup
 
 
-PERMISSION_DOCUMENT_GROUP_VIEW = {'namespace': 'grouping', 'name': 'group_view', 'label': _(u'View existing document groups')}
-PERMISSION_DOCUMENT_GROUP_CREATE = {'namespace': 'grouping', 'name': 'group_create', 'label': _(u'Create new document groups')}
-PERMISSION_DOCUMENT_GROUP_DELETE = {'namespace': 'grouping', 'name': 'group_delete', 'label': _(u'Delete document groups')}
+PERMISSION_SMART_LINK_VIEW = {'namespace': 'grouping', 'name': 'group_view', 'label': _(u'View existing smart links')}
+PERMISSION_SMART_LINK_CREATE = {'namespace': 'grouping', 'name': 'group_create', 'label': _(u'Create new smart links')}
+PERMISSION_SMART_LINK_DELETE = {'namespace': 'grouping', 'name': 'group_delete', 'label': _(u'Delete smart links')}
 
-set_namespace_title('grouping', _(u'Grouping'))
-register_permission(PERMISSION_DOCUMENT_GROUP_VIEW)
-register_permission(PERMISSION_DOCUMENT_GROUP_CREATE)
-register_permission(PERMISSION_DOCUMENT_GROUP_DELETE)
+set_namespace_title('grouping', _(u'Smart links'))
+register_permission(PERMISSION_SMART_LINK_VIEW)
+register_permission(PERMISSION_SMART_LINK_CREATE)
+register_permission(PERMISSION_SMART_LINK_DELETE)
 
-document_group_link = {'text': _(u'group actions'), 'view': 'document_group_view', 'famfam': 'package_go', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
-groups_for_document = {'text': _(u'groups'), 'view': 'groups_for_document', 'args': 'object.pk', 'famfam': 'package_go', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
+document_group_link = {'text': _(u'smart links actions'), 'view': 'document_group_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
+groups_for_document = {'text': _(u'smart links'), 'view': 'groups_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 
-document_groups_setup = {'text': _(u'document groups'), 'view': 'document_group_list', 'icon': 'package.png', 'permissions': [PERMISSION_DOCUMENT_GROUP_VIEW]}
-document_group_list = {'text': _(u'document groups'), 'view': 'document_group_list', 'famfam': 'package', 'permissions': [PERMISSION_DOCUMENT_GROUP_VIEW]}
-document_group_create = {'text': _(u'create new'), 'view': 'document_group_create', 'famfam': 'package_add', 'permissions': [PERMISSION_DOCUMENT_GROUP_CREATE]}
-document_group_delete = {'text': _(u'delete'), 'view': 'document_group_delete', 'args': 'object.pk', 'famfam': 'package_delete', 'permissions': [PERMISSION_DOCUMENT_GROUP_DELETE]}
+document_groups_setup = {'text': _(u'smart links'), 'view': 'document_group_list', 'icon': 'link.png', 'permissions': [PERMISSION_SMART_LINK_VIEW]}
+document_group_list = {'text': _(u'smart links'), 'view': 'document_group_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_VIEW]}
+document_group_create = {'text': _(u'create new'), 'view': 'document_group_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+document_group_delete = {'text': _(u'delete'), 'view': 'document_group_delete', 'args': 'object.pk', 'famfam': 'link_delete', 'permissions': [PERMISSION_SMART_LINK_DELETE]}
 
 register_links(Document, [groups_for_document], menu_name='form_header')
 
diff --git a/apps/grouping/forms.py b/apps/grouping/forms.py
index 3c5d65792b..bd28945eda 100644
--- a/apps/grouping/forms.py
+++ b/apps/grouping/forms.py
@@ -83,7 +83,7 @@ class DocumentGroupImageWidget(forms.widgets.Widget):
                     'document_name': document,
                     'static_url': settings.STATIC_URL,
                     'tags_template': tags_template if tags_template else u'',
-                    'string': _(u'group document'),
+                    'string': _(u'smart links'),
                 })
         output.append(u'</div>')
         output.append(
diff --git a/apps/grouping/models.py b/apps/grouping/models.py
index fc8bb76ed5..05841b2a85 100644
--- a/apps/grouping/models.py
+++ b/apps/grouping/models.py
@@ -17,12 +17,12 @@ class DocumentGroup(models.Model):
         return self.title
 
     class Meta:
-        verbose_name = _(u'document group')
-        verbose_name_plural = _(u'document groups')
+        verbose_name = _(u'smart link')
+        verbose_name_plural = _(u'smart links')
 
 
 class DocumentGroupItem(models.Model):
-    document_group = models.ForeignKey(DocumentGroup, verbose_name=_(u'document group'))
+    document_group = models.ForeignKey(DocumentGroup, verbose_name=_(u'smart link'))
     inclusion = models.CharField(default=INCLUSION_AND, max_length=16, choices=INCLUSION_CHOICES, help_text=_(u'The inclusion is ignored for the first item.'))
     foreign_document_data = models.CharField(max_length=32, verbose_name=_(u'foreign document data'), help_text=_(u'This represents the metadata of all other documents.  Available objects: `document.<attribute>` and `metadata.<metadata_type_name>`.'))
     operator = models.CharField(max_length=16, choices=OPERATOR_CHOICES)
@@ -36,5 +36,5 @@ class DocumentGroupItem(models.Model):
         return u'[%s] %s foreign %s %s %s %s' % (u'x' if self.enabled else u' ', self.get_inclusion_display(), self.foreign_document_data, _(u'not') if self.negated else u'', self.get_operator_display(), self.expression)
 
     class Meta:
-        verbose_name = _(u'group item')
-        verbose_name_plural = _(u'group items')
+        verbose_name = _(u'link condition')
+        verbose_name_plural = _(u'link conditions')
diff --git a/apps/grouping/static/images/icons/link.png b/apps/grouping/static/images/icons/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0c35b59a32a35922e235ce13cfaea86fb337aa3
GIT binary patch
literal 1282
zcmV+d1^xPoP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$q)9|URCwCNS8GgLWf*>20c}Tt0!?8C
z=xDn*fBM6aEEdGD1Q?8M&Y9_)i5akqKa4SPh|I~&Y>66U;$^0z!)-+4-0+8)a_I%U
zEl{ADC53V5Mi*U6ZE3c)r#Ij4^t1vi!Z=-alJ}&^cTS)8d%x#>pXcx*kqA7@D}~&6
zJYKT@m)F|XS&}XiT?~c8d7)qsBB3zQ0s3OgyG?s>Js5wGR3OO-@Y_329w;g(R99>(
z2cOpuF1H)(4hKw6O~ahc25s*je-xjiA4CHD*7gq$$cl>8H8s^>7#;>{#tH%24?=+u
zBvL8ZY&U?Sti2z9cxpGPL`pJuz8GAqGl1D_2Ghj&r{+JenN(%vZ}@266FE6KnAB`7
zJ}<!Vq&z6_$;nBW7$0lDaQ^FWaNW=2@!cX(O^;YChG3AP067K^KUrtK9DIDt*n!~P
zxNgO;RaR9g%S%<@^V1Lr1eo{YH!f^%YHry|2p0t(ih>(Q+YtOLuHVAAbFlu<o=5m8
ztr?k_Fpp%!3d}EQLk?G3Zm#6pii&cEaOO!f{5oWKtGD;k4=lL1q4CK6{QP`%RaGSn
zXmwznoduI={7qa7B%=aC>>?>CD>Xxb$L#{SQhBQJ&=DPBID+pZ;MLWYpw%0&4X0q{
z`gF%1zyGGk^}ESPAT<;U!MyVyu>XA<<nm%@eXj);78ay?U))!V;2Huxh`gA#Sl~K>
z_x1fmj>aCF1Dr`1!U?C>YN4>G0Cv{Z!slO}2A|IdTedvevmCrX3Vw^-eIywi0GG?@
zk|^X^yXtm;`b-yGy*dJ~A3X|$aQ%bYMBsNY!pRuLsc#>9XLj>u<wmk|^%)I}O_-om
zRR-a3h#9?BiXz~h2(C#4&Lx4=V@=JJQmJ@+C+@sUa~AY^!-7m!oDm8Ifu?B^PNQ+8
z**H2fuoC!Mjv%gTVWMhCI1(<m%c)Svvt!^|o!)Wz`|n<2RgTA=F9E#G67Fsy@YO1?
zRMmVm!*;z+3+d?_VE3*%1n-W4?;z8T^!=ju11vBdBixF9V5Qk!SWuweUQ@-Y8pX64
zVSAKt8W<k_Wq}2!FdVVra^HsJ|Al3UnQ+XI!9I@?t_vni*I?78;tY1@>jF<S2NI~7
z8MOU<$Gu)Jys+naX6K~URI1XLsCd^4zC3}1sy1dEZM|~k$DchOkF%liFjy>8&{$uO
ztrlk3&RI$mtJ;5(+H>LDIb6T_)#)#`&CT6x%Fo{j8Ch9iw>wA$=96Md?@={$GOU^C
zW_vie|CLv_%jJp=GG6-!w5V#-5>?}x0HbPNpP$$zKnwNJBJh}`eionYQ<i&FjcWp_
z#3s4Xy$0}HZ&<Bldi}+MzZ{d)1i}(mHLeLj1W85aH*v2|mz10+l*wKb2n5gMN%KBg
zi>h%=AnbHH2hq1bORO`x*Qe6b9y2~yrUDVF8gVkKsoJ_d9XpCe_*>rGa>6K)<bYV5
z&9s>xosNU38rrDURE=u_q!PIp#RnS>pWGl6ZY7)`u~t>%ngG*^7}*$k7@6$xtXb8P
skwA<S0`{YUe?O|W?(1QHp8qSr0PR@qMpc3|#{d8T07*qoM6N<$f*5~b8UO$Q

literal 0
HcmV?d00001

diff --git a/apps/grouping/static/images/icons/link_delete.png b/apps/grouping/static/images/icons/link_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..b584c29f39c7f32bc8f4f1662a5619253cfcc75d
GIT binary patch
literal 1921
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
Hu0mjfRZg!?

literal 0
HcmV?d00001

diff --git a/apps/grouping/static/images/icons/package.png b/apps/grouping/static/images/icons/package.png
deleted file mode 100644
index 448681eaf5aaf6361059da71e97f791a878a6591..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 972
zcmV;-12g=IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Zb?KzRCwC#m(5QTK^VrL*{^<41O0*m
zn#f6Gq96&;16Sk4L_Fw4O-%d)#CXwzCS1H2@eeRDQ7?KBjTi1*3`RkX(GxKStfe0y
zg>AR(c6?{HTP#idWZ@v2OqcDHd4BW0&pR{AIOo{TOTji@I{@q_ecJT+k;jJ0M!+0S
z$1WW8TgynS{s(hM<u#OTJ~1@<;xs)~{{+BzJw9ah92mm#=eNi#RS}P<NJKOV@iPD+
zzL>8fleZD?(9pi;AQs+F<M8OTkGjjh17N(mJ!tg}p9M=zQj!!JR6!<J#@BQSiI|RL
zXK)<^>%ytDiN$OMU7dc!qXzw^2GnZc$>W%tdWgZxuUa5ji}<a6Yv0K+@VUFxt3iaH
z(dfh>@2S)pzI-W=d1~+nboo!EVuhX*ba#i5Ookvzn{?$}qyfAN)^`yfpI*n{mDwf;
z)+~O=I(Xp$Y9DS23()LU6xYhgWeX^*SSXds2!{OVhz5~JgyAkBGVF^5Eagm?YbE&o
z2Ex01h{nPQgba#;EiItzzlyi_&Jo0$280V>%#06O{g<YYpFEG{Wed4X0j61@0etA}
zi6RzjLm=prvvL}ma=@4qA<>Gag=}^e>4h9kz(O#nBN`8*z1@e%@%xy)GmL>zCmjMn
ze|=|Yp~`&m#Z(TlWE9cP2$H>Vgd%N@^&9Pncr`hZHOJC5MZK-%SCN{}AeYV~OBxB%
zuq&nKN3Xm*MR5ittr{N~xkix^CC2J{9Hv`#f4N#a<w*YN0(z4SyCo;5%rd-tGIoMG
z0|LO{whgWK7&4EB0oAvj8NS)84Gm~ph@Y7Pw{M6qd|IQU{0&SGfT@1C3(uxsR1sX1
z6KU0Fr)VxBFRwt=$+4>8DFBq3)N;e3HIh|XAspRd@)CgQQp;VhwML(9LeVMzit&pr
z;-3g;O>ndt8;+X-R-x5Rtw+F10LG<Oa|*-*H_3oo0RXAh0>JGer9c=^^%j6DQmY9-
z6oeu?AWSIFC>{dP_(F?s^Z-zVN-5wTACj1GAvQ!nY#>yeQ~+WRXWjxZF0~lj2%y<u
z{t&#CcjIn118}CS&P+UOt8LLcf<oeDo6SpU`e>)Nms*F1?%Q|?Bjl-llIH=rCDX3B
ug{N^|KM|SR{aQc^<IcO`{|@k7fB^vEYghdnW?zN?0000<MNUMnLSTZ$LAr_n

diff --git a/apps/grouping/static/images/icons/package_delete.png b/apps/grouping/static/images/icons/package_delete.png
deleted file mode 100644
index 65d5de7a1949d8b18d7bc30041932a1b8ce60805..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1538
zcmV+d2L1VoP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%q)9|URCwCNS6gfpWfcDYnb~`{EqkL&
zYYlx6h+2w^C_xM{L5WELO^k_&7!wnXJSYkgV$_7h_(HhF2Mi`8XbkWGf&mHoV!#kf
z+5)voDb!kMm+q~*+r973jOU-7Z99|zTbp!}vokyY<$ULy??2}ZQ&kmnc?p=~i`{2T
z>e%z_F|){C0W0IIcuSr5G452^j4}O5RUoSf1wOdgME{D_05Es$S&?sid<Eh|R}mg7
z!Rr#?b4lPB?gxPD4#i3c$7FctNvLmb#c*#2p4!r3q2a>A05Es%4&+-_ZvqRRp&$vg
zseo{_fIFi(_&gT)=UXR%U{Z0A#zT=j8fe_>Hq#shP!y>CmoaeuFajTSP6NTFDc{wW
zU%YWA)PZklR04NDcPZh}?!jOhBO~KP9tBpLNn4c57U`dW1q+<;`yE=SNN+i09E4f|
zYk3FPe*7GPt(OfTm{IxCeCylaLHYYDP64uBL^fSOG%}9yWFEO(0d|KK^W1j$d`?sj
zkmmN#IL4wGWYRfUt!6lDEpU6BusO`+1({}*AS~H|tB2ks5LYHZQ~;Q}_XP57AD&0-
z>?XwHc|^nG$YhGNfd%s$-SBv7V6$5^tI7gH3>YhWh)Xt;M<kNM=x~$_$ir?o!R>XT
zzTN`Yy2H4<cQux6DTjjtkS^|e`nYJawugdIc>Hd-=eyu<^1|V&K{?nJnc^=46PeMM
z6;kMuj-?R19Y%CCh6w5Kkq)_-`)TFYORtijVY7&G`;!|#CQp%Nw7RTMMMhUL(_B?P
zjl`b@pvlkhh=x<8$TIXC-`UP}a{v}qmLWC0i15+XfM}VFj5^!dhBlP*@V<T?s{93i
zVUfz&kOm3~Fp~{Tw4#!DX8ocQq4MKIx^(LVsRB_gBq5rJv7-6^0bo-p!6q!%)bX<^
zE1Is#m^2ZrVv^vP%9v&dfG=YdUrhvqemxy1P>S?WN>&J>1K@My3<ML!UobzQMBLkI
zCJ@=o49Wg+jQlc+Sa;k2z_qL%3)Xs3+d?5m_HF=#xJcPe)ICro0M2T`Dq!G;e-OEp
z$D`|B!lKunfM~aC<8mg0XwRSMKX?|N<r0>(X30x}5dhQ-y{sO9X1PT`-@!hl2So(7
zZ$s%u57I{tpcD?4m3aNAf9833wts>v`}g6-{v!~4q7i^9XDI}nfa1dgU>vW2<jn*U
zy+s7JZAR|o_b3ey5}74Pj@t6P)HrhIPD1Lvf~A|^NB8c1u&q@m0q{qGbAXc&!b1b7
zSbyv1+gP}v9mU_yKnV>~IIMb%r?ODe#`v6t8`fj+k7IX*fQTVd2-GT?Bo06{O9*$2
zV$qs;$X)0Iqok%53ioUnm?%OX=!2_mC9V&ZCIM(2j9MTT^BP`V{Iy(0gc5Jv1aT2{
zr!U`kO=81xu-iAGO*R0KWH76vI{xbb1hPy`j1h;d4_?CO#K$Ib4F{k`Q}XZKCr++X
zs;oL%`Lzke9S$H4v9=DWH(sEGQ^K?g#^*|sHb;ra4S689_Os4+>F$}Dn5wv>qiu`7
zjA!xzkBc_9SoKcm9?6P#R&+Wd@dT13xeFRKwX}pGl2G+2P`hluj>W%jzGFY+^LezB
zr0}9M-2oJ_vfKX+hH)+w-^&{ke&`jwJ<5=zXCT?GL@K(*Q`=HZrxrCfG-x0=FBr9S
z{4R3W(>vbWcK&q@{qfYP9le9!(AqI^7K$u4KshlI?OIh=)0|7jAG294a5$ZmBP>KZ
zljizpEQX%Geq4(tPruc9{Zm?Vhl6LcROz`PbtH|Ontji$_q*P6OJeKPwmn*subv9V
z4jdi|U7)|i{6z9HF<SsCARHtvozOM<JFOn^giI14iRqz}F+<Wls2$<?+{Qa?V=mTs
omeoJe=Jt!&fOxJy&;Ju(0H=;Q9+gN7a{vGU07*qoM6N<$g7OB@{r~^~

diff --git a/apps/grouping/views.py b/apps/grouping/views.py
index a47099eb0d..4dccf5d56f 100644
--- a/apps/grouping/views.py
+++ b/apps/grouping/views.py
@@ -17,8 +17,8 @@ from grouping.models import DocumentGroup
 from grouping.conf.settings import SHOW_EMPTY_GROUPS
 from grouping.forms import DocumentDataGroupForm, DocumentGroupForm
 from grouping import document_group_link
-from grouping import PERMISSION_DOCUMENT_GROUP_VIEW, \
-    PERMISSION_DOCUMENT_GROUP_CREATE, PERMISSION_DOCUMENT_GROUP_DELETE
+from grouping import PERMISSION_SMART_LINK_VIEW, \
+    PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE
 
 
 def document_group_action(request):
@@ -38,7 +38,7 @@ def document_group_view(request, document_id, document_group_id):
 
     return document_list(
         request,
-        title=_(u'documents in group: %(group)s') % {
+        title=_(u'documents in smart link: %(group)s') % {
             'group': object_list['title']
         },
         object_list=object_list['documents'],
@@ -54,7 +54,7 @@ def groups_for_document(request, document_id):
     document_groups, errors = DocumentGroup.objects.get_groups_for(document)
     if (request.user.is_staff or request.user.is_superuser) and errors:
         for error in errors:
-            messages.warning(request, _(u'Document group query error: %s' % error))
+            messages.warning(request, _(u'Smart link query error: %s' % error))
 
     if not SHOW_EMPTY_GROUPS:
         #If GROUP_SHOW_EMPTY is False, remove empty groups from
@@ -65,7 +65,7 @@ def groups_for_document(request, document_id):
         subtemplates_list = [{
             'name': 'generic_form_subtemplate.html',
             'context': {
-                'title': _(u'document groups (%s)') % len(document_groups.keys()),
+                'title': _(u'smart links (%s)') % len(document_groups.keys()),
                 'form': DocumentDataGroupForm(
                     groups=document_groups, current_document=document,
                     links=[document_group_link]
@@ -79,7 +79,7 @@ def groups_for_document(request, document_id):
         subtemplates_list = [{
             'name': 'generic_subtemplate.html',
             'context': {
-                'content': _(u'There no defined groups for the current document.'),
+                'content': _(u'There no defined smart links for the current document.'),
             }
         }]
 
@@ -91,10 +91,10 @@ def groups_for_document(request, document_id):
     
     
 def document_group_list(request):
-    check_permissions(request.user, [PERMISSION_DOCUMENT_GROUP_VIEW])
+    check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
     
     return render_to_response('generic_list.html', {
-        'title': _(u'document groups'),
+        'title': _(u'smart links'),
         'object_list': DocumentGroup.objects.all(),
         'extra_columns': [
             {'name': _(u'dynamic title'), 'attribute': 'dynamic_title'},
@@ -105,25 +105,25 @@ def document_group_list(request):
         
         
 def document_group_create(request):
-    check_permissions(request.user, [PERMISSION_DOCUMENT_GROUP_CREATE])
+    check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE])
 
     if request.method == 'POST':
         form = DocumentGroupForm(request.POST)
         if form.is_valid():
             document_group = form.save()
-            messages.success(request, _(u'Document group: %s created successfully.') % document_group)
+            messages.success(request, _(u'Smart link: %s created successfully.') % document_group)
             return HttpResponseRedirect(reverse('document_group_list'))
     else:
         form = DocumentGroupForm()
 
     return render_to_response('generic_form.html', {
         'form': form,
-        'title': _(u'Create new document group')
+        'title': _(u'Create new smart link')
     }, context_instance=RequestContext(request))    
     
     
 def document_group_delete(request, document_group_id):
-    check_permissions(request.user, [PERMISSION_DOCUMENT_GROUP_DELETE])
+    check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE])
     
     document_group = get_object_or_404(DocumentGroup, pk=document_group_id)
 
@@ -133,9 +133,9 @@ def document_group_delete(request, document_group_id):
     if request.method == 'POST':
         try:
             document_group.delete()
-            messages.success(request, _(u'Document group: %s deleted successfully.') % document_group)
+            messages.success(request, _(u'Smart link: %s deleted successfully.') % document_group)
         except Exception, error:
-            messages.error(request, _(u'Error deleting document group: %(document_group)s; %(error)s.') % {
+            messages.error(request, _(u'Error deleting smart link: %(document_group)s; %(error)s.') % {
                 'document_group': document_group,
                 'error': error
             })
@@ -146,10 +146,7 @@ def document_group_delete(request, document_group_id):
         'object': document_group,
         'next': next,
         'previous': previous,
-        'form_icon': u'package_delete.png',
+        'form_icon': u'link_delete.png',
         #'temporary_navigation_links': {'form_header': {'staging_file_delete': {'links': results['tab_links']}}},
     }, context_instance=RequestContext(request))    
-                
-        
-        
-          
+