Merge branch 'master' of git@stigma:platforma

Conflicts:

	project/static/js/jquery.hpanel.js
	project/static/js/panels.js
	project/templates/explorer/panels/xmleditor.html

diff --git a/project/static/js/jquery.hpanel.js b/project/static/js/jquery.hpanel.js
index eb6d8bd..2f917a8 100644 (file)
--- a/project/static/js/jquery.hpanel.js
+++ b/project/static/js/jquery.hpanel.js
@@ -28,10 +28,12 @@
                        // $('.panel-content', event.data.root).css('display', 'block');
                        var overlays = $('.panel-content-overlay', event.data.root);
                        $('.panel-content-overlay', event.data.root).each(function(i) {
-                               $(this).data('panel').css({
-                                       'left': $(this).css('left'), 
-                                       'width': $(this).css('width') 
-                               });
+                               if( $(this).data('panel').hasClass('last-panel') )
+                                       $(this).data('panel').css({
+                                               'left': $(this).css('left'), 'right': $(this).css('right')}); 
+                               else
+                                       $(this).data('panel').css({
+                                               'left': $(this).css('left'), 'width': $(this).css('width')}); 
                        });
 
                        $('.panel-overlay', event.data.root).css('display', 'none');
@@ -58,7 +60,7 @@
                        overlay.data('panel', panel);
                        overlay.data('next', null);
 
-                       if( panel.hasClass('last-panel') )
+                       if( panel.hasClass('last-panel') )                              
                                overlay.css({'left': panel.css('left'), 'right': panel.css('right')});
                        else
                                overlay.css({'left': panel.css('left'), 'width': panel.css('width')});
@@ -77,8 +79,10 @@
                                        $(this).trigger('hpanel:panel-resize-start', touch_data);
                                        return false;
                                });
-                               $('.panel-content', panel).css('right',handle.outerWidth() + 'px');
-                               $('.panel-content-overlay', panel).css('right',handle.outerWidth() + 'px');
+                               $('.panel-content', panel).css('right', 
+                                       (handle.outerWidth() || 10) + 'px');
+                               $('.panel-content-overlay', panel).css('right',
+                                       (handle.outerWidth() || 10) + 'px');
                        }
                                
                        prev = overlay;

diff --git a/project/static/js/panels.js b/project/static/js/panels.js
index 1317d9e..c53d135 100644 (file)
--- a/project/static/js/panels.js
+++ b/project/static/js/panels.js
@@ -1,4 +1,5 @@
 function loadPanel(target, url) {
+    $.log('ajax', url, 'into', target);
     $('.change-notification', $(target).parent()).fadeOut();
     $(document).trigger('panel:unload', target);
     $.ajax({
@@ -9,7 +10,7 @@ function loadPanel(target, url) {
             $(document).trigger('panel:load', target);
         },
         error: function(request, textStatus, errorThrown) {
-            console.log('ajax', url, target, 'error:', textStatus, errorThrown);
+            $.log('ajax', url, target, 'error:', textStatus, errorThrown);
         }
     });
 }
@@ -36,104 +37,10 @@ function panel(load, unload) {
 }
 
 $(function() {
-    // ========================
-    // = Resizable panels =
-    // ========================
-//    function resizePanels() {
-//             // called on resize
-//        $('.panel').height($(window).height() - $('.panel').position().top);
-//        $('.panel-content').height($(window).height() - $('.panel-contents').position().top);
-//        $('#right-panel-wrap').width($(window).width() - $('#left-panel-wrap').outerWidth());
-//    }
-    
-//    $(window).resize(function() {
-//        resizePanels();
-//    })
-
     $('#panels').makeHorizPanel({});
     $('#panels').css('top', ($('#header').outerHeight() ) + 'px');
        
-//    $('#left-panel-wrap').bind('resizable:stop', resizePanels)
-//        .resizable({minWidth: 8});    
-//    resizePanels();
-    
     $('.panel-toolbar select').change(function() {
         loadPanel($('.panel-content', $(this).parent().parent()), $(this).val())
     });
-    // $('#id_folders').change(function() {
-    //     $('#images').load('{% url folder_image_ajax %}' + $('#id_folders').val() + '/', function() {
-    //         $('#images-wrap').data('lazyload:lastCheckedScrollTop', -10000);
-    //     });
-    // });
-    // 
-    //
-    
-    // var editor = CodeMirror.fromTextArea("id_text", {
-    //     parserfile: 'parsexml.js',
-    //     path: "/static/js/codemirror/",
-    //     stylesheet: "/static/css/xmlcolors.css",
-    //     parserConfig: {useHTMLKludges: false},
-    //     initCallback: function() {
-    //         $('#images').autoscroll('iframe');
-    //         $('.toggleAutoscroll').toggle(function() {
-    //             $(this).html('Synchronizuj przewijanie');
-    //             $('#images').disableAutoscroll();
-    //         }, function() {
-    //             $(this).html('Nie synchronizuj przewijania');
-    //             $('#images').enableAutoscroll();
-    //         })
-    //         
-    //         // Toolbar
-    //         $('#toolbar-tabs li').click(function() {
-    //             var id = $(this).attr('p:button-list');
-    //             $('#toolbar-tabs li').removeClass('active');
-    //             $(this).addClass('active');
-    //             if (!$('#' + id).is(':visible')) {
-    //                 $('#toolbar-buttons ol').not('#' + id).hide();
-    //                 $('#' + id).show();
-    //             }
-    //         })
-    // 
-    //         var keys = {};
-    //         $('#toolbar-buttons li').each(function() {
-    //             var tag = $(this).attr('p:tag');
-    //             var handler = function() {
-    //                 var text = editor.selection();
-    //                 editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
-    //                 if (text.length == 0) {
-    //                     var pos = editor.cursorPosition();
-    //                     editor.selectLines(pos.line, pos.character + tag.length + 2);
-    //                 }
-    //             }
-    //             if ($(this).attr('p:key')) {
-    //                 keys[$(this).attr('p:key')] = handler;
-    //             }
-    //             $(this).click(handler)
-    //         });
-    //         
-    //         editor.grabKeys(function(event) { 
-    //             if (keys[event.keyCode]) {
-    //                 keys[event.keyCode]();
-    //             }
-    //         }, function(event) {
-    //             return event.altKey && keys[event.keyCode];
-    //         });
-    //     }
-    // });
-    
-
-    
-
-    
-    // $('#toolbar-buttons li').wTooltip({
-    //     delay: 1000, 
-    //     style: {
-    //         border: "1px solid #7F7D67",
-    //         opacity: 0.9, 
-    //         background: "#FBFBC6", 
-    //         padding: "1px",
-    //         fontSize: "12px",
-    //     }});
-    
-    // $('#images-wrap').lazyload('.image-box', {threshold: 640 * 10, scrollTreshold: 640 * 5});
 });

diff --git a/project/templates/base.html b/project/templates/base.html
index 9622fa4..89ebe66 100644 (file)
--- a/project/templates/base.html
+++ b/project/templates/base.html
@@ -6,6 +6,7 @@
         <title>{% block title %}Platforma Redakcyjna{% block subtitle %}{% endblock subtitle %}{% endblock title%}</title>
         <link rel="stylesheet" href="/static/css/master.css" type="text/css" />
         <script src="/static/js/jquery.js" type="text/javascript" charset="utf-8"></script>
+       <script src="/static/js/jquery.logging.js" type="text/javascript" charset="utf-8"></script> 
         {% block extrahead %}
         {% endblock %}
     </head>