Permalink
Browse files

Rename lemon.extradmin app to lemon

  • Loading branch information...
yumike committed Aug 17, 2012
1 parent c7be6f1 commit 245fbee24ec846e7a684502c528cc477780238a5
Showing with 103 additions and 213 deletions.
  1. +2 −0 HISTORY.rst
  2. +3 −19 MANIFEST.in
  3. +3 −15 README.rst
  4. +9 −0 lemon/__init__.py
  5. +14 −13 lemon/{extradmin → }/admin.py
  6. +0 −9 lemon/extradmin/__init__.py
  7. +0 −60 lemon/extradmin/migrations/0001_initial.py
  8. 0 lemon/extradmin/templatetags/__init__.py
  9. 0 lemon/{extradmin → }/fields.py
  10. +1 −1 lemon/{extradmin → }/forms.py
  11. +1 −1 lemon/{extradmin → }/generic.py
  12. BIN lemon/{extradmin → }/locale/ru/LC_MESSAGES/django.mo
  13. 0 lemon/{extradmin → }/locale/ru/LC_MESSAGES/django.po
  14. 0 lemon/{extradmin → }/models.py
  15. +6 −6 lemon/{extradmin → }/options.py
  16. +1 −1 lemon/{extradmin → }/settings.py
  17. +2 −3 lemon/{extradmin → }/sites.py
  18. 0 lemon/{extradmin/static/extradmin → static/lemon}/css/base.css
  19. 0 lemon/{extradmin/static/extradmin → static/lemon}/css/changeform.css
  20. 0 lemon/{extradmin/static/extradmin → static/lemon}/css/changelist.css
  21. 0 lemon/{extradmin/static/extradmin → static/lemon}/css/default.css
  22. 0 lemon/{extradmin/static/extradmin → static/lemon}/css/ie.css
  23. 0 lemon/{extradmin/static/extradmin → static/lemon}/css/jquery.datetimepicker.css
  24. 0 lemon/{extradmin/static/extradmin → static/lemon}/css/jquery.ui.css
  25. 0 lemon/{extradmin/static/extradmin → static/lemon}/css/reset.css
  26. BIN lemon/{extradmin/static/extradmin → static/lemon}/favicon.ico
  27. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/asc.png
  28. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/button-bg.png
  29. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/changelist-footer-bg.png
  30. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/changelist-footer-left.png
  31. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/changelist-footer-right.png
  32. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/changelist-header-bg.png
  33. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/changelist-header-left.png
  34. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/changelist-header-right.png
  35. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/changelist-left.png
  36. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/changelist-right.png
  37. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/company-logo.png
  38. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/desc.png
  39. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/fieldset-header-bg.png
  40. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/fieldset-header-left-bg.png
  41. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/fieldset-header-right-bg.png
  42. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/filter-selected-item.png
  43. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/footer-bg.png
  44. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/footer-logo.png
  45. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/header-bg.png
  46. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/icon_calendar.gif
  47. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/icon_clock.gif
  48. BIN ...admin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png
  49. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_flat_10_000000_40x100.png
  50. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_flat_20_666666_40x100.png
  51. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png
  52. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png
  53. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png
  54. BIN ...radmin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_highlight-hard_35_ffcb5d_1x100.png
  55. BIN ...admin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png
  56. BIN ...radmin/static/extradmin → static/lemon}/images/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png
  57. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-icons_007042_256x240.png
  58. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-icons_222222_256x240.png
  59. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-icons_ef8c08_256x240.png
  60. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-icons_ffd27a_256x240.png
  61. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/jquery-ui/ui-icons_ffffff_256x240.png
  62. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/login-bg.png
  63. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/login-footer.png
  64. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/login-header.png
  65. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/login-logo.png
  66. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/logo.png
  67. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-bg.png
  68. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-first-bg.png
  69. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-first-border.png
  70. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-item-bg.png
  71. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-last-border.png
  72. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-open-down.gif
  73. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-open-down.png
  74. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-open-right.gif
  75. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu-open-right.png
  76. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/articles.jpg
  77. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/captcha.jpg
  78. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/catalog.jpg
  79. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/faq.jpg
  80. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/feedback.jpg
  81. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/flatpages.jpg
  82. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/forum.jpg
  83. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/gallery.jpg
  84. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/guesbook.jpg
  85. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/main_menu.jpg
  86. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/money.jpg
  87. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/news.jpg
  88. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/podpiska.jpg
  89. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/shop.jpg
  90. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/sitemap.jpg
  91. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/sites.jpg
  92. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/templates.jpg
  93. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/torg_catalog.jpg
  94. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/user_grps.jpg
  95. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/users.jpg
  96. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/votes.jpg
  97. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/weather.jpg
  98. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/menu/weather_city.jpg
  99. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/no.gif
  100. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/pager-bg.png
  101. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/submit-bg.jpg
  102. BIN lemon/{extradmin/static/extradmin → static/lemon}/images/yes.gif
  103. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery-ui.lemon.tabs.js
  104. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.actions.js
  105. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.changeform.js
  106. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.changelist.js
  107. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.datetimepicker.js
  108. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.inlines.js
  109. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.js
  110. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.login.js
  111. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.mainmenu.js
  112. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.prepopulate.js
  113. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.relatedobjectlookup.js
  114. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/jquery.ui.js
  115. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/json2.js
  116. 0 lemon/{extradmin/static/extradmin → static/lemon}/js/script.js
  117. 0 lemon/{extradmin → }/templates/admin/404.html
  118. 0 lemon/{extradmin → }/templates/admin/500.html
  119. 0 lemon/{extradmin → }/templates/admin/actions.html
  120. 0 lemon/{extradmin → }/templates/admin/app_index.html
  121. 0 lemon/{extradmin → }/templates/admin/auth/user/add_form.html
  122. 0 lemon/{extradmin → }/templates/admin/auth/user/change_form.html
  123. +1 −1 lemon/{extradmin → }/templates/admin/auth/user/change_password.html
  124. +10 −10 lemon/{extradmin → }/templates/admin/base.html
  125. +1 −1 lemon/{extradmin → }/templates/admin/base_site.html
  126. +3 −3 lemon/{extradmin → }/templates/admin/change_form.html
  127. +5 −5 lemon/{extradmin → }/templates/admin/change_list.html
  128. 0 lemon/{extradmin → }/templates/admin/date_hierarchy.html
  129. 0 lemon/{extradmin → }/templates/admin/delete_confirmation.html
  130. 0 lemon/{extradmin → }/templates/admin/delete_selected_confirmation.html
  131. 0 lemon/{extradmin → }/templates/admin/edit_inline/stacked.html
  132. 0 lemon/{extradmin → }/templates/admin/edit_inline/tabular.html
  133. 0 lemon/{extradmin → }/templates/admin/filter.html
  134. 0 lemon/{extradmin → }/templates/admin/includes/fieldset.html
  135. 0 lemon/{extradmin → }/templates/admin/includes/inline_fieldset.html
  136. 0 lemon/{extradmin → }/templates/admin/index.html
  137. +2 −2 lemon/{extradmin → }/templates/admin/login.html
  138. 0 lemon/{extradmin → }/templates/admin/pagination.html
  139. 0 lemon/{extradmin → }/templates/admin/prepopulated_fields_js.html
  140. 0 lemon/{extradmin → }/templates/admin/search_form.html
  141. 0 lemon/{extradmin → }/templates/admin/submit_line.html
  142. +1 −1 lemon/{extradmin/templates/extradmin → templates/lemon}/main_menu.html
  143. +8 −8 lemon/{extradmin → }/templates/registration/base.html
  144. 0 lemon/{extradmin → }/templates/registration/logged_out.html
  145. 0 lemon/{extradmin → }/templates/registration/password_change_done.html
  146. +1 −1 lemon/{extradmin → }/templates/registration/password_change_form.html
  147. 0 lemon/{extradmin → }/templates/registration/password_reset_complete.html
  148. 0 lemon/{extradmin → }/templates/registration/password_reset_confirm.html
  149. 0 lemon/{extradmin → }/templates/registration/password_reset_done.html
  150. 0 lemon/{extradmin → }/templates/registration/password_reset_form.html
  151. 0 lemon/{extradmin/migrations → templatetags}/__init__.py
  152. 0 lemon/{extradmin → }/templatetags/lemon_list.py
  153. +2 −2 lemon/{extradmin → }/templatetags/main_menu.py
  154. +11 −12 lemon/{extradmin → }/tests/__init__.py
  155. +5 −5 lemon/{extradmin → }/tests/admin.py
  156. +3 −3 lemon/{extradmin → }/tests/models.py
  157. +2 −2 lemon/{extradmin → }/widgets.py
  158. +1 −14 test_project/project/settings.py
  159. +3 −5 test_project/project/urls.py
  160. +2 −10 tests.py
View
@@ -4,6 +4,8 @@ History
next release
------------
+* Rename lemon.extradmin app to lemon
+* Move all apps except extradmin to their own separate distributions
* Add ability to register custom admin sections per app using AppAdmin
0.6.2
View
@@ -1,23 +1,7 @@
include HISTORY.rst
include LICENSE
include README.rst
-include lemon/filebrowser/LICENSE
include setup.py
-recursive-include lemon/dashboard/locale *
-recursive-include lemon/dashboard/templates *
-recursive-include lemon/extradmin/locale *
-recursive-include lemon/extradmin/static *
-recursive-include lemon/extradmin/templates *
-recursive-include lemon/filebrowser/locale *
-recursive-include lemon/filebrowser/static *
-recursive-include lemon/filebrowser/templates *
-recursive-include lemon/metatags/locale *
-recursive-include lemon/pages/locale *
-recursive-include lemon/pages/templates *
-recursive-include lemon/publications/locale *
-recursive-include lemon/robots/fixtures *
-recursive-include lemon/robots/locale *
-recursive-include lemon/robots/templates *
-recursive-include lemon/sitemaps/fixtures *
-recursive-include lemon/sitemaps/locale *
-recursive-include lemon/sitemaps/templates *
+recursive-include lemon/locale *
+recursive-include lemon/static *
+recursive-include lemon/templates *
View
@@ -1,21 +1,9 @@
Lemon
=====
-Lemon is a collection of some must have Django apps (at least at our company):
-
-* ``lemon.metatags``: control meta tags (title, keywords, description) of every
- page;
-* ``lemon.sitemaps``: like ``django.cotrib.sitemaps``, but more powerful;
-* ``lemon.robots``: edit robots.txt from admin.
-* ``lemon.pages``: multilingual ``django.contrib.flatpages``.
-* ``lemon.publications``: some usefull tools to create publications-like apps
- faster (news, articles, etc.).
-
-Also Lemon has:
-
-* ``lemon.extradmin``: extended ``django.contrib.admin`` (in early development);
-* ``lemon.filebrowser``: fork of Patrick Kranzlmueller's ``django-filebrowser``;
-* ``lemon.dashboard``: dashboard for our admin (also in early development).
+Lemon is an extention for ``django.contrib.admin`` app. It provides improved
+UI and several useful features, like the ability to app-related admin sections,
+using ``AppAdmin``.
If you like it, feel free to fork, send pull requests or report bugs and issues
on github.
View
@@ -0,0 +1,9 @@
+from .options import ModelAdmin, AppAdmin
+from .options import StackedInline, TabularInline
+from .sites import AdminSite, site
+
+
+__all__ = [
+ 'ModelAdmin', 'AppAdmin', 'StackedInline', 'TabularInline', 'AdminSite',
+ 'site',
+]
@@ -4,13 +4,14 @@
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext
-from lemon import extradmin
-from lemon.extradmin.forms import MenuItemForm
-from lemon.extradmin.forms import contenttype_inlineformset_factory
-from lemon.extradmin.models import MenuSection, MenuItem
+from .options import TabularInline, ModelAdmin
+from .sites import site
+from .forms import MenuItemForm
+from .forms import contenttype_inlineformset_factory
+from .models import MenuSection, MenuItem
-class MenuItemInline(extradmin.TabularInline):
+class MenuItemInline(TabularInline):
form = MenuItemForm
model = MenuItem
@@ -27,7 +28,7 @@ def get_formset(self, request, obj=None, **kwargs):
self.admin_site, **defaults)
-class MenuSectionAdmin(extradmin.ModelAdmin):
+class MenuSectionAdmin(ModelAdmin):
string_overrides = {
'add_title': _(u'Add menu section'),
@@ -45,7 +46,7 @@ class MenuSectionAdmin(extradmin.ModelAdmin):
inlines = [MenuItemInline]
-class UserExtrAdmin(extradmin.ModelAdmin, UserAdmin):
+class UserExtrAdmin(ModelAdmin, UserAdmin):
fieldsets = (
(None, {'fields': ('username',)}),
@@ -77,7 +78,7 @@ class UserExtrAdmin(extradmin.ModelAdmin, UserAdmin):
}
-class GroupExtrAdmin(extradmin.ModelAdmin, GroupAdmin):
+class GroupExtrAdmin(ModelAdmin, GroupAdmin):
string_overrides = {
'add_title': _(u'Add user group'),
@@ -93,7 +94,7 @@ class GroupExtrAdmin(extradmin.ModelAdmin, GroupAdmin):
}
-class SiteExtrAdmin(extradmin.ModelAdmin, SiteAdmin):
+class SiteExtrAdmin(ModelAdmin, SiteAdmin):
string_overrides = {
'add_title': _(u'Add site'),
@@ -109,7 +110,7 @@ class SiteExtrAdmin(extradmin.ModelAdmin, SiteAdmin):
}
-extradmin.site.register(MenuSection, MenuSectionAdmin)
-extradmin.site.register(User, UserExtrAdmin)
-extradmin.site.register(Group, GroupExtrAdmin)
-extradmin.site.register(Site, SiteExtrAdmin)
+site.register(MenuSection, MenuSectionAdmin)
+site.register(User, UserExtrAdmin)
+site.register(Group, GroupExtrAdmin)
+site.register(Site, SiteExtrAdmin)
@@ -1,9 +0,0 @@
-from lemon.extradmin.options import ModelAdmin, AppAdmin
-from lemon.extradmin.options import StackedInline, TabularInline
-from lemon.extradmin.sites import AdminSite, site
-
-
-__all__ = [
- 'ModelAdmin', 'AppAdmin', 'StackedInline', 'TabularInline', 'AdminSite',
- 'site',
-]
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
- def forwards(self, orm):
- # Adding model 'MenuSection'
- db.create_table('extradmin_menusection', (
- ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
- ('name', self.gf('django.db.models.fields.CharField')(max_length=50)),
- ('position', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
- ))
- db.send_create_signal('extradmin', ['MenuSection'])
-
- # Adding model 'MenuItem'
- db.create_table('extradmin_menuitem', (
- ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
- ('name', self.gf('django.db.models.fields.CharField')(max_length=50)),
- ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
- ('section', self.gf('django.db.models.fields.related.ForeignKey')(related_name='sections', to=orm['extradmin.MenuSection'])),
- ('position', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
- ))
- db.send_create_signal('extradmin', ['MenuItem'])
-
- def backwards(self, orm):
- # Deleting model 'MenuSection'
- db.delete_table('extradmin_menusection')
-
- # Deleting model 'MenuItem'
- db.delete_table('extradmin_menuitem')
-
- models = {
- 'contenttypes.contenttype': {
- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
- },
- 'extradmin.menuitem': {
- 'Meta': {'ordering': "['position']", 'object_name': 'MenuItem'},
- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
- 'position': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
- 'section': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sections'", 'to': "orm['extradmin.MenuSection']"})
- },
- 'extradmin.menusection': {
- 'Meta': {'ordering': "['position']", 'object_name': 'MenuSection'},
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
- 'position': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'})
- }
- }
-
- complete_apps = ['extradmin']
No changes.
File renamed without changes.
@@ -5,7 +5,7 @@
from django.forms.models import ModelFormMetaclass, _get_foreign_key
from django.utils.translation import ugettext_lazy as _
-from lemon.extradmin.fields import ContentTypeChoiceField
+from .fields import ContentTypeChoiceField
class MenuItemForm(forms.ModelForm):
@@ -1,5 +1,5 @@
from django.contrib.contenttypes import generic
-from lemon.extradmin.options import BaseModelAdmin, InlineModelAdmin
+from .options import BaseModelAdmin, InlineModelAdmin
class GenericInlineModelAdmin(generic.GenericInlineModelAdmin,
File renamed without changes.
@@ -12,7 +12,7 @@
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext
-from lemon.extradmin import widgets
+from . import widgets
FORMFIELD_FOR_DBFIELD_DEFAULTS = {
@@ -155,12 +155,12 @@ def _get_tab_for_inline(self, request, inline):
@property
def media(self):
js = [static('admin/js/SelectBox.js'),
- static('extradmin/js/jquery.relatedobjectlookup.js')]
+ static('lemon/js/jquery.relatedobjectlookup.js')]
if self.prepopulated_fields:
js.extend(static('admin/js/urlify.js'),
- static('extradmin/js/jquery.prepopulate.js'))
+ static('lemon/js/jquery.prepopulate.js'))
if self.tabs:
- js.append(static('extradmin/js/jquery-ui.lemon.tabs.js'))
+ js.append(static('lemon/js/jquery-ui.lemon.tabs.js'))
return forms.Media(js=js)
def get_tabs(self, request):
@@ -274,10 +274,10 @@ def __init__(self, parent_model, admin_site):
@property
def media(self):
- js = [static('extradmin/js/jquery.inlines.js')]
+ js = [static('lemon/js/jquery.inlines.js')]
if self.prepopulated_fields:
js.append(static('admin/js/urlify.js'))
- js.append(static('extradmin/js/jquery.prepopulate.js'))
+ js.append(static('lemon/js/jquery.prepopulate.js'))
return forms.Media(js=js)
def get_markup_widget(self, request):
@@ -4,4 +4,4 @@
CONFIG = {
'MARKUP_WIDGET': None,
}
-CONFIG.update(getattr(settings, 'EXTRADMIN_CONFIG', {}))
+CONFIG.update(getattr(settings, 'LEMON_CONFIG', {}))
@@ -9,9 +9,8 @@
from django.utils.importlib import import_module
from django.utils.translation import ugettext as _
-from lemon.extradmin import ModelAdmin
-from lemon.extradmin.settings import CONFIG
-from lemon.extradmin.options import AppAdmin
+from .settings import CONFIG
+from .options import ModelAdmin, AppAdmin
class AdminSite(sites.AdminSite):
@@ -3,7 +3,7 @@
{% block extrastyle %}
-<link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/changeform.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'lemon/css/changeform.css' %}" />
{% endblock %}
@@ -4,17 +4,17 @@
<title>{% block title %}{% endblock %}</title>
<meta charset="utf-8">
<meta name="generator" content="Lemon CMF">
- <link rel="shortcut icon" href="{% static 'extradmin/favicon.ico' %}" type="image/x-icon" />
- <link rel="icon" href="{% static 'extradmin/favicon.ico' %}" type="image/x-icon" />
- <link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/reset.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/default.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/base.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/jquery.ui.css' %}" />
+ <link rel="shortcut icon" href="{% static 'lemon/favicon.ico' %}" type="image/x-icon" />
+ <link rel="icon" href="{% static 'lemon/favicon.ico' %}" type="image/x-icon" />
+ <link rel="stylesheet" type="text/css" href="{% static 'lemon/css/reset.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'lemon/css/default.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'lemon/css/base.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'lemon/css/jquery.ui.css' %}" />
{% block extrastyle %}{% endblock %}
- <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/ie.css' %}" /><![endif]-->
- <script src="{% static 'extradmin/js/jquery.js' %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% static 'extradmin/js/jquery.ui.js' %}" type="text/javascript" charset="utf-8"></script>
- <script src="{% static 'extradmin/js/script.js' %}" type="text/javascript" charset="utf-8"></script>
+ <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% static 'lemon/css/ie.css' %}" /><![endif]-->
+ <script src="{% static 'lemon/js/jquery.js' %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% static 'lemon/js/jquery.ui.js' %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% static 'lemon/js/script.js' %}" type="text/javascript" charset="utf-8"></script>
{% block extrahead %}{% endblock %}
{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
</head>
@@ -4,7 +4,7 @@
{% block title %}{{ title }} | Lemon CMF{% endblock %}
{% block extrahead %}
-<script src="{% static 'extradmin/js/jquery.mainmenu.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'lemon/js/jquery.mainmenu.js' %}" type="text/javascript" charset="utf-8"></script>
{% endblock %}
{% block header %}
@@ -2,12 +2,12 @@
{% load i18n admin_modify admin_static %}
{% block extrastyle %}
- <link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/changeform.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/jquery.datetimepicker.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'lemon/css/changeform.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'lemon/css/jquery.datetimepicker.css' %}" />
{% endblock %}
{% block extrahead %}{{ block.super }}
- <script src="{% static 'extradmin/js/jquery.changeform.js' %}" type="text/javascript" charset="utf-8"></script>
+ <script src="{% static 'lemon/js/jquery.changeform.js' %}" type="text/javascript" charset="utf-8"></script>
<script src="{% url admin:jsi18n %}" type="text/javascript" charset="utf-8"></script>
{{ media }}
{% endblock %}
@@ -2,18 +2,18 @@
{% load intellipages lemon_list admin_list admin_static i18n %}
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static 'extradmin/css/changelist.css' %}" />{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static 'lemon/css/changelist.css' %}" />{% endblock %}
{% block extrahead %}{{ block.super }}
-<script src="{% static 'extradmin/js/jquery.actions.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'lemon/js/jquery.actions.js' %}" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
// <![CDATA[
- var path_to_yes_icon = '{% static "extradmin/images/yes.gif" %}';
- var path_to_no_icon = '{% static "extradmin/images/no.gif" %}';
+ var path_to_yes_icon = '{% static "lemon/images/yes.gif" %}';
+ var path_to_no_icon = '{% static "lemon/images/no.gif" %}';
// ]]>
</script>
-<script src="{% static 'extradmin/js/jquery.changelist.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'lemon/js/jquery.changelist.js' %}" type="text/javascript" charset="utf-8"></script>
{{ media }}
{% endblock %}
@@ -2,7 +2,7 @@
{% load admin_static %}
{% block extrahead %}
-<script src="{% static 'extradmin/js/jquery.login.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'lemon/js/jquery.login.js' %}" type="text/javascript" charset="utf-8"></script>
{% endblock %}
{% block containerclass %}login{% endblock %}
@@ -30,7 +30,7 @@
<input type="hidden" name="next" value="{{ next }}" />
<input type="submit" value="Войти" />
</div>
- <img id="company-logo" src="{% static 'extradmin/images/company-logo.png' %}" alt="ТриЛан" />
+ <img id="company-logo" src="{% static 'lemon/images/company-logo.png' %}" alt="ТриЛан" />
</div>
</form>
</div>
@@ -11,6 +11,6 @@
</li>
{% empty %}
<li class="empty">
- <a href="{% url admin:extradmin_menusection_changelist %}">{% trans "Fill main menu..." %}</a>
+ <a href="{% url admin:lemon_menusection_changelist %}">{% trans "Fill main menu..." %}</a>
</li>
{% endfor %}
Oops, something went wrong.

0 comments on commit 245fbee

Please sign in to comment.