From: Łukasz Rekucki Date: Tue, 15 Jun 2010 09:50:06 +0000 (+0200) Subject: Added UI to revert commits. Fixed some trailing whitespace. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/e77f342a73c940f16c37f57ffa50edce9caef8f0?ds=sidebyside;hp=413c112e479cef57fe2b2047f4820046cd7db4b4 Added UI to revert commits. Fixed some trailing whitespace. --- diff --git a/apps/filebrowser/media/filebrowser/uploadify/example/css/default.css b/apps/filebrowser/media/filebrowser/uploadify/example/css/default.css index ec5902d4..2173d9ec 100644 --- a/apps/filebrowser/media/filebrowser/uploadify/example/css/default.css +++ b/apps/filebrowser/media/filebrowser/uploadify/example/css/default.css @@ -1,10 +1,10 @@ -body { - font: 12px/16px Arial, Helvetica, sans-serif; -} -#fileQueue { - width: 400px; - height: 300px; - overflow: auto; - border: 1px solid #E5E5E5; - margin-bottom: 10px; +body { + font: 12px/16px Arial, Helvetica, sans-serif; +} +#fileQueue { + width: 400px; + height: 300px; + overflow: auto; + border: 1px solid #E5E5E5; + margin-bottom: 10px; } \ No newline at end of file diff --git a/apps/filebrowser/media/filebrowser/uploadify/example/css/uploadify.css b/apps/filebrowser/media/filebrowser/uploadify/example/css/uploadify.css index 0cf8c0ea..754de060 100644 --- a/apps/filebrowser/media/filebrowser/uploadify/example/css/uploadify.css +++ b/apps/filebrowser/media/filebrowser/uploadify/example/css/uploadify.css @@ -1,53 +1,53 @@ -/* -Uploadify v2.1.0 -Release Date: August 24, 2009 - -Copyright (c) 2009 Ronnie Garcia, Travis Nickels - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ -.uploadifyQueueItem { - font: 11px Verdana, Geneva, sans-serif; - border: 2px solid #E5E5E5; - background-color: #F5F5F5; - margin-top: 5px; - padding: 10px; - width: 350px; -} -.uploadifyError { - border: 2px solid #FBCBBC !important; - background-color: #FDE5DD !important; -} -.uploadifyQueueItem .cancel { - float: right; -} -.uploadifyProgress { - background-color: #FFFFFF; - border-top: 1px solid #808080; - border-left: 1px solid #808080; - border-right: 1px solid #C5C5C5; - border-bottom: 1px solid #C5C5C5; - margin-top: 10px; - width: 100%; -} -.uploadifyProgressBar { - background-color: #0099FF; - width: 1px; - height: 3px; +/* +Uploadify v2.1.0 +Release Date: August 24, 2009 + +Copyright (c) 2009 Ronnie Garcia, Travis Nickels + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ +.uploadifyQueueItem { + font: 11px Verdana, Geneva, sans-serif; + border: 2px solid #E5E5E5; + background-color: #F5F5F5; + margin-top: 5px; + padding: 10px; + width: 350px; +} +.uploadifyError { + border: 2px solid #FBCBBC !important; + background-color: #FDE5DD !important; +} +.uploadifyQueueItem .cancel { + float: right; +} +.uploadifyProgress { + background-color: #FFFFFF; + border-top: 1px solid #808080; + border-left: 1px solid #808080; + border-right: 1px solid #C5C5C5; + border-bottom: 1px solid #C5C5C5; + margin-top: 10px; + width: 100%; +} +.uploadifyProgressBar { + background-color: #0099FF; + width: 1px; + height: 3px; } \ No newline at end of file diff --git a/apps/filebrowser/media/filebrowser/uploadify/uploadify.css b/apps/filebrowser/media/filebrowser/uploadify/uploadify.css index 0cf8c0ea..754de060 100644 --- a/apps/filebrowser/media/filebrowser/uploadify/uploadify.css +++ b/apps/filebrowser/media/filebrowser/uploadify/uploadify.css @@ -1,53 +1,53 @@ -/* -Uploadify v2.1.0 -Release Date: August 24, 2009 - -Copyright (c) 2009 Ronnie Garcia, Travis Nickels - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ -.uploadifyQueueItem { - font: 11px Verdana, Geneva, sans-serif; - border: 2px solid #E5E5E5; - background-color: #F5F5F5; - margin-top: 5px; - padding: 10px; - width: 350px; -} -.uploadifyError { - border: 2px solid #FBCBBC !important; - background-color: #FDE5DD !important; -} -.uploadifyQueueItem .cancel { - float: right; -} -.uploadifyProgress { - background-color: #FFFFFF; - border-top: 1px solid #808080; - border-left: 1px solid #808080; - border-right: 1px solid #C5C5C5; - border-bottom: 1px solid #C5C5C5; - margin-top: 10px; - width: 100%; -} -.uploadifyProgressBar { - background-color: #0099FF; - width: 1px; - height: 3px; +/* +Uploadify v2.1.0 +Release Date: August 24, 2009 + +Copyright (c) 2009 Ronnie Garcia, Travis Nickels + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ +.uploadifyQueueItem { + font: 11px Verdana, Geneva, sans-serif; + border: 2px solid #E5E5E5; + background-color: #F5F5F5; + margin-top: 5px; + padding: 10px; + width: 350px; +} +.uploadifyError { + border: 2px solid #FBCBBC !important; + background-color: #FDE5DD !important; +} +.uploadifyQueueItem .cancel { + float: right; +} +.uploadifyProgress { + background-color: #FFFFFF; + border-top: 1px solid #808080; + border-left: 1px solid #808080; + border-right: 1px solid #C5C5C5; + border-bottom: 1px solid #C5C5C5; + margin-top: 10px; + width: 100%; +} +.uploadifyProgressBar { + background-color: #0099FF; + width: 1px; + height: 3px; } \ No newline at end of file diff --git a/apps/toolbar/templates/toolbar/toolbar.html b/apps/toolbar/templates/toolbar/toolbar.html index 1e4c2036..b9624d69 100644 --- a/apps/toolbar/templates/toolbar/toolbar.html +++ b/apps/toolbar/templates/toolbar/toolbar.html @@ -7,7 +7,7 @@ -
+
{% for group in toolbar_groups %}
    {# buttons for this group #} diff --git a/apps/wiki/helpers.py b/apps/wiki/helpers.py index 2cdb916e..f072ef91 100644 --- a/apps/wiki/helpers.py +++ b/apps/wiki/helpers.py @@ -62,19 +62,19 @@ def ajax_require_permission(permission): import collections def recursive_groupby(iterable): - """ + """ # >>> recursive_groupby([1,2,3,4,5]) # [1, 2, 3, 4, 5] - + >>> recursive_groupby([[1]]) [1] - + >>> recursive_groupby([('a', 1),('a', 2), 3, ('b', 4), 5]) ['a', [1, 2], 3, 'b', [4], 5] - + >>> recursive_groupby([('a', 'x', 1),('a', 'x', 2), ('a', 'x', 3)]) ['a', ['x', [1, 2, 3]]] - + """ def _generator(iterator): diff --git a/apps/wiki/templates/wiki/document_list.html b/apps/wiki/templates/wiki/document_list.html index 0ac2a35e..6853801f 100644 --- a/apps/wiki/templates/wiki/document_list.html +++ b/apps/wiki/templates/wiki/document_list.html @@ -33,7 +33,7 @@ $(function() { {% for doc in docs %} - {{ doc|wiki_title }} diff --git a/apps/wiki/templates/wiki/tabs/gallery_view.html b/apps/wiki/templates/wiki/tabs/gallery_view.html index f903ccca..2daff10b 100644 --- a/apps/wiki/templates/wiki/tabs/gallery_view.html +++ b/apps/wiki/templates/wiki/tabs/gallery_view.html @@ -5,11 +5,11 @@
    diff --git a/apps/wiki/templates/wiki/tabs/history_view.html b/apps/wiki/templates/wiki/tabs/history_view.html index 9f68dc49..d9b74dcb 100644 --- a/apps/wiki/templates/wiki/tabs/history_view.html +++ b/apps/wiki/templates/wiki/tabs/history_view.html @@ -1,9 +1,14 @@ {% load i18n %}