From 4fbed625c42627c4b066ccf59a161ed5012e16a2 Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Sun, 12 Dec 2010 13:15:03 -0500 Subject: [PATCH] Unstashing the previous changes --- categories/admin.py | 2 +- categories/models.py | 4 ++ editor/item_editor.py | 35 ++++++++---------- editor/media/editor/images/arrow_refresh.png | Bin 685 -> 0 bytes .../media/editor/images/collapsable-last.gif | Bin 655 -> 0 bytes editor/media/editor/images/collapsable.gif | Bin 1518 -> 0 bytes editor/media/editor/images/cross.png | Bin 655 -> 0 bytes editor/media/editor/images/disk.png | Bin 620 -> 0 bytes .../media/editor/images/expandable-last.gif | Bin 670 -> 0 bytes editor/media/editor/images/expandable.gif | Bin 1539 -> 0 bytes editor/media/editor/images/folder_add.png | Bin 668 -> 0 bytes editor/media/editor/images/folder_delete.png | Bin 666 -> 0 bytes editor/media/editor/images/folder_edit.png | Bin 733 -> 0 bytes editor/media/editor/images/leaf-last.gif | Bin 615 -> 0 bytes editor/media/editor/images/leaf.gif | Bin 1458 -> 0 bytes editor/media/editor/images/line_bg.gif | Bin 93 -> 0 bytes editor/media/editor/images/line_bg_over.gif | Bin 251 -> 0 bytes .../media/editor/images/line_bg_over_last.gif | Bin 235 -> 0 bytes editor/media/editor/images/minus.gif | Bin 267 -> 0 bytes editor/media/editor/images/page_add.png | Bin 739 -> 0 bytes editor/media/editor/images/page_delete.png | Bin 740 -> 0 bytes editor/media/editor/images/page_edit.png | Bin 807 -> 0 bytes editor/media/editor/images/plus.gif | Bin 167 -> 0 bytes editor/media/editor/images/root.gif | Bin 1004 -> 0 bytes editor/media/editor/images/spacer.gif | Bin 43 -> 0 bytes editor/media/editor/images/spinner.gif | Bin 1553 -> 0 bytes editor/media/editor/images/tree_line.gif | Bin 197 -> 0 bytes editor/media/editor/img/default-bg.gif | Bin 844 -> 0 bytes editor/media/editor/img/disclosure-down.png | Bin 313 -> 0 bytes editor/media/editor/img/disclosure-right.png | Bin 311 -> 0 bytes editor/media/editor/img/help.gif | Bin 1582 -> 0 bytes editor/media/editor/img/icon_deletelink.gif | Bin 181 -> 0 bytes editor/media/editor/img/important.gif | Bin 1492 -> 0 bytes editor/media/editor/img/info.gif | Bin 1487 -> 0 bytes .../editor/img/item_editor_form_title.png | Bin 1253 -> 0 bytes editor/media/editor/img/nav-bg.gif | Bin 273 -> 0 bytes editor/media/editor/img/title.gif | Bin 317 -> 0 bytes editor/splitpane_editor.py | 2 +- editor/tree_editor.py | 18 ++++++--- 39 files changed, 33 insertions(+), 28 deletions(-) delete mode 100755 editor/media/editor/images/arrow_refresh.png delete mode 100755 editor/media/editor/images/collapsable-last.gif delete mode 100755 editor/media/editor/images/collapsable.gif delete mode 100755 editor/media/editor/images/cross.png delete mode 100755 editor/media/editor/images/disk.png delete mode 100755 editor/media/editor/images/expandable-last.gif delete mode 100755 editor/media/editor/images/expandable.gif delete mode 100755 editor/media/editor/images/folder_add.png delete mode 100755 editor/media/editor/images/folder_delete.png delete mode 100755 editor/media/editor/images/folder_edit.png delete mode 100755 editor/media/editor/images/leaf-last.gif delete mode 100755 editor/media/editor/images/leaf.gif delete mode 100755 editor/media/editor/images/line_bg.gif delete mode 100755 editor/media/editor/images/line_bg_over.gif delete mode 100755 editor/media/editor/images/line_bg_over_last.gif delete mode 100755 editor/media/editor/images/minus.gif delete mode 100755 editor/media/editor/images/page_add.png delete mode 100755 editor/media/editor/images/page_delete.png delete mode 100755 editor/media/editor/images/page_edit.png delete mode 100755 editor/media/editor/images/plus.gif delete mode 100755 editor/media/editor/images/root.gif delete mode 100755 editor/media/editor/images/spacer.gif delete mode 100755 editor/media/editor/images/spinner.gif delete mode 100755 editor/media/editor/images/tree_line.gif delete mode 100644 editor/media/editor/img/default-bg.gif delete mode 100644 editor/media/editor/img/disclosure-down.png delete mode 100644 editor/media/editor/img/disclosure-right.png delete mode 100644 editor/media/editor/img/help.gif delete mode 100644 editor/media/editor/img/icon_deletelink.gif delete mode 100644 editor/media/editor/img/important.gif delete mode 100644 editor/media/editor/img/info.gif delete mode 100644 editor/media/editor/img/item_editor_form_title.png delete mode 100644 editor/media/editor/img/nav-bg.gif delete mode 100644 editor/media/editor/img/title.gif diff --git a/categories/admin.py b/categories/admin.py index 8ebdc07..65bdef3 100644 --- a/categories/admin.py +++ b/categories/admin.py @@ -76,7 +76,7 @@ class CategoryAdminForm(forms.ModelForm): class CategoryAdmin(TreeEditor, admin.ModelAdmin): form = CategoryAdminForm - list_display = ('__unicode__',) + list_display = ('name',) search_fields = (('name',)) prepopulated_fields = {'slug': ('name',)} fieldsets = ( diff --git a/categories/models.py b/categories/models.py index 9ed278a..0dd975e 100644 --- a/categories/models.py +++ b/categories/models.py @@ -38,6 +38,10 @@ class Category(MPTTModel): default="", help_text="(Advanced) Any additional HTML to be placed verbatim in the <head>") + @property + def short_title(self): + return self.name + def get_absolute_url(self): """Return a path""" prefix = reverse('categories_tree_list') diff --git a/editor/item_editor.py b/editor/item_editor.py index f0e3386..00f72eb 100644 --- a/editor/item_editor.py +++ b/editor/item_editor.py @@ -4,18 +4,16 @@ from django import forms, template from django.contrib import admin from django.contrib.admin import helpers from django.contrib.admin.util import unquote -from django.db import models from django.db.models import loading from django.forms.formsets import all_valid from django.forms.models import modelform_factory, inlineformset_factory -from django.http import HttpResponseRedirect, HttpResponse, Http404 +from django.http import HttpResponseRedirect, Http404 from django.shortcuts import render_to_response from django.utils.encoding import force_unicode from django.utils.functional import curry from django.utils.translation import ugettext as _ -from feincms import settings -from feincms.models import Region +import settings FRONTEND_EDITING_MATCHER = re.compile(r'(\d+)/(\w+)/(\d+)') @@ -46,9 +44,6 @@ class ItemEditor(admin.ModelAdmin): """ This view is used strictly for frontend editing -- it is not used inside the standard administration interface. - - The code in feincms/templates/admin/feincms/fe_tools.html knows how to call - this view correctly. """ try: @@ -57,7 +52,7 @@ class ItemEditor(admin.ModelAdmin): except: raise Http404 - form_class_base = getattr(model_cls, 'feincms_item_editor_form', ItemEditorForm) + form_class_base = getattr(model_cls, 'item_editor_form', ItemEditorForm) ModelForm = modelform_factory(model_cls, exclude=('parent', 'region', 'ordering'), @@ -81,7 +76,7 @@ class ItemEditor(admin.ModelAdmin): if form.is_valid(): obj = form.save() - return render_to_response('admin/feincms/fe_editor_done.html', { + return render_to_response('admin/editor/editor_done.html', { 'content': obj.render(request=request), 'identifier': obj.fe_identifier(), 'MEDIA_PATH': settings.MEDIA_PATH, @@ -90,7 +85,7 @@ class ItemEditor(admin.ModelAdmin): else: form = ModelForm(instance=obj, prefix=content_type) - return render_to_response('admin/feincms/fe_editor.html', { + return render_to_response('admin/editor/editor.html', { 'frontend_editing': True, 'title': _('Change %s') % force_unicode(model_cls._meta.verbose_name), 'object': obj, @@ -100,7 +95,7 @@ class ItemEditor(admin.ModelAdmin): 'MEDIA_PATH': settings.MEDIA_PATH, 'MEDIA_HOTLINKING': settings.MEDIA_HOTLINKING, }, context_instance=template.RequestContext(request, - processors=self.model.feincms_item_editor_context_processors)) + processors=self.model.item_editor_context_processors)) def change_view(self, request, object_id, extra_context=None): self.model._needs_content_types() @@ -121,9 +116,9 @@ class ItemEditor(admin.ModelAdmin): inline_formset_types = [( content_type, inlineformset_factory(self.model, content_type, extra=1, - form=getattr(content_type, 'feincms_item_editor_form', ItemEditorForm), + form=getattr(content_type, 'item_editor_form', ItemEditorForm), formfield_callback=self._formfield_callback(request=request)) - ) for content_type in self.model._feincms_content_types] + ) for content_type in self.model._editor_content_types] opts = self.model._meta try: @@ -165,17 +160,17 @@ class ItemEditor(admin.ModelAdmin): # Prepare mapping of content types to their prettified names content_types = [] - for content_type in self.model._feincms_content_types: + for content_type in self.model._editor_content_types: content_name = content_type._meta.verbose_name content_types.append((content_name, content_type.__name__.lower())) context = {} - if hasattr(self.model, '_feincms_templates'): + if hasattr(self.model, '_editor_templates'): if 'template_key' not in self.show_on_top: self.show_on_top = ['template_key'] + list(self.show_on_top) - context['available_templates'] = self.model._feincms_templates + context['available_templates'] = self.model._editor_templates context.update({ 'title': _('Change %s') % force_unicode(opts.verbose_name), @@ -197,9 +192,9 @@ class ItemEditor(admin.ModelAdmin): def render_item_editor(self, request, object, context): opts = self.model._meta return render_to_response([ - 'admin/feincms/%s/%s/item_editor.html' % (opts.app_label, opts.object_name.lower()), - 'admin/feincms/%s/item_editor.html' % opts.app_label, - 'admin/feincms/item_editor.html', + 'admin/editor/%s/%s/item_editor.html' % (opts.app_label, opts.object_name.lower()), + 'admin/editor/%s/item_editor.html' % opts.app_label, + 'admin/editor/item_editor.html', ], context, context_instance=template.RequestContext(request, - processors=self.model.feincms_item_editor_context_processors)) + processors=self.model.item_editor_context_processors)) diff --git a/editor/media/editor/images/arrow_refresh.png b/editor/media/editor/images/arrow_refresh.png deleted file mode 100755 index 0de26566d4102eec080253c2d08985ec58b14838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 685 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 diff --git a/editor/media/editor/images/expandable-last.gif b/editor/media/editor/images/expandable-last.gif deleted file mode 100755 index fb468bc3f19d367fd7f56e1b33adf48115ef95fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 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 AfB*mh diff --git a/editor/media/editor/images/folder_edit.png b/editor/media/editor/images/folder_edit.png deleted file mode 100755 index ad669cc7814eb52a0990c156e4358bd8d523089c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 733 zcmV<30wVp1P)Ln`3m6cBjUs{~SZF1Q|l+PQ4$F&BPWU{LQ5Rm}%Yp+9Uy#II9~vucwq!AZ0U3VS=&d(VjEIGJ6F` zxEYZ+Do*Dgo&xS90WcC^bwyaXLaY<13Xc{ys@jsg}$ z5G+=Y;0}5=7O5P92480MbaXQ7%}6B`AYHKOFX}h+}d5}LKg{F2q&8;J?*AuZJvty1~9)ANwocD zyswqfv|ByYH|QiPmSI$m{Oe0B$hidL4Saj?irNjUNTgedgFr;v@FyS$FAiPZ+kvpX z-^tbQJARF~w@xzf^f?uc>#?PNS(q}q__!blpq^>0+$ab5#~RNbYmZJJIiAFc>3MLM zPag)Sv-P!|JI?j?{%Z?=0rqdL^*1#yN_MoZL{i~%zgRlF`+VQf|HkwKvQRq#2{xLW P00000NkvXXu0mjfz!^#T diff --git a/editor/media/editor/images/leaf-last.gif b/editor/media/editor/images/leaf-last.gif deleted file mode 100755 index e5d301dbc3f2631501e5b95c7b406a431dbc217f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 615 zcmZ?wbhEHbRA3Nec;>`#`|bbIip38<{D1lNe?vpV>({ThZ{NOc+qR1@|DSyFzkTJM zl7>xhzy1IH`}h0z?|=OMfAHYJCr_T-c>Vvt{r`s_{{Q>;@8_TY|NZ|zW&fuMi%&OB zJsi6H?XJ83GYb}Vt+;vn`S)YTj@5Q<`}gl(eczsz*{6zX)_wW%_2c>3+^v;Wy8OTYg5U)8*!ec`2^ zb@%`L{U4V&p?~w!Z@>QEeE4?qs!RXDfMI9?#h)yU3=B>TIw0qR;)H?yNP|;Tb4zPm zdq*=%XHRdR1lPn#T-8u~j-tHknrimk4%7NNbd(%diSx^IOH1-~&g`%iUCnQ9 z!o5dfS-aILetsTiW({paw#_|q)<=#qGcX9Lp5EVTX(x7+iRlW5!S(j;r%unDRPHd} zyUby#_xMJW)Ume=9GskHpFS(Ux&Pti;tLDqw+U!5DV=anbmDH_U!YO5FrTSiQoxt> u#)*x}{2ZS-TpJ1&EIBzzK&eIM$^pm5=?3xBqC7V*J3HH=_#YPwgEat>Gwlih diff --git a/editor/media/editor/images/leaf.gif b/editor/media/editor/images/leaf.gif deleted file mode 100755 index 2f5c2ef101febf9a37aca716839c6fffa776c04d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1458 zcmdVXjXM)~0KoBixo9{-51H4YmsK=9MOM1jJ-MrMo|02WSsqU(C)vn*8>5l;ciS*5 zHY3B>>_tMjQeIMwO>*82IZUj1``z_t-1jf|JkQtl=Sxm!u$GW|^;tB8NF+*^KzJl$ zas|wc&jz|scT+S*!PUT$x1-`UxbEP^#9crgJw zC&4ZN)6>&;gG;w}KyU;rKEE^YL4|Zq(cRshRyTo*t;=Pg(q6A`f}pU<-Q8XMqxvVT(Tzg zB`rPUEHpa@s;#G+mYU+EsjqwZw5_8yydWd_2Rlu+k&e0cITyVYO0tc9jm|L#ZLvia z*^;fJ^S!$I$wT&gxM?R$UUsRgs2EuFwk2Ia8g{9vz1KQ2LQb7Q&!UgY)ISbsIm4zT z38vjkDq4H@9+xLIkq=7ZI+^`w@*~M5mT`+EJqdb14{@i7G^rc6A2*Qo`(w7Qxum|H; zIy4=ze%G_=I%nYx`-AOBo#c6fnKO?iX}mn>?I~S5Canqq5yEs-cAb|fV)gL{QK9|K zwv5@a{l64G@aYWM$Mvi&KzjECSY_sG7vQ{ly^*&+_~di1_q$*4|IV~1%zE(3)kB`? zd8e)q1!8k^DVkzHhc3$=&*Da&*?*+0`^*Qp5PBq5`Ua#Jn{it^I0DvR>7v1cd+ z`JqviLQ1@VQdE+yq)^Js&zR&mvnf=BXcD zS$-2PtgP^L*sNq=(au#*1Fl6^RR-P>R%N@~+pJ=SCO9)$;W(;Ibrf~%Ap2#*6VuXX z>}Y1q>wWX(wK0E zgR48a?2YF*0xG^9r7OiZoVS35HD0vGgmGQZ)54mrxJ$#D-EYIfc}ONIobN@Tg|}cb zG2tR#`c`urmV@GT1kBMMb{W&nR>$C?XGodqkX!xu9*$3$%zWx?eHW2$*77Dc_cOmY z8WrjEhJ^8TdYwwzZk$f>Fc!SZ94Z#PrA^5Mee^X`VLwC7S2(~lC=m|USdRUqMu3O|9-qpf!Jq~l5zY&3_ cD`pU+ew^-%Nlt&o*BJkh76oC>P!ods7oo?qr2qf` diff --git a/editor/media/editor/images/line_bg.gif b/editor/media/editor/images/line_bg.gif deleted file mode 100755 index 3189f90b48731132ace8dbd78702ad1510cff9df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmZ?wbhEHb3}6spXkcV$XlVHV|G(l-7DfgJMg|=QAOOiQFq!o9uRQ&hU%F$DOlXHEpml@pu<@f9l{}k5tBVFq|T;wKCU}CTa03>lHDgXcg diff --git a/editor/media/editor/images/line_bg_over.gif b/editor/media/editor/images/line_bg_over.gif deleted file mode 100755 index 421883d7d6abb801120a4635f88ec3b091c2b877..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmVNk%w1VNd`R0K^{vfPjESMMXwOMuLHXNk~YdqM~_vdUA4dWMpG&YisiI z^HNe$k&%(As;kP&%Cobw+1c5`!@^BXP5b=&_xJbg?d-a{yXWWTSXfv8|NmZIUf|&1 z($dn2ii(<=ng9R)A^8LW0018VEC2ui08juF000Ge;3tkBK$1alu59bRa0~|m@k!tE zVW0LPpTy_zF?{g_W3_oOha?prJ3HqNST506TG> Bg8={l diff --git a/editor/media/editor/images/line_bg_over_last.gif b/editor/media/editor/images/line_bg_over_last.gif deleted file mode 100755 index b43d2b600d9f03f5319bd488e2c871995f4c956f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmVdSLu59bR@CZbQH+Yrz zc#KDQ0gu5`@JKuy55=?abUYf*#N+TlJP6OmWAR)(0uRQM@H9Lbk0Q20vET5xd`_?1 l@A$la&+q&HfPsR8goTEOh>41ejE#>Gr9V&Dp_|s zvHU1wxSPWGzfJM$ilT=Z%>T}=dsoJ=$B*Uv*4}^DcD%2b*yGH)+KX*}q|)myhc9!J zS9@{n2$I_4#JV#`{682l&e ezP!`LA;PWM<44=L^tZou44AubhTS*)M diff --git a/editor/media/editor/images/page_add.png b/editor/media/editor/images/page_add.png deleted file mode 100755 index d5bfa0719bc3a2ce4fc529403f0acd6b6057c956..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 739 zcmV<90v!E`P)BG67=JY6c|L1R-#TR>fC$3^Y%QEnYO1xHsf)+GU`3F<{J0kR(;pbF3)zyg$H+idfnl-wl5Wkh!vUH z4Z32YP=l_}1rZd1W_D&^$A($A+&a0e&P?xx0!ctY2}*<#p+qPVN*B(YzvAWXa*%bzq z7Fz41LKILT(GWohi9|LgIzSZBhb*Zf6R6O}WYQ4GOi&71s9lmll0x6;8&ILOl$j(c z0Z1T(6Tg09{?wd{moFHNN6PS?$|e>1MxSJ(0Z7o2)J-Zv|>acY@f`(Y@g7GwsEj5NLQo+q|HsxQ5}XSX_d@*^A9ZT9=A{W~j+$GyI1 zc4oqTHx@1FlRjw4XWyPN5i2~l_F3@aBk!0yu^aoRDvXy}8@HCjUVQUsuSH4$T5|r< zzZOn^?Wfa6y|Q($Hx4{ws+)wX6-HP4zo!S?4KJ@7PG@G3G{CjXs(p*kIrj6rHs7_y z+=<-=Q62s9FuWa^X~WKgJIAAZJR&XBB002ovPDHLkV1jCMPILeO diff --git a/editor/media/editor/images/page_delete.png b/editor/media/editor/images/page_delete.png deleted file mode 100755 index 3141467c678d2b53f79deb22086a9cb3a576a08d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcmVP z|1Ep}yDQG09bP~E^Dk?@JiKQJ z6-pO(3~IOP)IYisL6D6;oAEd;E%zR}{U$rMRNuD6nQV7nesKS>)yLo7JuDCrD>Abi zbj3uW23?^GA}9jQ{M^8v?ejL?HaT7AX5WPZNkBmfN`w-jL?{tT7ykZt$%Yln?p_m~ z-?>&d(LD(jAd}h=LPltPQbO$*Wbyl@G-_k5jXbb#qffHY03>M1jfEqoPJQ6Mr=Byp=^jfzePZV1 zLjCmNi31hdIJHa%e;5g=1(`u3BRzfeExY%=VCu{loOr{`%2hUR*x>tL^W_TTaj);0 zpPR6CUD1+0>4TQ6zVfH3TQ;%l6#(_%yspK@3gcmG#Q4!WCPyLU93nMKk7E2pcA=l45({2jNho>sdF*A~bA zxX?-cp~y_z_kFf+yqu3m#QiB}03?Z&9vvR5TNgj<)($Vm)xq5G>|o2sFMag&6aNF+ WAT1?sQBYt20000iHtsh1EzPArg^Q zIZrOk#rNsfjaSbMAL;<4h;Z=jvu8dzyz8N&Nb7=z03ZUw?9z%8KQEa6yM5=kUnka& z3?FJk2}L7q>na=T#;<7U*P91xfF`;`6%pVgWgRy0?1ZryL@%z52=-!fGXWGEn4M351L4<+7eDgwo|moqXT+s1&Kmn>-uQQ8mL7XY)w5Zk*(g+<3Y3tmkR!bL zOUKaUtj_pX26sH+=Iorwu}MGd`_%O-_sS}8VpG#fJA)Fcs#ezwtZf?q?Ac70mDv`rVs{$od?VPKeqf<-kUjNtS6ecB*mq<&M97K^6IVsDO zt2$Ru!b+>2S<}_H>$RcInusU_8PMNdf(W{sNlJ3FkrwMJPeBPO#d}Y^a{9TH(#{Y) l0D?dWAV4eUJX#h`!2gmISk&ZKd4B)^002ovPDHLkV1g&sd|Lnj diff --git a/editor/media/editor/images/plus.gif b/editor/media/editor/images/plus.gif deleted file mode 100755 index c253770d20e01c71111379185f61523dff4f5e9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmZ?wbhEHbWM^P!I3mRm*Wnr7uj^B7nAYdN<;v6x&vsemDz@)TXk48b+2YZ&Cw1es zN%>Rb+jk{wygXssl{wwJlKOXNnP*Gd7AW-YO4)R2YX6?};2sUfV%7g(z<>%Af3h$# zFi0`zfP_JIGO(&FSZ3&~l*JL~(#U4vy)0t#hm;Cc$$-hSCTClN7RLBVaJq>wF<1it D<=H#$ diff --git a/editor/media/editor/images/root.gif b/editor/media/editor/images/root.gif deleted file mode 100755 index 27012fbd642dc2777f75027cd6e1d464d166c19d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1004 zcmeH`+fR}K9EQKpDVZ5Ao9Qey&Dmy$)eTy1=@#KyE6lQVDOlJ@^VFtg%>%SV&BQVe zDS;@cD@{HzG!Gz{LJ)YsJdp~h$#Uwn)oiO@`bTuvyZ7R`d$(tM&qfjOp%ff~Lw+KN zL2KeXkw_c6Xz_VDw@Y%<%IMjZMGv`U41Q%vZAFo=>RF@Y75chXuISM8v=1bbvXf%& zrzRE->c{#NpVDuZQse1aG!`}PY2ky~YOYk-ZOlsLKQBk~a^)F!gq+H*Dqi=fX<>M1 zwySfjPi;n}A2Kt<1cHb_;1P+u*jRpAS|^n%rqOB{j1~?@%VH^bJT;rG5Q~Qdf_|CI zERhVfwT(76>!ng1it3u0RC2klzkkAHnpdlbES43uTCdlSOij%gjl&j;b!KL^oNE*} zPuJ8dQ;Nrn8)g&OHZpfEkz;EeunAgqx9S$kg;GkxBJ2HhX4m%u)sK4p;x*|qUu6zO z|B%`@LfhcfI|!GsD6R= zH>|C#EiW%GEiKvYcB|D20LcIRGXwq`j@uBV6bac{*!l#5)gqqTJ@9qpUhe=Ww~$~* z?5=|(S&a5rghh1Vl78GPhKchF_t}5dCt6|&*b|_BOC}Wdwgf(%o)K<{{Vd48>V~YigIVMtACjF#^W7ce%>Bmgc_{7Z&-q+ fy@iZA?GDd2FJ7!E(1;KWu>eOwFfJ|*806$%dU|rI diff --git a/editor/media/editor/images/spacer.gif b/editor/media/editor/images/spacer.gif deleted file mode 100755 index 1d11fa9ada9e93505b3d736acb204083f45d5fbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 scmZ?wbhEHbWMp7uX!y@?;J^U}1_s5SEQ~;kK?g*DWEhy3To@Uw0n;G|I{*Lx diff --git a/editor/media/editor/images/spinner.gif b/editor/media/editor/images/spinner.gif deleted file mode 100755 index 085ccaecaf5fa5c34bc14cd2c2ed5cbbd8e25dcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1553 zcma)+TTl~c6vwlh>nb99Af5rT)t{mCEg5urg=A(g z{C|6SPb~9Xage|wB`SrZk2FOMYM!buln2sX?5Y+T78iB(Zu9cS7|LZyZ++}u$^oi1 z_j@S}bW9OzU2R+RMy&~OT>X-oZ98$jq#ogNfJ!BM-42wHGZk*6s2KD}U*IA%epmxb zm}|6BK9YoIF;*xSL!+z@<64lB7->LTW2Vi4ostCA(z&2XniwNIv}fFo-`MbG;)u4G z^p@F!)|9HhZprHd_vXjDoxs6WkK-6P0@lfxnGT>*p(QHoUV=u1FAqb@b%*W=a3{`LsH5k^AvQNL>6fPpy#oU(&MuH(*aEX4b35*} zn4n7)`I2U%=+Z=?BVZQ?vjQFW4gD@~XSOO6b{qu81`4&LFuU2(ilxW+1|ZkNMnWe79C$gs zWT?Ele|HR{JGPe)5BTW>0Ey?-Ls6S#GoV0tbt6ku7B&*0 z;i9QM$W1Rj*rRIdceL)rAOSl+sDe3LkB87<%){;ZdHp6|SNlopDXRx< zxBDF9-lTo&v`8$humFygUij@qgT=Qzhj8{ym2-{Xciwqq_Xwk%=O3B-MNAL_6e`3U zyxwmXex4`g0^1RYw~Dth3av3Dl^AAlpO3mG!nLr#&ZZ7c_wUboI+deC+&%TFjK2Lm z!Y&f1h|T_On%RCV&=4bx`!>(YezqGVhl&QpED?N6GV)HmzJ9&rh$x*i?*@o9#6QI< z5ZI_MRX;0+pY8$`j)eF#TlUyG(eE%E7S!rj;mj^M5vhUicPm zVWQ2z+imFyg}SRABmOBY_@osR!>7Ov!ioK`NB6_Rv}7Ud?35ed5Sb@?yND?kv~RCa wqs^a3Sh>&&L4)!LKI?D2&k@))k(LESaga|C278ChSzn3NWVkcuNoY&{0f?~U_5c6? diff --git a/editor/media/editor/images/tree_line.gif b/editor/media/editor/images/tree_line.gif deleted file mode 100755 index 2d6fa89c69533a0c18a08bc77dfdc6cbe4ac94f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmZ?wbhEHbv|(UnI3mu_-roN6=g%)+zD$@fVcoiQPo6ya^XJdSix(FzTzKl#sl$g4 z&z?QIxw-lJ_3KloPTjL-&-?f9@7=q%V#SJAuU>84y0yEzyP=`s|Ns9CIDq0$7DfgJ zaRwcbJjhN4R;LA}y(yXVGFGiys=BE_XYsm>`0r<94ur-wcR${=LqTs6_d}Wc((SfDPyV2;h%;kux&VHiEgQv@Yq{*Sa z+l{W!qQ2X>&*yuf#)zuThN#S(y4aey*L$GHimcC{yxF9{+^)ysgs01&yxO+S=DE=5 zq`=*$!rrpW%Ia#o)Ef<&3V-tHt57%Hx^1)~CYVyVB@=p~tMo;ew{h zv&!VG#o?8+)Qqmrnz+`6sm*|+$&#|ts>I*7&E~4Z;GetNkg(B_veJR3%8#$nw9VzU z&E=W6*PXi9oVwYCsLX|_%&NoRhN#WD(ddt_(zwp%xX$ON!QH9E;Dn~jv&-bS&gP%H z*|yE)hN;YZp~kn*=6s;Xx6kLIz1xql(y__nrNG^btIvL;$&0MdA^8LV00000EC2ui z01*Hm000O7fB=GngoT0x1WZIsh=@c4X^)Hq8yhz_C@7YhmN%6fC~FO)b|)tdr>LlS zYz-PAudpFmS#fh3xFN7$Mg_iMy zEiEN27bWH6=HM3>ML{o4NKx(YFF{dAFGWZyZdf27DgX-9f+e7qGeUGM>CmP_hlM&i z=nx`A;t~!VesHj0A)^I895r&}pnw5`k|<3oSa~uJg9;fkY^eZKW(JxS@T~!jKv(R@CsZ0tXHsK5$_Dsx`$288T9sm2&pO z+7vRWKDg+SBgd5e%P{b8aRo*W?sqc!F7?*V=;5UWmmTqC&fQ#xLr#*z*5Slc$6o= zlvgLf+&JSDw{eJiL}KX8T@NGp9&5F+ zl^Ck6NI&r4?D6+Juleq@csJcpFihz;c04S}S2kzI@ef~*=NqtXym)|3?8}K?-#+tS zkPMed$k~#Rt6=%)z&tiXhlxx_xF`H&No_vDvmi@?fr*Di_@% diff --git a/editor/media/editor/img/disclosure-right.png b/editor/media/editor/img/disclosure-right.png deleted file mode 100644 index ff2ca80438a94d9a3c023838b1268ce354dde939..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmUKs7M+Sy#H?H_c7ye%P{b8aRo*W?sqc!F7?*V=;5UWmmTqC&eAQo*wxrvBNS#a-Drm zxA$a5;VY5}lO4NO3$KyjI^-+i^273?X~Pwh4GwpEn0!oB4p!W4oXunHcPIJBx6k}O zS`D22yCs`su1Nmkj*-aun)+ayf#C#>hz0WwW^s$D*CsT!6*Fx*WNbdqSm$Qp)Q4w} zzkiXIqhJ}~*=Mm~xg*bnJcT%hsV-q0LdFfN5*auQ82AjmYP=(hjsQKy;OXk;vd$@? F2>=C1Z|492 diff --git a/editor/media/editor/img/help.gif b/editor/media/editor/img/help.gif deleted file mode 100644 index 3b514253179abc826410a1c983b15d1a3239c95d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1582 zcmV+}2GRLPNk%w1VITk?0QUd@a-QcgY19By)8y*(0Y$ncH=K#G^kS3d07=4csQ(&X z(dz8=8bqk<@%PQv>NrNC3roHrT+OS`|3i4w09o7{SPmH8rU=6$U5 zMPst`_4yGqq#iGHmg0uan%>SCf`vOS5jJNqidEQZl;Q%?Y ztGwPVWyuXrz`n%cMU3+(aP}i%+HtEt+2HOraMl|! zn^S|*dwaXt;_(1P!4Xl&E^*#cknR8d^Zxtw2NsV%dfauD&`EvT|Ns5}|M^IL)&2eZ z|Nr#;`}hDvwp@+nTZYdCKdlf$yB{T!PHeVYT&yKu&^lVK4^GH5Jf0mZn*aa*|Nr~{ z|Nb|7=5&R@I(*{>K(26|>;O8fK863=8{ zH*(v0pxsQ4@ob^$S%AuJo!^$k{qXJR2qmB#Adiur&5NhlnWN8`sME;N=+58sB`cMp zrO{rc|7o4=ZlLf1JEyq5-e!)|T#)Vh`}lvW@sg6pXqV}l#{X)agfOd`FNMm5h<1R z`1ygA$yko*A^8LV00000EC2ui03ZM$000R804E6?NU)&6g9sBUT!?UuF@KD>Fkm2q z!zFwj7#?iJq22@@S~h55_HPCQF2sgYrUxLwtfsB5#$0uv--5?~qiV1-5pTm;?9 zkt9eP1Jck)lePn0x^qP2_*m#bMwT2Bk|Y7Z%g>oByi`y#aR6F|5+0@^T)@Q}(I82% zoq_h*8ix=^CTXfneSym_Gtu3>Stvl1n990Tl%Yr?1YN*D1{$OaDGDeIp@SN|WJE=p(SxeMqJTgbuc)DeA;=bL0}wDk5YHm25LC$&^XQ^MwZWEgj2?uf0cEn_ zCi2b?bR2|ADO8*?M6h_0SO;rBs7H>0hFMCu{v1e4GuPt07Nq|WOB#I(=6nS9Hm&|$|?kq@Wd0FeA`SS z5WFJ_AKYkkfe0R)fQKtO;2;GA5J-W8Jn{U13@9s2vc?OM{E$KfAAF!d1@R~X%p!Cw g7q&nRgi*u;1&ASrB#|@=^1?cE2QK*F1O)^DJ1*7%H2?qr diff --git a/editor/media/editor/img/icon_deletelink.gif b/editor/media/editor/img/icon_deletelink.gif deleted file mode 100644 index 72523e3a3ba1446c8f768c157cea642119a02741..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 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 diff --git a/editor/media/editor/img/item_editor_form_title.png b/editor/media/editor/img/item_editor_form_title.png deleted file mode 100644 index 5b7b4e0fd69420f47d444b6b82268915a1db330d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1253 zcmeAS@N?(olHy`uVBq!ia0y~yV15B)%X2UR$=~}5`hgT<>&kwUU69w@M2h=NJp%(vxu=U`NX4zUcWqb4x=I}VxHX|( zKRSEuS{)YaV2x9z0=->go=aCK{9w~+5l}fH>LN1nfp?Ab27$nU=DH5!(@AOH=GDI2 zshLu};fH_W4D0H;;@dOZ)8~D3xBsIn)$6wSVup!S@3;SX!9t#!gd(Q})jt!Hm7Bga z;#^k1G^R!e1py8gAhk{P--q4%U+vqQe|hh%jo>Kowlw*~I+`I~-v z>CM~wR?nPczD~7fy@u_w_|L^q`xOLEv>kb0|MU1gw%T)jo?-5ddp~;3c^dS3(rRWT zN1E^Z@mEjM&`P~IO(lD_;&nN=4|1HB1zr07;nmF#kNNDM_vv%%r?YrE`^Y0HsCoPO ze#%m@S)IS1Y?-+2P2-MSB;_}nKTv+-%Wv|hfyO(pL z_KQvZ5)f;2*!M=I6ezsF&c4~_v-^nZ-X}d?)4bO%y>g-^%i{jZ~z` zd~pjr0HP;txBs~`{XCE5$G3Lb`o6+z_iek(05{4~=%cj!|2KyNe=>{5-u6s*FQ^W8 z)F=7LE2jhA74M7R?&h5+U+?+u zrRk&KY06G*vrJF_UvaSpZr&!tkE@s4fAy`=H8#%qzBlL7U85(}r)&^zQJOhTp!&|d z=u0x&-(QcK9=-16WkfW6?1Q;c!YhHGs{%H>X&%ldV5M{oxW$+81IIA6SY7+rR9o*j_$+%8@Wzrk;rij}`HJIdxIeY4~t7m@vTD$D<%Fj}l@?ky`I5F{rz1u!TlP8s(phAqn)78&q Iol`;+0J2&R)&Kwi diff --git a/editor/media/editor/img/nav-bg.gif b/editor/media/editor/img/nav-bg.gif deleted file mode 100644 index f8402b809dc1efec80db6e466d789f88429a79a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmZ?wbhEHb6l9QRIKsg2{rmT~Z{I$D{`}ReSAYNh{q^hDhYue(@t*9{u_A=gpfpKY#xG_U+rVXV3oq`}hC||i=Q&8(m$()z5YF*CjUEw001<4;4tjrTwH+&%FA_x~E6rskH`CdQ7= zuI>)uzWxal`(>Zw+Pr1!Chi?O LckSMx$Y2cs9wnNk diff --git a/editor/media/editor/img/title.gif b/editor/media/editor/img/title.gif deleted file mode 100644 index f92b59665df2fd0d1c5e798af0945d14daa880bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmXw!J4?e*0EI8wN-32h7TQhgQjvln@ljoL@C8l|R^8kj6#5fHry?#Er!G$Z0e^zs zG`(qJ;%%Db=Jw|1)uw4iH`{{Wa5x+e2hQQ~!B*)i4zfT7Ac~^laMaX1K}04b%WX}Ye94MPwF)JDW42FALk8HT|avmJZ1Lc3i`yOJcip7+J`vMh_D zG|8yn^VidsEfmtRdOgm? IU-!VyACo}9@&Et; diff --git a/editor/splitpane_editor.py b/editor/splitpane_editor.py index 8ce75a4..2c82211 100644 --- a/editor/splitpane_editor.py +++ b/editor/splitpane_editor.py @@ -11,7 +11,7 @@ from django.utils.encoding import force_unicode, smart_unicode from django.utils.text import capfirst from django.utils.translation import ugettext as _ -from feincms import settings +import settings class SplitPaneEditor(admin.ModelAdmin): diff --git a/editor/tree_editor.py b/editor/tree_editor.py index 4cbc053..a6e6399 100644 --- a/editor/tree_editor.py +++ b/editor/tree_editor.py @@ -8,7 +8,6 @@ from django.utils.translation import ugettext_lazy as _ import settings - def django_boolean_icon(field_val, alt_text=None, title=None): """ Return HTML code for a nice representation of true/false. @@ -146,12 +145,19 @@ class TreeEditor(admin.ModelAdmin): Generate a short title for a page, indent it depending on the page's depth in the hierarchy. """ - r = '''  ''' % ( - item.id, item.id, 14+item.level*14) - + if not item.is_leaf_node(): + prefix = u"%s\u25bc" % (" " * (item.level+1)) + else: + prefix = u"%s " % (" " * (item.level+1)) + + r = u'%s ' % ( + item.id, 14+item.level*14, prefix) if hasattr(item, 'short_title'): - return mark_safe(r + item.short_title()) + if callable(item.short_title): + short_title = item.short_title() + else: + short_title = item.short_title + return mark_safe(r + short_title) return mark_safe(r + unicode(item)) indented_short_title.short_description = _('title') indented_short_title.allow_tags = True