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 ec5902d..2173d9e 100644 (file)
--- 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 {\r
-       font: 12px/16px Arial, Helvetica, sans-serif;\r
-}\r
-#fileQueue {\r
-       width: 400px;\r
-       height: 300px;\r
-       overflow: auto;\r
-       border: 1px solid #E5E5E5;\r
-       margin-bottom: 10px;\r
+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
 }
\ 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 0cf8c0e..754de06 100644 (file)
--- a/apps/filebrowser/media/filebrowser/uploadify/example/css/uploadify.css
+++ b/apps/filebrowser/media/filebrowser/uploadify/example/css/uploadify.css
@@ -1,53 +1,53 @@
-/*\r
-Uploadify v2.1.0\r
-Release Date: August 24, 2009\r
-\r
-Copyright (c) 2009 Ronnie Garcia, Travis Nickels\r
-\r
-Permission is hereby granted, free of charge, to any person obtaining a copy\r
-of this software and associated documentation files (the "Software"), to deal\r
-in the Software without restriction, including without limitation the rights\r
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
-copies of the Software, and to permit persons to whom the Software is\r
-furnished to do so, subject to the following conditions:\r
-\r
-The above copyright notice and this permission notice shall be included in\r
-all copies or substantial portions of the Software.\r
-\r
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-THE SOFTWARE.\r
-*/\r
-.uploadifyQueueItem {\r
-       font: 11px Verdana, Geneva, sans-serif;\r
-       border: 2px solid #E5E5E5;\r
-       background-color: #F5F5F5;\r
-       margin-top: 5px;\r
-       padding: 10px;\r
-       width: 350px;\r
-}\r
-.uploadifyError {\r
-       border: 2px solid #FBCBBC !important;\r
-       background-color: #FDE5DD !important;\r
-}\r
-.uploadifyQueueItem .cancel {\r
-       float: right;\r
-}\r
-.uploadifyProgress {\r
-       background-color: #FFFFFF;\r
-       border-top: 1px solid #808080;\r
-       border-left: 1px solid #808080;\r
-       border-right: 1px solid #C5C5C5;\r
-       border-bottom: 1px solid #C5C5C5;\r
-       margin-top: 10px;\r
-       width: 100%;\r
-}\r
-.uploadifyProgressBar {\r
-       background-color: #0099FF;\r
-       width: 1px;\r
-       height: 3px;\r
+/*
+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
 }
\ 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 0cf8c0e..754de06 100644 (file)
--- a/apps/filebrowser/media/filebrowser/uploadify/uploadify.css
+++ b/apps/filebrowser/media/filebrowser/uploadify/uploadify.css
@@ -1,53 +1,53 @@
-/*\r
-Uploadify v2.1.0\r
-Release Date: August 24, 2009\r
-\r
-Copyright (c) 2009 Ronnie Garcia, Travis Nickels\r
-\r
-Permission is hereby granted, free of charge, to any person obtaining a copy\r
-of this software and associated documentation files (the "Software"), to deal\r
-in the Software without restriction, including without limitation the rights\r
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
-copies of the Software, and to permit persons to whom the Software is\r
-furnished to do so, subject to the following conditions:\r
-\r
-The above copyright notice and this permission notice shall be included in\r
-all copies or substantial portions of the Software.\r
-\r
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-THE SOFTWARE.\r
-*/\r
-.uploadifyQueueItem {\r
-       font: 11px Verdana, Geneva, sans-serif;\r
-       border: 2px solid #E5E5E5;\r
-       background-color: #F5F5F5;\r
-       margin-top: 5px;\r
-       padding: 10px;\r
-       width: 350px;\r
-}\r
-.uploadifyError {\r
-       border: 2px solid #FBCBBC !important;\r
-       background-color: #FDE5DD !important;\r
-}\r
-.uploadifyQueueItem .cancel {\r
-       float: right;\r
-}\r
-.uploadifyProgress {\r
-       background-color: #FFFFFF;\r
-       border-top: 1px solid #808080;\r
-       border-left: 1px solid #808080;\r
-       border-right: 1px solid #C5C5C5;\r
-       border-bottom: 1px solid #C5C5C5;\r
-       margin-top: 10px;\r
-       width: 100%;\r
-}\r
-.uploadifyProgressBar {\r
-       background-color: #0099FF;\r
-       width: 1px;\r
-       height: 3px;\r
+/*
+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
 }
\ No newline at end of file

diff --git a/apps/toolbar/templates/toolbar/toolbar.html b/apps/toolbar/templates/toolbar/toolbar.html
index 1e4c203..b9624d6 100644 (file)
--- a/apps/toolbar/templates/toolbar/toolbar.html
+++ b/apps/toolbar/templates/toolbar/toolbar.html
@@ -7,7 +7,7 @@
     </select>
 
        <button type="button" class="prev">&lt;</button>
     </select>
 
        <button type="button" class="prev">&lt;</button>

-    <div class="button_group_container">       
+    <div class="button_group_container">

         {% for group in toolbar_groups %}
         <ul data-group="{{ group.slug }}" class="button_group">
             {# buttons for this group #}
         {% for group in toolbar_groups %}
         <ul data-group="{{ group.slug }}" class="button_group">
             {# buttons for this group #}

diff --git a/apps/wiki/helpers.py b/apps/wiki/helpers.py
index 2cdb916..f072ef9 100644 (file)
--- 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):
 import collections
 
 def recursive_groupby(iterable):

-    """    
+    """

 #    >>> recursive_groupby([1,2,3,4,5])
 #    [1, 2, 3, 4, 5]
 #    >>> recursive_groupby([1,2,3,4,5])
 #    [1, 2, 3, 4, 5]

-    
+

     >>> recursive_groupby([[1]])
     [1]
     >>> recursive_groupby([[1]])
     [1]

-    
+

     >>> recursive_groupby([('a', 1),('a', 2), 3, ('b', 4), 5])
     ['a', [1, 2], 3, 'b', [4], 5]
     >>> 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]]]
     >>> recursive_groupby([('a', 'x', 1),('a', 'x', 2), ('a', 'x', 3)])
     ['a', ['x', [1, 2, 3]]]

-   
+

     """
 
     def _generator(iterator):
     """
 
     def _generator(iterator):

diff --git a/apps/wiki/templates/wiki/document_list.html b/apps/wiki/templates/wiki/document_list.html
index 0ac2a35..6853801 100644 (file)
--- a/apps/wiki/templates/wiki/document_list.html
+++ b/apps/wiki/templates/wiki/document_list.html
@@ -33,7 +33,7 @@ $(function() {
                <tbody>
        {% for doc in docs %}
             <tr>
                <tbody>
        {% for doc in docs %}
             <tr>

-               <td colspan="3"><a target="_blank" data-id="{{doc}}" 
+               <td colspan="3"><a target="_blank" data-id="{{doc}}"

                                        href="{% url wiki_editor doc %}">{{ doc|wiki_title }}</a></td>
                                <!-- placeholder </td> -->
                        </tr>
                                        href="{% url wiki_editor doc %}">{{ doc|wiki_title }}</a></td>
                                <!-- placeholder </td> -->
                        </tr>

diff --git a/apps/wiki/templates/wiki/tabs/gallery_view.html b/apps/wiki/templates/wiki/tabs/gallery_view.html
index f903ccc..2daff10 100644 (file)
--- a/apps/wiki/templates/wiki/tabs/gallery_view.html
+++ b/apps/wiki/templates/wiki/tabs/gallery_view.html
@@ -5,11 +5,11 @@
     <!-- gallery toolbar -->
     <div class="toolbar">
         <button class="previous-page">
     <!-- gallery toolbar -->
     <div class="toolbar">
         <button class="previous-page">

-            <img src="{{STATIC_URL}}icons/go-previous.png" 
+            <img src="{{STATIC_URL}}icons/go-previous.png"

                alt="{% trans "Previous" %}" title="{% trans "Previous" %}"/>
         </button><input type="text" size="3" maxlength="3" value="1" class="page-number" />
         <button class="next-page">
                alt="{% trans "Previous" %}" title="{% trans "Previous" %}"/>
         </button><input type="text" size="3" maxlength="3" value="1" class="page-number" />
         <button class="next-page">

-            <img src="{{STATIC_URL}}icons/go-next.png" 
+            <img src="{{STATIC_URL}}icons/go-next.png"

                alt="{% trans "Next" %}" title="{% trans "Next" %}"/>
         </button>
         <button class="zoom-in">{% trans "Zoom in" %}</button>
                alt="{% trans "Next" %}" title="{% trans "Next" %}"/>
         </button>
         <button class="zoom-in">{% trans "Zoom in" %}</button>

diff --git a/apps/wiki/templates/wiki/tabs/history_view.html b/apps/wiki/templates/wiki/tabs/history_view.html
index 9f68dc4..d9b74dc 100644 (file)
--- a/apps/wiki/templates/wiki/tabs/history_view.html
+++ b/apps/wiki/templates/wiki/tabs/history_view.html
@@ -1,9 +1,14 @@
 {% load i18n %}
 <div id="history-view-editor" class="editor" style="display: none">
     <div class="toolbar">
 {% load i18n %}
 <div id="history-view-editor" class="editor" style="display: none">
     <div class="toolbar">

-       <button type="button" id="make-diff-button">{% trans "Compare versions" %}</button>
-               <button type="button" id="tag-changeset-button">{% trans "Mark version" %}</button>
-               <button id="open-preview-button"
+       <button type="button" id="make-diff-button"
+                       data-enabled-when="2" disabled="disabled">{% trans "Compare versions" %}</button>
+               <button type="button" id="tag-changeset-button"
+                       data-enabled-when="1" disabled="disabled">{% trans "Mark version" %}</button>
+               <button type="button" id="doc-revert-button"
+                       data-enabled-when="1" disabled="disabled">{% trans "Revert document" %}</button>
+               <button id="open-preview-button" disabled="disabled"
+                       data-enabled-when="1"

                        data-basehref="{% url wiki_editor_readonly document_name %}">{% trans "View version" %}</button>
 
        </div>
                        data-basehref="{% url wiki_editor_readonly document_name %}">{% trans "View version" %}</button>
 
        </div>

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 69c9836..c41edd3 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -194,6 +194,24 @@ def text(request, name):
         })
 
 
         })
 
 

+@never_cache
+@normalized_name
+@require_POST
+def revert(request, name):
+    storage = getstorage()
+    revision = request.POST['target_revision']
+
+    try:
+        document = storage.revert(name, revision)
+
+        return JSONResponse({
+            'text': document.plain_text if revision != document.revision else None,
+            'meta': document.meta(),
+            'revision': document.revision,
+        })
+    except DocumentNotFound:
+        raise http.Http404
+

 @never_cache
 def gallery(request, directory):
     try:
 @never_cache
 def gallery(request, directory):
     try:

diff --git a/lib/vstorage/hgui.py b/lib/vstorage/hgui.py
index 0dd56d7..36c6e23 100644 (file)
--- a/lib/vstorage/hgui.py
+++ b/lib/vstorage/hgui.py
@@ -1,5 +1,5 @@
 """
 """

-    Mercurial ui module replacement.   
+    Mercurial ui module replacement.

 """
 
 import mercurial.ui
 """
 
 import mercurial.ui


@@ -10,7 +10,7 @@ class SilentUI(mercurial.ui.ui):
     def __init__(self, *args, **kwargs):
         super(SilentUI, self).__init__(*args, **kwargs)
 
     def __init__(self, *args, **kwargs):
         super(SilentUI, self).__init__(*args, **kwargs)
 

-        # make sure this doesn't collide with anything in Mercurial 
+        # make sure this doesn't collide with anything in Mercurial

         self.__logger = logging.getLogger('mercurial')
 
     def _is_trusted(self, fd, filename):
         self.__logger = logging.getLogger('mercurial')
 
     def _is_trusted(self, fd, filename):

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 9689f72..a7fcf83 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -67,7 +67,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",

-    "redakcja.context_processors.settings", # this is instead of media 
+    "redakcja.context_processors.settings", # this is instead of media

     "django.core.context_processors.request",
 )
 
     "django.core.context_processors.request",
 )
 

diff --git a/redakcja/static/css/dialogs.css b/redakcja/static/css/dialogs.css
index 1c22868..871d723 100644 (file)
--- a/redakcja/static/css/dialogs.css
+++ b/redakcja/static/css/dialogs.css
@@ -8,13 +8,13 @@
 
 .dialog .help_text {
        font-size: 11px;
 
 .dialog .help_text {
        font-size: 11px;

-       color: #2e3536;  
+       color: #2e3536;

 }
 
 .dialog .action_area {
        padding: 1em 0.5em 0.5em;
        border-top: 1px solid black;
 }
 
 .dialog .action_area {
        padding: 1em 0.5em 0.5em;
        border-top: 1px solid black;

-       margin-top: 0.5em;      
+       margin-top: 0.5em;

 }
 
 .dialog p {
 }
 
 .dialog p {

diff --git a/redakcja/static/css/filelist.css b/redakcja/static/css/filelist.css
index a0b4995..c398c45 100644 (file)
--- a/redakcja/static/css/filelist.css
+++ b/redakcja/static/css/filelist.css
@@ -1,4 +1,4 @@
-/* 
+/*

     Document   : filelist
     Created on : 2009-09-04, 20:44:44
     Author     : lreqc
     Document   : filelist
     Created on : 2009-09-04, 20:44:44
     Author     : lreqc


@@ -15,7 +15,7 @@ body {
     border: 1px solid black;
     padding: 0.5em 2em;
     margin: 1em;
     border: 1px solid black;
     padding: 0.5em 2em;
     margin: 1em;

-       overflow: hidden;    
+       overflow: hidden;

 }
 
 #content h1 img {
 }
 
 #content h1 img {


@@ -34,8 +34,8 @@ body {
        float: left;
        max-width: 50%;
        padding-right: 2%;
        float: left;
        max-width: 50%;
        padding-right: 2%;

-       border-right: 1px dashed black; 
-       
+       border-right: 1px dashed black;
+

 }
 
 #last-edited-list {
 }
 
 #last-edited-list {


@@ -46,7 +46,7 @@ body {
 
 #last-edited-list ul {
        margin: 0px;
 
 #last-edited-list ul {
        margin: 0px;

-}      
+}

 
 #last-edited-list li {
        margin-bottom: 1em;
 
 #last-edited-list li {
        margin-bottom: 1em;


@@ -59,7 +59,7 @@ body {
 
 a, a:visited, a:active {
        color: blue;
 
 a, a:visited, a:active {
        color: blue;

-       text-decoration: none;  
+       text-decoration: none;

 }
 
 a:hover {
 }
 
 a:hover {

diff --git a/redakcja/static/css/gallery.css b/redakcja/static/css/gallery.css
index 379abcc..97c9c12 100644 (file)
--- a/redakcja/static/css/gallery.css
+++ b/redakcja/static/css/gallery.css
@@ -13,7 +13,7 @@
     background-color: #FFF;
 }
 
     background-color: #FFF;
 }
 

-#side-gallery .error_message 
+#side-gallery .error_message

 {
        background-color: white;
        color: black;
 {
        background-color: white;
        color: black;


@@ -49,12 +49,12 @@
     -khtml-user-select: none;
     -moz-user-select: none;
     cursor: pointer;
     -khtml-user-select: none;
     -moz-user-select: none;
     cursor: pointer;

-       
+

        background-color: white;
        min-height: 100px;
        min-width: 100px;
 }
 
 .gallery-image img[src=''] {
        background-color: white;
        min-height: 100px;
        min-width: 100px;
 }
 
 .gallery-image img[src=''] {

-       background-color: red;  
+       background-color: red;

 }
 }

diff --git a/redakcja/static/css/html.css b/redakcja/static/css/html.css
index bd710a8..3887300 100644 (file)
--- a/redakcja/static/css/html.css
+++ b/redakcja/static/css/html.css
@@ -26,14 +26,14 @@
  font-size: 8px;
  line-height: 8px;
  margin-bottom: 4px;
  font-size: 8px;
  line-height: 8px;
  margin-bottom: 4px;

- 
+

  padding: 3px 4px;
  vertical-align: super;
  background-color:#add8e6;
  margin-left: -80px;
  width: 70px;
  text-align: center;
  padding: 3px 4px;
  vertical-align: super;
  background-color:#add8e6;
  margin-left: -80px;
  width: 70px;
  text-align: center;

- 
+

  -webkit-border-radius: 4px;
  }
  */
  -webkit-border-radius: 4px;
  }
  */


@@ -210,18 +210,18 @@ not(.strofa) > *[x-verse]::after {
 .htmlview .motto_container {
        display: inline-block;
        margin: 1.5em 0 0;
 .htmlview .motto_container {
        display: inline-block;
        margin: 1.5em 0 0;

-       clear: right;   
+       clear: right;

 }
 
 .htmlview .motto {
     text-align: justify;
 }
 
 .htmlview .motto {
     text-align: justify;

-    font-style: italic;    
+    font-style: italic;

 }
 
 .htmlview p.motto_podpis {
        position: relative;
        right: -3em;
 }
 
 .htmlview p.motto_podpis {
        position: relative;
        right: -3em;

-       text-align: right;      
+       text-align: right;

 }
 
 .htmlview div.fragment {
 }
 
 .htmlview div.fragment {


@@ -340,7 +340,7 @@ div[x-node] > .uwaga {
     text-decoration: none;
     background-color: #fff;
     /*    border: 1px solid gray;
     text-decoration: none;
     background-color: #fff;
     /*    border: 1px solid gray;

-     
+

      border-right: none;
      */
     z-index: 1;
      border-right: none;
      */
     z-index: 1;


@@ -467,8 +467,8 @@ div[x-node] > .uwaga {
     left: 70px;
 }
 
     left: 70px;
 }
 

-.edit-button:hover, .edit-button:active, 
-.delete-button:hover, .delete-button:active, 
+.edit-button:hover, .edit-button:active,
+.delete-button:hover, .delete-button:active,

 .accept-button:hover, .accept-button:active {
     /*    color: #FFF;*/
     background-color: #999;
 .accept-button:hover, .accept-button:active {
     /*    color: #FFF;*/
     background-color: #999;

diff --git a/redakcja/static/css/html_print.css b/redakcja/static/css/html_print.css
index 38cb596..8121035 100644 (file)
--- a/redakcja/static/css/html_print.css
+++ b/redakcja/static/css/html_print.css
@@ -3,7 +3,7 @@
     font-size: 16px;
     font: Georgia, "Times New Roman", serif;
     line-height: 1.5em;
     font-size: 16px;
     font: Georgia, "Times New Roman", serif;
     line-height: 1.5em;

-    padding: 3em;    
+    padding: 3em;

 }
 
 .htmlview div {
 }
 
 .htmlview div {

diff --git a/redakcja/static/css/jquery.autocomplete.css b/redakcja/static/css/jquery.autocomplete.css
index 91b6228..416cde1 100644 (file)
--- a/redakcja/static/css/jquery.autocomplete.css
+++ b/redakcja/static/css/jquery.autocomplete.css
@@ -19,15 +19,15 @@
        padding: 2px 5px;
        cursor: default;
        display: block;
        padding: 2px 5px;
        cursor: default;
        display: block;

-       /* 
-       if width will be 100% horizontal scrollbar will apear 
+       /*
+       if width will be 100% horizontal scrollbar will apear

        when scroll mode will be used
        */
        /*width: 100%;*/
        font: menu;
        font-size: 12px;
        when scroll mode will be used
        */
        /*width: 100%;*/
        font: menu;
        font-size: 12px;

-       /* 
-       it is very important, if line-height not setted or setted 
+       /*
+       it is very important, if line-height not setted or setted

        in relative units scroll will be broken in firefox
        */
        line-height: 16px;
        in relative units scroll will be broken in firefox
        */
        line-height: 16px;

diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css
index ac56414..8e1d053 100644 (file)
--- a/redakcja/static/css/master.css
+++ b/redakcja/static/css/master.css
@@ -1,6 +1,6 @@
 a, a:visited, a:active {
        color: blue;
 a, a:visited, a:active {
        color: blue;

-       text-decoration: none;  
+       text-decoration: none;

 }
 
 a:hover {
 }
 
 a:hover {


@@ -23,10 +23,10 @@ body {
     bottom: 0;
     right: 0;
     width: 26px;
     bottom: 0;
     right: 0;
     width: 26px;

-    background: #C1C1C1 url(../img/gallery.png) no-repeat scroll center center;        
+    background: #C1C1C1 url(../img/gallery.png) no-repeat scroll center center;

     border-left: 2px solid #999;
     border-right: 2px solid #999;
     border-left: 2px solid #999;
     border-right: 2px solid #999;

-    cursor: pointer;   
+    cursor: pointer;

 }
 
 .vsplitbar:hover {
 }
 
 .vsplitbar:hover {


@@ -73,16 +73,16 @@ body {
        right: 0px;
        left: 0px;
        height: 30px;
        right: 0px;
        left: 0px;
        height: 30px;

-       border-bottom: 1px solid #999; 
-       
+       border-bottom: 1px solid #999;
+

     margin: 0;
     padding: 0;
     background-color: #C1C1C1;
     background-image: -webkit-gradient(linear, left top, left bottom, from(#C1C1C1), color-stop(0.9, #A2A2A2));
     margin: 0;
     padding: 0;
     background-color: #C1C1C1;
     background-image: -webkit-gradient(linear, left top, left bottom, from(#C1C1C1), color-stop(0.9, #A2A2A2));

-       
+

        /* Firefox 3.6 */
        background-image: -moz-linear-gradient(top left, #C1C1C1, #A2A2A2, 90%);
        /* Firefox 3.6 */
        background-image: -moz-linear-gradient(top left, #C1C1C1, #A2A2A2, 90%);

-       
+

     font: 11px Helvetica, Verdana, sans-serif;
     font-weight: bold;
 }
     font: 11px Helvetica, Verdana, sans-serif;
     font-weight: bold;
 }


@@ -108,35 +108,35 @@ body {
     margin: 0;
        padding: 0;
        height: 31px;
     margin: 0;
        padding: 0;
        height: 31px;

-       border: 0px;    
-       padding-left: 1em;      
+       border: 0px;
+       padding-left: 1em;

 }
 
 #tabs li {
        height: 18px;
        margin-top: 6px;
 }
 
 #tabs li {
        height: 18px;
        margin-top: 6px;

-       margin-bottom: 0px;     
-       
-    -webkit-user-select: none; 
+       margin-bottom: 0px;
+
+    -webkit-user-select: none;

     cursor: pointer;
     display: block;
     float: left;
     cursor: pointer;
     display: block;
     float: left;

-       
+

        padding-left: 12px;
        padding-right: 12px;
        padding-top: 5px;
        padding-left: 12px;
        padding-right: 12px;
        padding-top: 5px;

-       
+

     font-weight: bold;
     color: #222;
     font-weight: bold;
     color: #222;

-    margin-left: 4px;    
-       
+    margin-left: 4px;
+

     background-color: #A2A2A2;
     background-color: #A2A2A2;

-       
+

        -moz-box-shadow: 1px -1px 2px rgba(127, 127, 127, 0.25);
     -webkit-box-shadow: 1px -1px 2px rgba(127, 127, 127, 0.25);
 
     border: 1px solid #999;
        -moz-box-shadow: 1px -1px 2px rgba(127, 127, 127, 0.25);
     -webkit-box-shadow: 1px -1px 2px rgba(127, 127, 127, 0.25);
 
     border: 1px solid #999;

-       border-bottom-width: 0px;       
+       border-bottom-width: 0px;

        -moz-border-radius: 4px 4px 0px 0px;
        -webkit-border-radius: 4px;
     -webkit-border-bottom-left-radius: 0px;
        -moz-border-radius: 4px 4px 0px 0px;
        -webkit-border-radius: 4px;
     -webkit-border-bottom-left-radius: 0px;


@@ -144,7 +144,7 @@ body {
 }
 
 #tabs li.active {
 }
 
 #tabs li.active {

-    background-color: #C1C1C1;    
+    background-color: #C1C1C1;

 }
 
 #tools {
 }
 
 #tools {


@@ -153,7 +153,7 @@ body {
        overflow: hidden;
     margin: 0;
        padding: 0;
        overflow: hidden;
     margin: 0;
        padding: 0;

-       height: 30px;  
+       height: 30px;

        margin-right: 5px;
        line-height: 30px;
        font-size: 10px;
        margin-right: 5px;
        line-height: 30px;
        font-size: 10px;


@@ -161,7 +161,7 @@ body {
 }
 
 /* Remove extra padding in Firefox */
 }
 
 /* Remove extra padding in Firefox */

-button::-moz-focus-inner { 
+button::-moz-focus-inner {

     border: 0;
     padding: 0;
 }
     border: 0;
     padding: 0;
 }


@@ -207,12 +207,12 @@ p { margin: 0;}
 }
 
 /*
 }
 
 /*

- * CodeMirror 
+ * CodeMirror

  */
 
 .CodeMirror-line-numbers {
        padding: 0px;
  */
 
 .CodeMirror-line-numbers {
        padding: 0px;

-       padding-top: 5px;               
+       padding-top: 5px;

        text-align: right;
        overflow: hidden;
        width: 40px;
        text-align: right;
        overflow: hidden;
        width: 40px;


@@ -221,7 +221,7 @@ p { margin: 0;}
 }
 
 .CodeMirror-line-numbers div {
 }
 
 .CodeMirror-line-numbers div {

-       display: block;  
+       display: block;

        font-family:"Lucida Console", monospace;
     font-size: 13px;
     line-height: 18px;
        font-family:"Lucida Console", monospace;
     font-size: 13px;
     line-height: 18px;


@@ -231,7 +231,7 @@ p { margin: 0;}
 img.tabclose {
        padding-left: 8px;
        width: 16px;
 img.tabclose {
        padding-left: 8px;
        width: 16px;

-       height: 16px;   
+       height: 16px;

        vertical-align: middle;
        vertical-align: text-bottom;
 }
        vertical-align: middle;
        vertical-align: text-bottom;
 }


@@ -239,8 +239,8 @@ img.tabclose {
 
 /*
  * HTML Editor view
 
 /*
  * HTML Editor view

- */ 
- 
+ */
+

 .htmlview {
        z-index: 1;
        overflow: hidden;
 .htmlview {
        z-index: 1;
        overflow: hidden;


@@ -248,7 +248,7 @@ img.tabclose {
 
 .htmlview *[x-editable] {
     background-color: white;
 
 .htmlview *[x-editable] {
     background-color: white;

-       
+

 }
 .htmlview .active[x-editable] {
     background-color: #FAFAFA;
 }
 .htmlview .active[x-editable] {
     background-color: #FAFAFA;

diff --git a/redakcja/static/css/summary.css b/redakcja/static/css/summary.css
index 8fac6e1..6c05e0b 100644 (file)
--- a/redakcja/static/css/summary.css
+++ b/redakcja/static/css/summary.css
@@ -3,29 +3,29 @@
 }
 
 #summary-view {
 }
 
 #summary-view {

-       padding: 1em;                   
+       padding: 1em;

 }
 
 #summary-view .book-cover {
        float: left;
        margin: 1em;
        margin-right: 2em;
 }
 
 #summary-view .book-cover {
        float: left;
        margin: 1em;
        margin-right: 2em;

-       
+

        height: 300px;
        width: 212px;
        height: 300px;
        width: 212px;

-       
-       
+
+

        border: 1px dashed black;
 }
 
 #summary-view p {
        border: 1px dashed black;
 }
 
 #summary-view p {

-       margin: 0.5em; 
+       margin: 0.5em;

 }
 
 #summary-view label {
 }
 
 #summary-view label {

-       font-weight: bold; 
-}  
+       font-weight: bold;
+}

 
 #summary-view .book-cover {
 
 #summary-view .book-cover {

-       
+

 }
 }

diff --git a/redakcja/static/css/toolbar.css b/redakcja/static/css/toolbar.css
index c07c57f..d143540 100644 (file)
--- a/redakcja/static/css/toolbar.css
+++ b/redakcja/static/css/toolbar.css
@@ -14,11 +14,11 @@
 
 .toolbar > .group_selector {
        position: absolute;
 
 .toolbar > .group_selector {
        position: absolute;

-       
+

     margin: 1px 5px 1px 0;
     border: 1px solid #999;
     padding: 1px;
     margin: 1px 5px 1px 0;
     border: 1px solid #999;
     padding: 1px;

-    
+

     top: 0px;
     left: 0px;
     bottom: 0px;
     top: 0px;
     left: 0px;
     bottom: 0px;


@@ -51,9 +51,9 @@
     bottom: 0px;
 }
 
     bottom: 0px;
 }
 

-.toolbar ul.button_group {     
+.toolbar ul.button_group {

        margin: 0;
        margin: 0;

-       padding: 0;     
+       padding: 0;

        width: 10000%;
 }
 
        width: 10000%;
 }
 


@@ -74,11 +74,11 @@
 
 .toolbar .button_group button img {
        margin: 0;
 
 .toolbar .button_group button img {
        margin: 0;

-       padding: 0;     
+       padding: 0;

        margin-bottom: -3px;
 }
 
        margin-bottom: -3px;
 }
 

-.toolbar .button_group button:hover, 
+.toolbar .button_group button:hover,

 .toolbar .button_group button:active {
     background: #777;
     color: #FFF;
 .toolbar .button_group button:active {
     background: #777;
     color: #FFF;

diff --git a/redakcja/static/css/xmlcolors_15032010.css b/redakcja/static/css/xmlcolors_15032010.css
index 099f94a..17277f8 100644 (file)
--- a/redakcja/static/css/xmlcolors_15032010.css
+++ b/redakcja/static/css/xmlcolors_15032010.css
@@ -1,11 +1,11 @@
-.editbox {  
+.editbox {

   margin: .4em;
   margin-top: 5px;
   margin-left: 5px;
   padding: 0;
   font-family:"Lucida Console", monospace;
   font-size: 13px;
   margin: .4em;
   margin-top: 5px;
   margin-left: 5px;
   padding: 0;
   font-family:"Lucida Console", monospace;
   font-size: 13px;

-  line-height: 18px;  
+  line-height: 18px;

   color: black;
 }
 
   color: black;
 }
 


@@ -14,9 +14,9 @@
 }
 
 .editbox span {
 }
 
 .editbox span {

-       display: inline;  
+       display: inline;

        font-size: 13px;
        font-size: 13px;

-    line-height: 18px; 
+    line-height: 18px;

 }
 
 span.xml-tagname {
 }
 
 span.xml-tagname {

diff --git a/redakcja/static/filebrowser/uploadify/example/css/default.css b/redakcja/static/filebrowser/uploadify/example/css/default.css
index ec5902d..2173d9e 100644 (file)
--- a/redakcja/static/filebrowser/uploadify/example/css/default.css
+++ b/redakcja/static/filebrowser/uploadify/example/css/default.css
@@ -1,10 +1,10 @@
-body {\r
-       font: 12px/16px Arial, Helvetica, sans-serif;\r
-}\r
-#fileQueue {\r
-       width: 400px;\r
-       height: 300px;\r
-       overflow: auto;\r
-       border: 1px solid #E5E5E5;\r
-       margin-bottom: 10px;\r
+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
 }
\ No newline at end of file

diff --git a/redakcja/static/filebrowser/uploadify/example/css/uploadify.css b/redakcja/static/filebrowser/uploadify/example/css/uploadify.css
index 0cf8c0e..754de06 100644 (file)
--- a/redakcja/static/filebrowser/uploadify/example/css/uploadify.css
+++ b/redakcja/static/filebrowser/uploadify/example/css/uploadify.css
@@ -1,53 +1,53 @@
-/*\r
-Uploadify v2.1.0\r
-Release Date: August 24, 2009\r
-\r
-Copyright (c) 2009 Ronnie Garcia, Travis Nickels\r
-\r
-Permission is hereby granted, free of charge, to any person obtaining a copy\r
-of this software and associated documentation files (the "Software"), to deal\r
-in the Software without restriction, including without limitation the rights\r
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
-copies of the Software, and to permit persons to whom the Software is\r
-furnished to do so, subject to the following conditions:\r
-\r
-The above copyright notice and this permission notice shall be included in\r
-all copies or substantial portions of the Software.\r
-\r
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-THE SOFTWARE.\r
-*/\r
-.uploadifyQueueItem {\r
-       font: 11px Verdana, Geneva, sans-serif;\r
-       border: 2px solid #E5E5E5;\r
-       background-color: #F5F5F5;\r
-       margin-top: 5px;\r
-       padding: 10px;\r
-       width: 350px;\r
-}\r
-.uploadifyError {\r
-       border: 2px solid #FBCBBC !important;\r
-       background-color: #FDE5DD !important;\r
-}\r
-.uploadifyQueueItem .cancel {\r
-       float: right;\r
-}\r
-.uploadifyProgress {\r
-       background-color: #FFFFFF;\r
-       border-top: 1px solid #808080;\r
-       border-left: 1px solid #808080;\r
-       border-right: 1px solid #C5C5C5;\r
-       border-bottom: 1px solid #C5C5C5;\r
-       margin-top: 10px;\r
-       width: 100%;\r
-}\r
-.uploadifyProgressBar {\r
-       background-color: #0099FF;\r
-       width: 1px;\r
-       height: 3px;\r
+/*
+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
 }
\ No newline at end of file

diff --git a/redakcja/static/filebrowser/uploadify/uploadify.css b/redakcja/static/filebrowser/uploadify/uploadify.css
index 0cf8c0e..754de06 100644 (file)
--- a/redakcja/static/filebrowser/uploadify/uploadify.css
+++ b/redakcja/static/filebrowser/uploadify/uploadify.css
@@ -1,53 +1,53 @@
-/*\r
-Uploadify v2.1.0\r
-Release Date: August 24, 2009\r
-\r
-Copyright (c) 2009 Ronnie Garcia, Travis Nickels\r
-\r
-Permission is hereby granted, free of charge, to any person obtaining a copy\r
-of this software and associated documentation files (the "Software"), to deal\r
-in the Software without restriction, including without limitation the rights\r
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
-copies of the Software, and to permit persons to whom the Software is\r
-furnished to do so, subject to the following conditions:\r
-\r
-The above copyright notice and this permission notice shall be included in\r
-all copies or substantial portions of the Software.\r
-\r
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-THE SOFTWARE.\r
-*/\r
-.uploadifyQueueItem {\r
-       font: 11px Verdana, Geneva, sans-serif;\r
-       border: 2px solid #E5E5E5;\r
-       background-color: #F5F5F5;\r
-       margin-top: 5px;\r
-       padding: 10px;\r
-       width: 350px;\r
-}\r
-.uploadifyError {\r
-       border: 2px solid #FBCBBC !important;\r
-       background-color: #FDE5DD !important;\r
-}\r
-.uploadifyQueueItem .cancel {\r
-       float: right;\r
-}\r
-.uploadifyProgress {\r
-       background-color: #FFFFFF;\r
-       border-top: 1px solid #808080;\r
-       border-left: 1px solid #808080;\r
-       border-right: 1px solid #C5C5C5;\r
-       border-bottom: 1px solid #C5C5C5;\r
-       margin-top: 10px;\r
-       width: 100%;\r
-}\r
-.uploadifyProgressBar {\r
-       background-color: #0099FF;\r
-       width: 1px;\r
-       height: 3px;\r
+/*
+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
 }
\ No newline at end of file

diff --git a/redakcja/static/js/button_scripts.js b/redakcja/static/js/button_scripts.js
index e7b1c42..2a585dc 100644 (file)
--- a/redakcja/static/js/button_scripts.js
+++ b/redakcja/static/js/button_scripts.js
@@ -258,18 +258,18 @@ function ScriptletCenter()
 ScriptletCenter.prototype.callInteractive = function(opts) {
        $progress = $('<span>Executing script</span>');
        var self = this;
 ScriptletCenter.prototype.callInteractive = function(opts) {
        $progress = $('<span>Executing script</span>');
        var self = this;

-       
+

        /* This won't work, 'cause the JS below might be synchronous :( */
        /* var timer = setTimeout(function() {
            $.blockUI({message: $progress});
            timer = null;
        }, 1000); */
        /* This won't work, 'cause the JS below might be synchronous :( */
        /* var timer = setTimeout(function() {
            $.blockUI({message: $progress});
            timer = null;
        }, 1000); */

-       
+

        $.blockUI({message: $progress, showOverlay: false});
 
        self.scriptlets[opts.action](opts.context, opts.extra, function(){
        $.blockUI({message: $progress, showOverlay: false});
 
        self.scriptlets[opts.action](opts.context, opts.extra, function(){

-           /*if(timer) 
-               clearTimeout(timer);    
+           /*if(timer)
+               clearTimeout(timer);

            else */
            $.unblockUI(); // done
        });
            else */
            $.unblockUI(); // done
        });


@@ -282,7 +282,7 @@ ScriptletCenter.prototype.XMLEditorSelectedText = function(editor) {
 
 ScriptletCenter.prototype.XMLEditorReplaceSelectedText = function(editor, replacement)
 {
 
 ScriptletCenter.prototype.XMLEditorReplaceSelectedText = function(editor, replacement)
 {

-       $progress.html("Replacing text");       
+       $progress.html("Replacing text");

        editor.replaceSelection(replacement);
 };
 
        editor.replaceSelection(replacement);
 };
 

diff --git a/redakcja/static/js/wiki/loader.js b/redakcja/static/js/wiki/loader.js
index 7a905d9..33d9cc8 100644 (file)
--- a/redakcja/static/js/wiki/loader.js
+++ b/redakcja/static/js/wiki/loader.js
@@ -91,7 +91,7 @@ $(function()
                                return "Na stronie mogą być nie zapisane zmiany.";
                        };
         };
                                return "Na stronie mogą być nie zapisane zmiany.";
                        };
         };

-        
+

                console.log("Fetching document's text");
 
                $(document).bind('wlapi_document_changed', function(event, doc) {
                console.log("Fetching document's text");
 
                $(document).bind('wlapi_document_changed', function(event, doc) {

diff --git a/redakcja/static/js/wiki/toolbar.js b/redakcja/static/js/wiki/toolbar.js
index 8a35aa5..3eafdae 100644 (file)
--- a/redakcja/static/js/wiki/toolbar.js
+++ b/redakcja/static/js/wiki/toolbar.js
@@ -2,59 +2,59 @@
  * Toolbar plugin.
  */
 (function($) {
  * Toolbar plugin.
  */
 (function($) {

-    
+

     $.fn.toolbarize = function(options) {
         var $toolbar = $(this);
         var $container = $('.button_group_container', $toolbar);
     $.fn.toolbarize = function(options) {
         var $toolbar = $(this);
         var $container = $('.button_group_container', $toolbar);

-        
-        $('.button_group button', $toolbar).click(function(event){            
+
+        $('.button_group button', $toolbar).click(function(event){

             event.preventDefault();
             event.preventDefault();

-            
+

             var params = eval("(" + $(this).attr('data-ui-action-params') + ")");
             var params = eval("(" + $(this).attr('data-ui-action-params') + ")");

-            
+

             scriptletCenter.callInteractive({
                 action: $(this).attr('data-ui-action'),
                 context: options.actionContext,
                 extra: params
             });
         });
             scriptletCenter.callInteractive({
                 action: $(this).attr('data-ui-action'),
                 context: options.actionContext,
                 extra: params
             });
         });

-                
+

         $toolbar.children().filter('select').change(function(event){
         $toolbar.children().filter('select').change(function(event){

-            var slug = $(this).val();            
+            var slug = $(this).val();

             $container.scrollLeft(0);
             $container.scrollLeft(0);

-            $('*[data-group]').hide().filter('[data-group=' + slug + ']').show();            
+            $('*[data-group]').hide().filter('[data-group=' + slug + ']').show();

         }).change();
         }).change();

-        
+

         $('button.next', $toolbar).click(function() {
         $('button.next', $toolbar).click(function() {

-            var $current_group = $('.button_group:visible', $toolbar);            
-            var scroll = $container.scrollLeft();            
-                       
+            var $current_group = $('.button_group:visible', $toolbar);
+            var scroll = $container.scrollLeft();
+

             var $hidden = $("li", $current_group).filter(function() {
                 return ($(this).position().left + $(this).outerWidth()) > $container.width();
             var $hidden = $("li", $current_group).filter(function() {
                 return ($(this).position().left + $(this).outerWidth()) > $container.width();

-            }).first(); 
-            
+            }).first();
+

             if($hidden.length > 0) {
             if($hidden.length > 0) {

-                scroll = $hidden.position().left + scroll + $hidden.outerWidth() - $container.width() + 1;          
+                scroll = $hidden.position().left + scroll + $hidden.outerWidth() - $container.width() + 1;

                 $container.scrollLeft(scroll);
             };
         });
                 $container.scrollLeft(scroll);
             };
         });

-        
+

         $('button.prev', $toolbar).click(function() {
         $('button.prev', $toolbar).click(function() {

-            var $current_group = $('.button_group:visible', $toolbar);            
+            var $current_group = $('.button_group:visible', $toolbar);

             var scroll = $container.scrollLeft();
             var scroll = $container.scrollLeft();

-            
-            /* first not visible element is: */          
+
+            /* first not visible element is: */

             var $hidden = $("li", $current_group).filter(function() {
                 return $(this).position().left < 0;
             }).last();
             var $hidden = $("li", $current_group).filter(function() {
                 return $(this).position().left < 0;
             }).last();

-            
+

             if( $hidden.length > 0)
             {
             if( $hidden.length > 0)
             {

-                scroll = scroll + $hidden.position().left;           
+                scroll = scroll + $hidden.position().left;

                 $container.scrollLeft(scroll);
             };
         });
                 $container.scrollLeft(scroll);
             };
         });

-        
-    };           
-                    
+
+    };
+

 })(jQuery);
\ No newline at end of file
 })(jQuery);
\ No newline at end of file

diff --git a/redakcja/static/js/wiki/view_history.js b/redakcja/static/js/wiki/view_history.js
index 348f0c7..d35a8da 100644 (file)
--- a/redakcja/static/js/wiki/view_history.js
+++ b/redakcja/static/js/wiki/view_history.js
@@ -15,6 +15,10 @@
                                self.showTagForm();
                        });
 
                                self.showTagForm();
                        });
 

+               $('#doc-revert-button').click(function() {
+                   self.revertDocumentToVersion();
+               });
+

                        $('#open-preview-button').click(function(event) {
                                var selected = $('#changes-list .entry.selected');
 
                        $('#open-preview-button').click(function(event) {
                                var selected = $('#changes-list .entry.selected');
 


@@ -31,11 +35,23 @@
 
                $('#changes-list .entry').live('click', function(){
                var $this = $(this);
 
                $('#changes-list .entry').live('click', function(){
                var $this = $(this);

-               if ($this.hasClass('selected'))
-                       return $this.removeClass('selected');

 
 

-               if ($("#changes-list .entry.selected").length < 2)
-                       return $this.addClass('selected');
+               var selected_count = $("#changes-list .entry.selected").length;
+
+               if ($this.hasClass('selected')) {
+                       $this.removeClass('selected');
+                       selected_count -= 1;
+               }
+               else {
+                   if (selected_count  < 2) {
+                       $this.addClass('selected');
+                       selected_count += 1;
+                   };
+               };
+
+               $('#history-view-editor .toolbar button').attr('disabled', 'disabled').
+                   filter('*[data-enabled-when~=' + selected_count + '], *[data-enabled-when~=*]').
+                   attr('disabled', null);

                });
 
            $('#changes-list span.tag').live('click', function(event){
                });
 
            $('#changes-list span.tag').live('click', function(event){


@@ -156,6 +172,18 @@
         });
     };
 
         });
     };
 

+    HistoryPerspective.prototype.revertDocumentToVersion = function(){
+        var selected = $('#changes-list .entry.selected');
+
+        if (selected.length != 1) {
+            window.alert("Musisz zaznaczyć dokładnie jedną wersję.");
+            return;
+        }
+
+        var version = parseInt($("*[data-stub-value='version']", selected[0]).text());
+        this.doc.revertToVersion({'revision': version});
+    };
+

     $.wiki.HistoryPerspective = HistoryPerspective;
 
 })(jQuery);
     $.wiki.HistoryPerspective = HistoryPerspective;
 
 })(jQuery);

diff --git a/redakcja/static/js/wiki/wikiapi.js b/redakcja/static/js/wiki/wikiapi.js
index d62d8fe..3ec2fdc 100644 (file)
--- a/redakcja/static/js/wiki/wikiapi.js
+++ b/redakcja/static/js/wiki/wikiapi.js
@@ -9,9 +9,9 @@
        /*
         * Return absolute reverse path of given named view. (at least he have it
         * hard-coded in one place)
        /*
         * Return absolute reverse path of given named view. (at least he have it
         * hard-coded in one place)

-        * 
+        *

         * TODO: think of a way, not to hard-code it here ;)
         * TODO: think of a way, not to hard-code it here ;)

-        * 
+        *

         */
        function reverse() {
                var vname = arguments[0];
         */
        function reverse() {
                var vname = arguments[0];


@@ -103,10 +103,10 @@
        };
        /*
         * Fetch history of this document.
        };
        /*
         * Fetch history of this document.

-        * 
+        *

         * from - First revision to fetch (default = 0) upto - Last revision to
         * fetch (default = tip)
         * from - First revision to fetch (default = 0) upto - Last revision to
         * fetch (default = tip)

-        * 
+        *

         */
        WikiDocument.prototype.fetchHistory = function(params) {
                /* this doesn't modify anything, so no locks */
         */
        WikiDocument.prototype.fetchHistory = function(params) {
                /* this doesn't modify anything, so no locks */

diff --git a/redakcja/templates/base.html b/redakcja/templates/base.html
index bcdbcc3..920311b 100644 (file)
--- a/redakcja/templates/base.html
+++ b/redakcja/templates/base.html
@@ -9,14 +9,14 @@
         {% endblock %}
     </head>
     <body id="{% block bodyid %}base{% endblock %}">
         {% endblock %}
     </head>
     <body id="{% block bodyid %}base{% endblock %}">

-    
+

     <div id="loading-overlay" style="display: none;">
        <div id="loading-message">
                <img src="{{STATIC_URL}}img/spinner.gif" />
                <p>{% trans "Loading" %}</p>
        </div>
        </div>
     <div id="loading-overlay" style="display: none;">
        <div id="loading-message">
                <img src="{{STATIC_URL}}img/spinner.gif" />
                <p>{% trans "Loading" %}</p>
        </div>
        </div>

-       
+

        <div id="body-wrap">
         <div id="content">{% block maincontent %} {% endblock %}</div>
         </div>
        <div id="body-wrap">
         <div id="content">{% block maincontent %} {% endblock %}</div>
         </div>

diff --git a/requirements.txt b/requirements.txt
index b52baef..70cbcae 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ PIL>=1.1
 ## Book conversion library
 git+git://github.com/fnp/librarian.git@master#egg=librarian
 
 ## Book conversion library
 git+git://github.com/fnp/librarian.git@master#egg=librarian
 

-## Django 
+## Django

 Django>=1.1.1,<1.2
 sorl-thumbnail>=3.2
 django-maintenancemode>=0.9
 Django>=1.1.1,<1.2
 sorl-thumbnail>=3.2
 django-maintenancemode>=0.9