From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Fri, 4 Sep 2009 09:15:28 +0000 (+0200)
Subject: Poprawki do widoku upload.
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/806f7ea48c066ee89bcbc0035ae3b7d2bff7186b

Poprawki do widoku upload.
---

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 0c558fbf..251ad214 100644
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -61,7 +61,6 @@ def file_list(request, repo):
 @with_repo
 def file_upload(request, repo):
     other_errors = []
-
     if request.method == 'POST':
         form = forms.BookUploadForm(request.POST, request.FILES)
         if form.is_valid():
diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index 628c78d4..9dd12244 100644
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@ -128,11 +128,11 @@ Panel.prototype.connectToolbar = function()
 
         group.click(function() {
             // change the active group
-            var active = $("*.toolbar-tabs-container button.active");
+            var active = $("*.toolbar-tabs-container button.active", toolbar);
             if (active != group) {
                 active.removeClass('active');                
                 group.addClass('active');
-                $(".toolbar-button-groups-container p").each(function() {
+                $(".toolbar-button-groups-container p", toolbar).each(function() {
                     if ( $(this).attr('ui:group') != group_name) 
                         $(this).hide();
                     else
@@ -143,7 +143,7 @@ Panel.prototype.connectToolbar = function()
     });
 
     // connect action buttons
-    var action_buttons = $('*.toolbar-button-groups-container button');
+    var action_buttons = $('*.toolbar-button-groups-container button', toolbar);
     action_buttons.each(function() {
         var button = $(this); 
         
@@ -151,6 +151,8 @@ Panel.prototype.connectToolbar = function()
            editor.callScriptlet(button.attr('ui:action'),
                 self, eval(button.attr('ui:action-params')) );
         });
+
+        // connect hotkeys
         
     });
 }