Permalink
Browse files

merging for idiots, part II (merge 3.3 to trunk)

  • Loading branch information...
1 parent 91176eb commit 7061ce265a3c4213d3c1a5e0270ef89a7207aad9 @sehmaschine committed May 30, 2011
Showing with 17,360 additions and 0 deletions.
  1. +27 −0 LICENSE
  2. +6 −0 MANIFEST.in
  3. +130 −0 docs/Makefile
  4. +237 −0 docs/admin.rst
  5. +440 −0 docs/api.rst
  6. +14 −0 docs/changelog.rst
  7. +218 −0 docs/conf.py
  8. +67 −0 docs/faq.rst
  9. +123 −0 docs/fieldswidgets.rst
  10. +84 −0 docs/index.rst
  11. +76 −0 docs/quickstart.rst
  12. +53 −0 docs/releasenotes.rst
  13. +211 −0 docs/settings.rst
  14. +12 −0 docs/translation.rst
  15. +43 −0 docs/troubleshooting.rst
  16. +125 −0 docs/versions.rst
  17. +1 −0 filebrowser/__init__.py
  18. +342 −0 filebrowser/base.py
  19. +72 −0 filebrowser/decorators.py
  20. +121 −0 filebrowser/fields.py
  21. +75 −0 filebrowser/forms.py
  22. +391 −0 filebrowser/functions.py
  23. BIN filebrowser/locale/de/LC_MESSAGES/django.mo
  24. +408 −0 filebrowser/locale/de/LC_MESSAGES/django.po
  25. +412 −0 filebrowser/locale/en/LC_MESSAGES/django.po
  26. 0 filebrowser/management/__init__.py
  27. 0 filebrowser/management/commands/__init__.py
  28. +86 −0 filebrowser/management/commands/fb_version_generate.py
  29. +134 −0 filebrowser/management/commands/fb_version_remove.py
  30. +1 −0 filebrowser/models.py
  31. +113 −0 filebrowser/settings.py
  32. +149 −0 filebrowser/static/filebrowser/css/filebrowser.css
  33. BIN filebrowser/static/filebrowser/img/icon-pulldown-versions-active.png
  34. BIN filebrowser/static/filebrowser/img/icon-pulldown-versions-hover.png
  35. BIN filebrowser/static/filebrowser/img/icon-pulldown-versions.png
  36. BIN filebrowser/static/filebrowser/img/testimage.jpg
  37. +42 −0 filebrowser/static/filebrowser/js/AddFileBrowser.js
  38. +24 −0 filebrowser/static/filebrowser/js/FB_CKEditor.js
  39. +32 −0 filebrowser/static/filebrowser/js/FB_FileBrowseField.js
  40. +28 −0 filebrowser/static/filebrowser/js/FB_TinyMCE.js
  41. +75 −0 filebrowser/static/filebrowser/js/TinyMCEAdmin.js
  42. BIN filebrowser/static/filebrowser/uploadify/cancel.png
  43. +35 −0 filebrowser/static/filebrowser/uploadify/check.php
  44. +98 −0 filebrowser/static/filebrowser/uploadify/com/adobe/air/logging/FileTarget.as
  45. +127 −0 filebrowser/static/filebrowser/uploadify/com/adobe/crypto/HMAC.as
  46. +281 −0 filebrowser/static/filebrowser/uploadify/com/adobe/crypto/MD5.as
  47. +402 −0 filebrowser/static/filebrowser/uploadify/com/adobe/crypto/MD5Stream.as
  48. +271 −0 filebrowser/static/filebrowser/uploadify/com/adobe/crypto/SHA1.as
  49. +257 −0 filebrowser/static/filebrowser/uploadify/com/adobe/crypto/SHA224.as
  50. +261 −0 filebrowser/static/filebrowser/uploadify/com/adobe/crypto/SHA256.as
  51. +114 −0 filebrowser/static/filebrowser/uploadify/com/adobe/crypto/WSSEUsernameToken.as
  52. +63 −0 filebrowser/static/filebrowser/uploadify/com/adobe/errors/IllegalStateError.as
  53. +47 −0 filebrowser/static/filebrowser/uploadify/com/adobe/fileformats/vcard/Address.as
  54. +39 −0 filebrowser/static/filebrowser/uploadify/com/adobe/fileformats/vcard/Email.as
  55. +39 −0 filebrowser/static/filebrowser/uploadify/com/adobe/fileformats/vcard/Phone.as
  56. +54 −0 filebrowser/static/filebrowser/uploadify/com/adobe/fileformats/vcard/VCard.as
  57. +246 −0 filebrowser/static/filebrowser/uploadify/com/adobe/fileformats/vcard/VCardParser.as
  58. +39 −0 filebrowser/static/filebrowser/uploadify/com/adobe/images/BitString.as
  59. +648 −0 filebrowser/static/filebrowser/uploadify/com/adobe/images/JPGEncoder.as
  60. +141 −0 filebrowser/static/filebrowser/uploadify/com/adobe/images/PNGEncoder.as
  61. +55 −0 filebrowser/static/filebrowser/uploadify/com/adobe/net/DynamicURLLoader.as
  62. +76 −0 filebrowser/static/filebrowser/uploadify/com/adobe/net/IURIResolver.as
  63. +196 −0 filebrowser/static/filebrowser/uploadify/com/adobe/net/MimeTypeMap.as
  64. +2,466 −0 filebrowser/static/filebrowser/uploadify/com/adobe/net/URI.as
  65. +139 −0 filebrowser/static/filebrowser/uploadify/com/adobe/net/URIEncodingBitmap.as
  66. +198 −0 filebrowser/static/filebrowser/uploadify/com/adobe/net/proxies/RFC2817Socket.as
  67. +34 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/Database.as
  68. +39 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/Definition.as
  69. +328 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/Dict.as
  70. +28 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/DictionaryServer.as
  71. +34 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/MatchStrategy.as
  72. +39 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/Response.as
  73. +14 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/ConnectedEvent.as
  74. +26 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/DatabaseEvent.as
  75. +27 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/DefinitionEvent.as
  76. +26 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/DefinitionHeaderEvent.as
  77. +26 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/DictionaryServerEvent.as
  78. +14 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/DisconnectedEvent.as
  79. +37 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/ErrorEvent.as
  80. +26 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/MatchEvent.as
  81. +26 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/MatchStrategiesEvent.as
  82. +14 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/events/NoMatchEvent.as
  83. +25 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/util/CompleteResponseEvent.as
  84. +49 −0 filebrowser/static/filebrowser/uploadify/com/adobe/protocols/dict/util/SocketHelper.as
  85. +85 −0 filebrowser/static/filebrowser/uploadify/com/adobe/serialization/json/JSON.as
  86. +221 −0 filebrowser/static/filebrowser/uploadify/com/adobe/serialization/json/JSONDecoder.as
  87. +299 −0 filebrowser/static/filebrowser/uploadify/com/adobe/serialization/json/JSONEncoder.as
  88. +87 −0 filebrowser/static/filebrowser/uploadify/com/adobe/serialization/json/JSONParseError.as
  89. +104 −0 filebrowser/static/filebrowser/uploadify/com/adobe/serialization/json/JSONToken.as
  90. +67 −0 filebrowser/static/filebrowser/uploadify/com/adobe/serialization/json/JSONTokenType.as
  91. +583 −0 filebrowser/static/filebrowser/uploadify/com/adobe/serialization/json/JSONTokenizer.as
  92. +187 −0 filebrowser/static/filebrowser/uploadify/com/adobe/utils/ArrayUtil.as
  93. +699 −0 filebrowser/static/filebrowser/uploadify/com/adobe/utils/DateUtil.as
  94. +87 −0 filebrowser/static/filebrowser/uploadify/com/adobe/utils/DictionaryUtil.as
  95. +99 −0 filebrowser/static/filebrowser/uploadify/com/adobe/utils/IntUtil.as
  96. +74 −0 filebrowser/static/filebrowser/uploadify/com/adobe/utils/NumberFormatter.as
  97. +270 −0 filebrowser/static/filebrowser/uploadify/com/adobe/utils/StringUtil.as
  98. +168 −0 filebrowser/static/filebrowser/uploadify/com/adobe/utils/XMLUtil.as
  99. +48 −0 filebrowser/static/filebrowser/uploadify/com/adobe/webapis/ServiceBase.as
  100. +108 −0 filebrowser/static/filebrowser/uploadify/com/adobe/webapis/URLLoaderBase.as
  101. +75 −0 filebrowser/static/filebrowser/uploadify/com/adobe/webapis/events/ServiceEvent.as
  102. BIN filebrowser/static/filebrowser/uploadify/expressInstall.swf
  103. +154 −0 filebrowser/static/filebrowser/uploadify/jquery-1.4.2.min.js
  104. +296 −0 filebrowser/static/filebrowser/uploadify/jquery.uploadify.v2.1.4.js
  105. +26 −0 filebrowser/static/filebrowser/uploadify/jquery.uploadify.v2.1.4.min.js
  106. +4 −0 filebrowser/static/filebrowser/uploadify/swfobject.js
  107. BIN filebrowser/static/filebrowser/uploadify/uploadify.allglyphs.swf
  108. +52 −0 filebrowser/static/filebrowser/uploadify/uploadify.css
  109. BIN filebrowser/static/filebrowser/uploadify/uploadify.fla
  110. +46 −0 filebrowser/static/filebrowser/uploadify/uploadify.php
  111. BIN filebrowser/static/filebrowser/uploadify/uploadify.swf
  112. +45 −0 filebrowser/templates/filebrowser/createdir.html
  113. +25 −0 filebrowser/templates/filebrowser/custom_field.html
  114. +53 −0 filebrowser/templates/filebrowser/delete_confirm.html
  115. +159 −0 filebrowser/templates/filebrowser/detail.html
  116. +1 −0 filebrowser/templates/filebrowser/include/_response.html
  117. +24 −0 filebrowser/templates/filebrowser/include/breadcrumbs.html
  118. +112 −0 filebrowser/templates/filebrowser/include/filelisting.html
  119. +27 −0 filebrowser/templates/filebrowser/include/filter.html
  120. +28 −0 filebrowser/templates/filebrowser/include/paginator.html
  121. +31 −0 filebrowser/templates/filebrowser/include/search.html
  122. +32 −0 filebrowser/templates/filebrowser/include/tableheader.html
  123. +36 −0 filebrowser/templates/filebrowser/include/toolbar.html
  124. +120 −0 filebrowser/templates/filebrowser/index.html
  125. +43 −0 filebrowser/templates/filebrowser/rename.html
  126. +130 −0 filebrowser/templates/filebrowser/upload.html
  127. +60 −0 filebrowser/templates/filebrowser/version.html
  128. +13 −0 filebrowser/templates/filebrowser/widgets/clearablefileinput.html
  129. 0 filebrowser/templatetags/__init__.py
  130. +30 −0 filebrowser/templatetags/fb_csrf.py
  131. +51 −0 filebrowser/templatetags/fb_pagination.py
  132. +140 −0 filebrowser/templatetags/fb_tags.py
  133. +173 −0 filebrowser/templatetags/fb_versions.py
  134. +2 −0 filebrowser/tests/__init__.py
  135. +131 −0 filebrowser/tests/base.py
  136. 0 filebrowser/tests/forms.py
  137. +93 −0 filebrowser/tests/settings.py
  138. 0 filebrowser/tests/versions.py
  139. +17 −0 filebrowser/urls.py
  140. +386 −0 filebrowser/views.py
  141. +59 −0 filebrowser/widgets.py
  142. +24 −0 setup.py
View
27 LICENSE
@@ -0,0 +1,27 @@
+django-filebrowser
+------------------
+
+Copyright (c) Patrick Kranzlmueller, Axel Swoboda (vonautomatisch werkstaetten),
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+3. Neither the name of FileBrowser nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific prior
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
@@ -0,0 +1,6 @@
+include LICENSE
+recursive-include docs *
+recursive-include filebrowser/static *
+recursive-include filebrowser/templates *
+recursive-include filebrowser/locale *
+recursive-include filebrowser/management *
View
@@ -0,0 +1,130 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = _build
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " changes to make an overview of all changed/added/deprecated items"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/DjangoGrappelli.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/DjangoGrappelli.qhc"
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/DjangoGrappelli"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/DjangoGrappelli"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ make -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
Oops, something went wrong.

0 comments on commit 7061ce2

Please sign in to comment.