From: Łukasz Rekucki Date: Mon, 24 Aug 2009 15:55:55 +0000 (+0200) Subject: Plugin do logowania. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/c7917ce18f0f62eac89e1eb4b6ae6d8c48133600?ds=sidebyside;hp=--cc Plugin do logowania. --- c7917ce18f0f62eac89e1eb4b6ae6d8c48133600 diff --git a/project/static/js/jquery.hpanel.js b/project/static/js/jquery.hpanel.js index 0877400c..d33e47fb 100644 --- a/project/static/js/jquery.hpanel.js +++ b/project/static/js/jquery.hpanel.js @@ -5,7 +5,7 @@ settings: {}, current_data: {}, resize_start: function(event, mydata) { - console.log('Overlay: ' + mydata.overlay); + $.log('Overlay: ' + mydata.overlay); $(document).bind('mousemove', mydata, $.hpanel.resize_changed). bind('mouseup', mydata, $.hpanel.resize_stop); @@ -29,10 +29,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'); @@ -41,10 +43,10 @@ $.fn.makeHorizPanel = function(options) { - console.log('Making an hpanel out of "#' + $(this).attr('id') + '"'); + $.log('Making an hpanel out of "#' + $(this).attr('id') + '"'); var root = $(this) var all_panels = $('.panel-wrap', root) - console.log('Panels: ' + all_panels); + $.log('Panels: ' + all_panels); /* create an overlay */ var overlay_root = $("
"); @@ -61,7 +63,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')}); @@ -80,8 +82,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 0c8761c8..d5fc757d 100644 --- a/project/static/js/panels.js +++ b/project/static/js/panels.js @@ -1,18 +1,18 @@ function loadPanel(target, url) { - console.log('ajax', url, 'into', target); + $.log('ajax', url, 'into', target); $(document).trigger('panel:unload', target); $.ajax({ url: url, dataType: 'html', success: function(data, textStatus) { - console.log(target, 'ajax success'); + $.log(target, 'ajax success'); $(target).html(data); - console.log(target, 'triggering panel:load'); + $.log(target, 'triggering panel:load'); $(document).trigger('panel:load', target); // panel(target); }, error: function(request, textStatus, errorThrown) { - console.log('ajax', url, target, 'error:', textStatus, errorThrown); + $.log('ajax', url, target, 'error:', textStatus, errorThrown); } }); } @@ -24,123 +24,29 @@ function panel(load, unload) { unloadHandler = function(event, panel) { if (self && self == panel) { - console.log('Panel', panel, 'unloading'); + $.log('Panel', panel, 'unloading'); $(document).unbind('panel:unload.' + eventId); $(panel).html(''); unload(event, panel); - console.log('Panel', panel, 'unloaded'); + $.log('Panel', panel, 'unloaded'); return false; } }; $(document).one('panel:load', function(event, panel) { self = panel; - console.log('Panel', panel, 'loading'); + $.log('Panel', panel, 'loading'); $(document).bind('panel:unload.' + eventId, unloadHandler); load(event, panel); - console.log('Panel', panel, 'loaded'); + $.log('Panel', panel, 'loaded'); }); } $(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 + ''); - // 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 9622fa4d..89ebe666 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -6,6 +6,7 @@ {% block title %}Platforma Redakcyjna{% block subtitle %}{% endblock subtitle %}{% endblock title%} + {% block extrahead %} {% endblock %} diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html index 81153085..350f6e85 100644 --- a/project/templates/explorer/panels/xmleditor.html +++ b/project/templates/explorer/panels/xmleditor.html @@ -8,7 +8,7 @@ -->