From: Łukasz Rekucki Date: Tue, 20 Oct 2009 12:42:45 +0000 (+0200) Subject: Merge branch 'master' of stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/0e5e4a0d816add3c0c13559fbed4f79eb295baf8?hp=bd2f4130a81e68a2bb3c8d88448540ec60fe7be5 Merge branch 'master' of stigma:platforma Conflicts: platforma/urls.py --- diff --git a/README.rst b/README.rst index c1299ee3..351ca8b4 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ Instalacja i użycie #. Przejdź do katalogu serwisu w konsoli #. Zainstaluj wymagane biblioteki (patrz sekcja wymagania_) komendą:: - pip install -f http://redmine.nowoczesnapolska.org.pl/projects/librarian/files -r requirements.txt + pip install -r requirements.txt #. Wypełnij bazę danych (Django poprosi o utworzenie pierwszego użytkownika):: diff --git a/apps/api/forms.py b/apps/api/forms.py index 7532e179..22cadb9e 100644 --- a/apps/api/forms.py +++ b/apps/api/forms.py @@ -120,7 +120,7 @@ class TextUpdateForm(DocumentRetrieveForm): value = self.cleaned_data['message'] if value: - return u"$USER$ " + request.POST['message'] + return u"$USER$ " + value else: return u"$AUTO$ XML content update." diff --git a/apps/wysiwyg/__init__.py b/apps/wysiwyg/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/wysiwyg/models.py b/apps/wysiwyg/models.py deleted file mode 100644 index 71a83623..00000000 --- a/apps/wysiwyg/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/apps/wysiwyg/urls.py b/apps/wysiwyg/urls.py deleted file mode 100644 index ca19ea97..00000000 --- a/apps/wysiwyg/urls.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- encoding: utf-8 -*- - -__author__= "Łukasz Rekucki" -__date__ = "$2009-09-23 15:57:38$" -__doc__ = "Module documentation." - -from django.conf.urls.defaults import * - - -urlpatterns = patterns('', - (r'^$', 'wysiwyg.views.index'), -) diff --git a/apps/wysiwyg/views.py b/apps/wysiwyg/views.py deleted file mode 100644 index 81e1690d..00000000 --- a/apps/wysiwyg/views.py +++ /dev/null @@ -1,9 +0,0 @@ -# Create your views here. -from django.views.generic.simple import direct_to_template - -def index(request): - return direct_to_template(request, - 'wysiwyg.html', extra_context={ - 'listA': [1,2,3,4], - 'listB': [5,6,7,8], - }) \ No newline at end of file diff --git a/platforma.vhost.template b/platforma.vhost.template index 959b1645..7d445573 100644 --- a/platforma.vhost.template +++ b/platforma.vhost.template @@ -7,28 +7,28 @@ WSGIScriptAlias / %(path)s/%(project_name)s.wsgi - Order allow, deny + Order allow,deny allow from all Alias /media %(path)s/media Options Indexes - Order allow, deny + Order allow,deny Allow from all Alias /admin-media %(path)s/admin-media Options Indexes - Order allow, deny + Order allow,deny Allow from all Alias /static %(path)s/releases/current/%(project_name)s/static Options Indexes - Order allow, deny + Order allow,deny Allow from all diff --git a/platforma/localsettings.sample b/platforma/localsettings.sample index 1bac9557..687af159 100644 --- a/platforma/localsettings.sample +++ b/platforma/localsettings.sample @@ -27,7 +27,6 @@ INSTALLED_APPS = ( 'explorer', 'toolbar', 'api', - 'wysiwyg', ) AUTHENTICATION_BACKENDS = ( diff --git a/platforma/settings.py b/platforma/settings.py index 3a1f3ad9..87868ce3 100644 --- a/platforma/settings.py +++ b/platforma/settings.py @@ -121,7 +121,6 @@ INSTALLED_APPS = ( 'explorer', 'toolbar', 'api', - 'wysiwyg', ) diff --git a/platforma/templates/wysiwyg.html b/platforma/templates/wysiwyg.html deleted file mode 100644 index a592bf11..00000000 --- a/platforma/templates/wysiwyg.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends 'base.html' %} - -{% block maincontent %} -

Wysiwyg editor

-
This part is not editable!
-
- -

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. - Suspendisse a urna eu enim rutrum elementum nec sed nibh. Quisque sed tortor - nulla, et euismod turpis. Morbi purus nulla, vulputate in vulputate id, gravida - id eros. In interdum est tempor est consequat imperdiet. Vivamus vitae ligula quam. - Proin nibh quam, tincidunt sit amet auctor eget, laoreet sit amet eros. Cras augue - lectus, euismod nec posuere ac, ultricies sed magna. Aliquam a lacinia sapien. - Cras imperdiet urna vel dui accumsan mollis. Suspendisse convallis tincidunt ornare. - Aenean convallis libero in lectus dictum vestibulum interdum ipsum suscipit. - Suspendisse sed justo sapien, eu egestas libero. Sed tincidunt sagittis sollicitudin. - Aliquam erat volutpat. Nullam egestas dolor id massa sagittis at sagittis ipsum - hendrerit. -

- -

Phasellus sed purus non orci eleifend posuere ac eu elit. Etiam orci justo, porta vitae varius in, scelerisque sed metus. Phasellus faucibus lorem at metus scelerisque sit amet sollicitudin dolor dignissim. Aliquam eu justo in diam blandit posuere at a diam. Pellentesque tristique sem eu odio gravida eleifend. Phasellus cursus adipiscing metus, nec pharetra enim pharetra ac. Pellentesque faucibus volutpat lorem nec vulputate. Mauris in faucibus ipsum. Nulla ut urna nulla. Sed at tellus nec diam posuere porttitor. Duis faucibus, libero nec rhoncus facilisis, tortor ligula adipiscing massa, nec varius justo ante et magna. Donec orci mauris, ultrices nec blandit vel, lacinia in ante. Maecenas libero mi, pretium id ultricies eget, fringilla sit amet risus. Integer ut ante sem, et condimentum odio. Nam nec est erat. Etiam ut metus ligula. In vel condimentum orci.

- -

Suspendisse potenti. Proin in augue nibh. Curabitur in sollicitudin ipsum. In ut leo vel purus volutpat tempus. Proin ut neque at augue euismod ullamcorper nec ac dui. Vestibulum id quam nunc, eu porta augue. Pellentesque interdum neque eu nulla rhoncus vulputate. Sed viverra diam ac sem consectetur semper. Quisque consectetur fringilla quam, in feugiat nisl vulputate quis. Fusce vel ipsum lectus, eu interdum nunc. Donec luctus libero vitae mauris imperdiet at iaculis magna aliquet. Curabitur ullamcorper, diam nec pulvinar venenatis, nibh ante volutpat mauris, nec tristique lectus sem in urna. Aenean eu malesuada metus. Integer auctor nulla sit amet ligula sollicitudin ut accumsan velit ullamcorper. Donec nec auctor augue.

- -

Maecenas eget lacus vitae velit tincidunt bibendum quis et diam. In ullamcorper condimentum velit, et elementum felis vestibulum facilisis. Donec vitae cursus ipsum. Cras accumsan tincidunt aliquet. Nulla pellentesque mattis magna aliquet hendrerit. Pellentesque pellentesque odio enim. Duis viverra rhoncus tristique. In in risus ligula. Nullam dapibus lacinia facilisis. Ut eu neque neque, tristique laoreet nisl. Aliquam placerat dignissim leo, tristique tempor est vestibulum ut.

- -

Donec semper tempus ante, eget gravida erat varius et. Suspendisse aliquam rutrum nunc ac pulvinar. Aliquam erat volutpat. Nulla consectetur ultricies imperdiet. Nulla tincidunt est vitae augue porttitor a faucibus odio facilisis. In nec nisl odio. Aliquam et libero tortor, eu tincidunt mi. Vivamus suscipit erat sed mi hendrerit fringilla. Integer iaculis tempus nulla, at egestas velit faucibus ut. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum vel massa enim. Aliquam erat volutpat. In ligula tortor, fermentum eu suscipit at, posuere vel nunc. Nullam nibh magna, sollicitudin at semper et, mattis ut quam. Curabitur accumsan semper elit ac posuere. Sed sit amet lorem tortor, vel porttitor justo. Fusce odio metus, bibendum ut bibendum sit amet, luctus a ipsum.

-
-{% endblock %} \ No newline at end of file diff --git a/platforma/urls.py b/platforma/urls.py index 03056c88..786a6538 100644 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -13,37 +13,20 @@ urlpatterns = patterns('', url(r'^$', 'explorer.views.file_list', name='file_list'), url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), - url(r'^management/pull-requests$', 'explorer.views.pull_requests'), - -# url(r'^images/(?P[^/]+)/$', 'explorer.views.folder_images', name='folder_image'), -# url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'), - + # Editor panels - # url(r'^editor/'+PATH_SEC+'/panel/(?P[a-z]+)/$', 'explorer.views.panel_view', name='panel_view'), url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'), url(r'^editor/$', 'explorer.views.file_list', name='editor_base'), - # url(r'^editor/'+PATH_SEC+'/split$', 'explorer.views.split_text'), - # url(r'^editor/'+PATH_SEC+'/split-success', - # 'explorer.views.split_success', name='split-success'), - - # url(r'^editor/'+PATH_SEC+'/print/html$', 'explorer.views.print_html'), - # url(r'^editor/'+PATH_SEC+'/print/xml$', 'explorer.views.print_xml'), - url(r'^file/(?P[^/]+)/print$', 'explorer.views.print_html', name="file_print"), - # Task managment - # url(r'^manager/pull-requests$', 'explorer.views.pull_requests'), # Admin panel url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/(.*)', admin.site.root), - # Prototypes -# url(r'^wysiwyg-proto/', include('wysiwyg.urls')), - # Our über-restful api - url(r'^api/', include('api.urls') ), + url(r'^api/', include('api.urls')), ) diff --git a/requirements.txt b/requirements.txt index 227f79ca..76d2e129 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ mercurial==1.3.1 librarian==1.2.6 django-piston==0.2.3rc1 django-cas-consumer==0.1dev +MySQL-python>=1.2,<2.0