From: zuber Date: Wed, 16 Sep 2009 13:08:14 +0000 (+0200) Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/8d62c0c82718b59c077b611fca1cd9f8054a8c41?hp=e6ba3117b6791a88ffef8ddecb310b5d514780e9 Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma --- diff --git a/apps/explorer/models.py b/apps/explorer/models.py index ace513d4..a1cb56cf 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -1,3 +1,4 @@ +# -*- encoding: utf-8 -*- import os from django.db import models @@ -10,6 +11,29 @@ import toolbar.models from explorer import fields class EditorSettings(models.Model): + """Ustawienia edytora dla użytkownika. + + Pole settings zawiera obiekt JSON o kluczach: + - panels - lista otwartych paneli i ich proporcje + - recentFiles - lista otwartych plików i ustawienia dla nich + + Przykład: + { + 'panels': [ + {'name': 'htmleditor', 'ratio': 0.5}, + {'name': 'gallery', 'ratio': 0.5} + ], + 'recentFiles': [ + { + 'fileId': 'mickiewicz_pan_tadeusz.xml', + 'panels': [ + {'name': 'htmleditor', 'ratio': 0.4}, + {'name': 'gallery', 'ratio': 0.6} + ] + } + ] + } + """ user = models.ForeignKey(User, unique=True) settings = fields.JSONField() diff --git a/crop.py b/crop.py new file mode 100755 index 00000000..a7d83840 --- /dev/null +++ b/crop.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python +import sys +import os +from os.path import splitext, dirname, basename, realpath +from PIL import Image + + +def crop(image, top=0, right=0, bottom=0, left=0): + width, height = image.size + if top < 1: + top = int(height * top) + if right < 1: + right = int(width * right) + if bottom < 1: + bottom = int(height * bottom) + if left < 1: + left = int(width * left) + + bounds = (int(left), int(top), int(width - right), int(height - bottom)) + image = image.crop(bounds) + image.load() + return image + + +output_dir = realpath(os.getcwd()) + '/output' +bounds = [float(i) for i in sys.argv[1].split(':')] + +for file_name in sys.argv[2:]: + base_name, ext = splitext(file_name) + try: + image = Image.open(file_name) + except IOError, e: + sys.stderr.write('\nerror:%s:%s\n' % (file_name, e.message)) + continue + + image = crop(image, *bounds) + image.save(output_dir + '/' + basename(file_name)) \ No newline at end of file diff --git a/project/static/js/editor.js b/project/static/js/editor.js index 4150043f..7951ee74 100644 --- a/project/static/js/editor.js +++ b/project/static/js/editor.js @@ -1,19 +1,22 @@ +var editor; +var panel_hooks; + function Hotkey(code) { - this.code = code - this.has_alt = ((code & 0x01 << 8) != 0) - this.has_ctrl = ((code & 0x01 << 9) != 0) - this.has_shift = ((code & 0x01 << 10) != 0) - this.character = String.fromCharCode(code & 0xff) + this.code = code; + this.has_alt = ((code & 0x01 << 8) !== 0); + this.has_ctrl = ((code & 0x01 << 9) !== 0); + this.has_shift = ((code & 0x01 << 10) !== 0); + this.character = String.fromCharCode(code & 0xff); } Hotkey.prototype.toString = function() { - mods = [] - if(this.has_alt) mods.push('Alt') - if(this.has_ctrl) mods.push('Ctrl') - if(this.has_shift) mods.push('Shift') - mods.push('"'+this.character+'"') - return mods.join('+') -} + var mods = []; + if(this.has_alt) mods.push('Alt'); + if(this.has_ctrl) mods.push('Ctrl'); + if(this.has_shift) mods.push('Shift'); + mods.push('"'+this.character+'"'); + return mods.join('+'); +}; function Panel(panelWrap) { var self = this; @@ -30,34 +33,35 @@ function Panel(panelWrap) { $(document).bind('panel:contentChanged', function(event, data) { $.log(self, ' got changed event from: ', data); - if(self != data) + if(self != data) { self.otherPanelChanged(event.target); - else + } else { self.markChanged(); - + } return false; }); } Panel.prototype.callHook = function() { - var args = $.makeArray(arguments) - var hookName = args.splice(0,1)[0] - var noHookAction = args.splice(0,1)[0] + var args = $.makeArray(arguments); + var hookName = args.splice(0,1)[0]; + var noHookAction = args.splice(0,1)[0]; var result = false; $.log('calling hook: ', hookName, 'with args: ', args); - if(this.hooks && this.hooks[hookName]) + if(this.hooks && this.hooks[hookName]) { result = this.hooks[hookName].apply(this, args); - else if (noHookAction instanceof Function) + } else if (noHookAction instanceof Function) { result = noHookAction(args); + } return result; -} +}; Panel.prototype._endload = function () { // this needs to be here, so we this.connectToolbar(); this.callHook('toolbarResized'); -} +}; Panel.prototype.load = function (url) { // $.log('preparing xhr load: ', this.wrap); @@ -80,7 +84,7 @@ Panel.prototype.load = function (url) { $(self.contentDiv).html("

Wystapił błąd podczas wczytywania panelu.

"); } }); -} +}; Panel.prototype.unload = function(event, data) { // $.log('got unload signal', this, ' target: ', data); @@ -93,44 +97,46 @@ Panel.prototype.unload = function(event, data) { this.callHook('unload'); this.hooks = null; // flush the hooks return false; - }; -} + } +}; Panel.prototype.refresh = function(event, data) { var self = this; - reload = function() { + var reload = function() { $.log('hard reload for panel ', self.current_url); self.load(self.current_url); return true; - } + }; - if( this.callHook('refresh', reload) ) + if( this.callHook('refresh', reload) ) { $('.change-notification', this.wrap).fadeOut(); -} + } +}; Panel.prototype.otherPanelChanged = function(other) { $.log('Panel ', this, ' is aware that ', other, ' changed.'); - if(!this.callHook('dirty')) + if(!this.callHook('dirty')) { $('.change-notification', this.wrap).fadeIn(); -} + } +}; Panel.prototype.markChanged = function () { this.wrap.addClass('changed'); -} +}; Panel.prototype.changed = function () { return this.wrap.hasClass('changed'); -} +}; Panel.prototype.unmarkChanged = function () { this.wrap.removeClass('changed'); -} +}; Panel.prototype.saveInfo = function() { var saveInfo = {}; this.callHook('saveInfo', null, saveInfo); return saveInfo; -} +}; Panel.prototype.connectToolbar = function() { @@ -140,7 +146,7 @@ Panel.prototype.connectToolbar = function() // check if there is a one var toolbar = $("div.toolbar", this.contentDiv); // $.log('Connecting toolbar', toolbar); - if(toolbar.length == 0) return; + if(toolbar.length === 0) return; // move the extra var extra_buttons = $('span.panel-toolbar-extra', toolbar); @@ -167,10 +173,11 @@ Panel.prototype.connectToolbar = function() active.removeClass('active'); group.addClass('active'); $(".toolbar-button-groups-container p", toolbar).each(function() { - if ( $(this).attr('ui:group') != group_name) + if ( $(this).attr('ui:group') != group_name) { $(this).hide(); - else + } else { $(this).show(); + } }); self.callHook('toolbarResized'); } @@ -178,7 +185,7 @@ Panel.prototype.connectToolbar = function() }); // connect action buttons - var allbuttons = $.makeArray(action_buttons) + var allbuttons = $.makeArray(action_buttons); $.merge(allbuttons, $.makeArray($('*.toolbar-button-groups-container button', toolbar)) ); @@ -227,35 +234,34 @@ Panel.prototype.connectToolbar = function() }); } }); -} +}; Panel.prototype.hotkeyPressed = function(event) { - code = event.keyCode; + var code = event.keyCode; if(event.altKey) code = code | 0x100; if(event.ctrlKey) code = code | 0x200; if(event.shiftKey) code = code | 0x400; var callback = this.hotkeys[code]; if(callback) callback(); -} +}; Panel.prototype.isHotkey = function(event) { - code = event.keyCode; + var code = event.keyCode; if(event.altKey) code = code | 0x100; if(event.ctrlKey) code = code | 0x200; if(event.shiftKey) code = code | 0x400; - if(this.hotkeys[code] != null) + if(this.hotkeys[code] !== null) { return true; - + } return false; -} +}; -// Panel.prototype.fireEvent = function(name) { $(document).trigger('panel:'+name, this); -} +}; function Editor() { @@ -279,8 +285,9 @@ Editor.prototype.loadConfig = function() { ratio: 0.5 } ], + recentFiles: [], lastUpdate: 0 - } + }; try { var cookie = $.cookie('options'); @@ -291,17 +298,29 @@ Editor.prototype.loadConfig = function() { } catch (e) { this.options = defaultOptions; } + + this.fileOptions = this.options; + var self = this; + $.each(this.options.recentFiles, function(index) { + if (fileId == self.options.recentFiles[index].fileId) { + $.log('Found options for', fileId); + self.fileOptions = self.options.recentFiles[index]; + } + }); + $.log(this.options); + $.log('fileOptions', this.fileOptions); this.loadPanelOptions(); -} + this.savePanelOptions(); +}; Editor.prototype.loadPanelOptions = function() { var self = this; var totalWidth = 0; $('.panel-wrap', self.rootDiv).each(function(index) { - var panelWidth = self.options.panels[index].ratio * self.rootDiv.width(); + var panelWidth = self.fileOptions.panels[index].ratio * self.rootDiv.width(); if ($(this).hasClass('last-panel')) { $(this).css({ left: totalWidth, @@ -316,12 +335,12 @@ Editor.prototype.loadPanelOptions = function() { } $.log('panel:', this, $(this).css('left')); $('.panel-toolbar option', this).each(function() { - if ($(this).attr('p:panel-name') == self.options.panels[index].name) { + if ($(this).attr('p:panel-name') == self.fileOptions.panels[index].name) { $(this).parent('select').val($(this).attr('value')); } }); }); -} +}; Editor.prototype.savePanelOptions = function() { var self = this; @@ -330,16 +349,28 @@ Editor.prototype.savePanelOptions = function() { panels.push({ name: $('.panel-toolbar option:selected', this).attr('p:panel-name'), ratio: $(this).width() / self.rootDiv.width() - }) + }); }); self.options.panels = panels; - self.options.lastUpdate = (new Date()).getTime() / 1000; - $.log($.toJSON(self.options)); + + // Dodaj obecnie oglądany plik do listy recentFiles + var recentFiles = [{fileId: fileId, panels: panels}]; + var count = 1; + $.each(self.options.recentFiles, function(index) { + if (count < 5 && fileId != self.options.recentFiles[index].fileId) { + recentFiles.push(self.options.recentFiles[index]); + count++; + } + }); + self.options.recentFiles = recentFiles; + + self.options.lastUpdate = new Date().getTime() / 1000; + $.log($.toJSON(self.options)); $.cookie('options', $.toJSON(self.options), { expires: 7, path: '/' }); -} +}; Editor.prototype.saveToBranch = function(msg) { @@ -349,7 +380,7 @@ Editor.prototype.saveToBranch = function(msg) if(!msg) msg = "Szybki zapis z edytora platformy."; - if( changed_panel.length == 0) { + if( changed_panel.length === 0) { $.log('Nothing to save.'); return true; /* no changes */ } @@ -359,17 +390,18 @@ Editor.prototype.saveToBranch = function(msg) return false; } - saveInfo = changed_panel.data('ctrl').saveInfo(); - var postData = '' + var saveInfo = changed_panel.data('ctrl').saveInfo(); + var postData = ''; - if(saveInfo.postData instanceof Object) + if (saveInfo.postData instanceof Object) { postData = $.param(saveInfo.postData); - else + } else { postData = saveInfo.postData; - + } + postData += '&' + $.param({ 'commit_message': msg - }) + }); self.showPopup('save-waiting', '', -1); @@ -384,13 +416,14 @@ Editor.prototype.saveToBranch = function(msg) self.refreshPanels(); - if(self.autosaveTimer) + if(self.autosaveTimer) { clearTimeout(self.autosaveTimer); - - if (data.warnings == null) + } + if (data.warnings === null) { self.showPopup('save-successful'); - else + } else { self.showPopup('save-warn', data.warnings[0]); + } } self.advancePopupQueue(); @@ -412,7 +445,7 @@ Editor.prototype.autoSave = function() // first check if there is anything to save $.log('Autosave'); this.saveToBranch("Automatyczny zapis z edytora platformy."); -} +}; Editor.prototype.onContentChanged = function(event, data) { var self = this; @@ -427,8 +460,9 @@ Editor.prototype.onContentChanged = function(event, data) { }; Editor.prototype.updateUserBranch = function() { - if( $('.panel-wrap.changed').length != 0) + if($('.panel-wrap.changed').length !== 0) { alert("There are unsaved changes - can't update."); + } var self = this; $.ajax({ @@ -438,7 +472,7 @@ Editor.prototype.updateUserBranch = function() { switch(data.result) { case 'done': self.showPopup('generic-yes', 'Plik uaktualniony.'); - self.refreshPanels() + self.refreshPanels(); break; case 'nothing-to-do': self.showPopup('generic-info', 'Brak zmian do uaktualnienia.'); @@ -453,11 +487,12 @@ Editor.prototype.updateUserBranch = function() { type: 'POST', data: {} }); -} +}; Editor.prototype.sendMergeRequest = function (message) { - if( $('.panel-wrap.changed').length != 0) + if( $('.panel-wrap.changed').length !== 0) { alert("There are unsaved changes - can't commit."); + } var self = this; @@ -469,8 +504,9 @@ Editor.prototype.sendMergeRequest = function (message) { case 'done': self.showPopup('generic-yes', 'Łączenie zmian powiodło się.'); - if(data.localmodified) - self.refreshPanels() + if(data.localmodified) { + self.refreshPanels(); + } break; case 'nothing-to-do': @@ -488,7 +524,7 @@ Editor.prototype.sendMergeRequest = function (message) { 'message': message } }); -} +}; Editor.prototype.postSplitRequest = function(s, f) { @@ -505,23 +541,24 @@ Editor.prototype.postSplitRequest = function(s, f) Editor.prototype.allPanels = function() { return $('#' + this.rootDiv.attr('id') +' > *.panel-wrap', this.rootDiv.parent()); -} +}; Editor.prototype.registerScriptlet = function(scriptlet_id, scriptlet_func) { // I briefly assume, that it's verified not to break the world on SS - if (!this[scriptlet_id]) + if (!this[scriptlet_id]) { this[scriptlet_id] = scriptlet_func; -} + } +}; Editor.prototype.callScriptlet = function(scriptlet_id, panel, params) { - var func = this[scriptlet_id] - if(!func) + var func = this[scriptlet_id]; + if(!func) { throw 'No scriptlet named "' + scriptlet_id + '" found.'; - + } return func(this, panel, params); -} - +}; + $(function() { $.fbind = function (self, func) { return function() { diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html index c82b75f5..610a9600 100644 --- a/project/templates/explorer/editor.html +++ b/project/templates/explorer/editor.html @@ -1,6 +1,9 @@ {% extends "base.html" %} {% block extrahead %} + diff --git a/project/templates/explorer/file_list.html b/project/templates/explorer/file_list.html index 48be7f59..4e5a12ad 100644 --- a/project/templates/explorer/file_list.html +++ b/project/templates/explorer/file_list.html @@ -3,6 +3,8 @@ {% block extrahead %} + + {% endblock extrahead %} @@ -45,6 +79,12 @@ $(function() { +
+

Ostatnio oglądane pliki:

+ +
+ {% if perms.explorer.can_add_files %}

Dodaj nowy utwór