update to ueditor 1.4.3

zhangfisher · Jun 24, 2014 · 417f8f0 · 417f8f0
1 parent bb5bcf3
commit 417f8f0
Show file tree

Hide file tree

Showing 159 changed files with 4,740 additions and 12,042 deletions.
diff --git a/.idea/DjangoUeditor.iml b/.idea/DjangoUeditor.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/DUSite/__init__.pyc b/DUSite/__init__.pyc
diff --git a/DUSite/data/cool/Arrow_right 右箭头_20140624153238_416.png b/DUSite/data/cool/Arrow_right 右箭头_20140624153238_416.png
diff --git a/DUSite/data/cool/UEditor_snapScreen_tmp_20140624153259_798.jpg b/DUSite/data/cool/UEditor_snapScreen_tmp_20140624153259_798.jpg
diff --git a/DUSite/data/cool/scrawl_20140624153247_660.png b/DUSite/data/cool/scrawl_20140624153247_660.png
diff --git a/DUSite/data/d.png b/DUSite/data/d.png
diff --git a/DUSite/settings.py b/DUSite/settings.py
@@ -153,15 +153,7 @@
     }
 }
 
+#以下可以自行配置ueditor的配置项
 UEDITOR_SETTINGS = {
-    'toolbars':{"testa":[['fullscreen', 'source', '|', 'undo', 'redo', '|','bold', 'italic', 'underline']],
-                "testb":[[ 'source', '|','bold', 'italic', 'underline']]
-                },
-    'images_upload':{
-        'max_size':0,
-        'path':"asd"
-    },
-    'scrawl_upload':{
-        'path':'scrawlabc'
-    }
+    "test":1
 }
diff --git a/DUSite/settings.pyc b/DUSite/settings.pyc
diff --git a/DUSite/templates/test.html b/DUSite/templates/test.html
@@ -12,6 +12,5 @@
     </table>
     <input type="submit" value="Submit">
 </form>
-
 </body>
 </html>
diff --git a/DUSite/test.db b/DUSite/test.db
diff --git a/DUSite/urls.py b/DUSite/urls.py
@@ -3,7 +3,7 @@
 from django.conf.urls.static import static
 import settings
 from django.contrib import admin
-from TestApp.views import  TestUEditorModel
+from TestApp.views import  TestUEditorModel,ajaxcmd
 
 admin.autodiscover()
 
@@ -12,19 +12,16 @@
     # url(r'^$', 'DUSite.views.home', name='home'),
 
     # Uncomment the admin/doc line below to enable admin documentation:
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
     url(r'^ueditor/',include('DjangoUeditor.urls')),
-    url(r'^test/$',TestUEditorModel)
+    url(r'^test/$',TestUEditorModel),
+    url(r'^ajaxcmd/$',ajaxcmd)
+
 )
 
 if settings.DEBUG:
-    urlpatterns += static(settings.MEDIA_URL , document_root = settings.MEDIA_ROOT )
-    urlpatterns += static(settings.STATIC_URL, document_root = settings.STATIC_ROOT )
     urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT }),
+        url(r'^static/(?P<path>.*)$','django.views.static.serve',{'document_root':settings.STATIC_ROOT}),
         url(r'^(?P<path>.*)$','django.views.static.serve',{'document_root':settings.STATIC_ROOT}),
-    )
-    urlpatterns +=patterns('',
-        (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
-    )
+    )
diff --git a/DUSite/urls.pyc b/DUSite/urls.pyc
diff --git a/DUSite/wsgi.pyc b/DUSite/wsgi.pyc
diff --git a/DUSite/www/1.png b/DUSite/www/1.png