From: Łukasz Rekucki Date: Thu, 8 Oct 2009 10:40:01 +0000 (+0200) Subject: Merge branch 'master' of stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/de93104a2513acc5a378496c6bf6ab7ed0d45d60?hp=1d07e208b0897af64f71755c974762bc7cd19ca0 Merge branch 'master' of stigma:platforma Conflicts: project/static/css/master.css project/static/js/models.js --- diff --git a/README.rst b/README.rst index 8ddf4123..c1299ee3 100644 --- a/README.rst +++ b/README.rst @@ -1,12 +1,13 @@ +==================== Platforma Redakcyjna ==================== Opis projektu -************* +============= Platforma to serwis służący do grupowej edycji książek na potrzeby serwisu WolneLektury.pl. Wymagania -********* +========= * `Django 1.1 `_ * `django-piston 0.2.3rc1 `_ * `librarian 1.2 `_ @@ -16,23 +17,35 @@ Wymagania * `pngnq `_ (wymagane przez skrypt imgconv.py) * `zuber/django-cas-consumer `_ (wymagane do autoryzacji przez CAS) -Instalacja -********** -1. Ściągnij i zainstaluj `pip `_ -2. Przejdź do katalogu serwisu w konsoli -3. Zainstaluj wymagane biblioteki (patrz sekcja wymagania_) komendą:: +Instalacja i użycie +=================== +#. Ściągnij i zainstaluj `pip `_ +#. Przejdź do katalogu serwisu w konsoli +#. Zainstaluj wymagane biblioteki (patrz sekcja wymagania_) komendą:: pip install -f http://redmine.nowoczesnapolska.org.pl/projects/librarian/files -r requirements.txt -4. Wypełnij bazę danych (Django poprosi o utworzenie pierwszego użytkownika):: +#. Wypełnij bazę danych (Django poprosi o utworzenie pierwszego użytkownika):: + + ./project/manage.py syncdb + +#. Skopiuj zawartość pliku `project/localsettings.sample` do `project/localsettings.py` i zmień go zgodnie ze swoimi potrzebami. + +#. Uruchom serwer deweloperski:: - ./manage.py syncdb + ./project/manage.py runserver -5. Skopiuj zawartość pliku `project/localsettings.sample` do `project/localsettings.py` i zmień go zgodnie ze swoimi potrzebami. +#. Zalecane jest serwowanie aplikacji przez `modwsgi `_ na serwerze `Apache2 `_ przy pomocy załączonego skryptu `dispatch.fcgi`. Inne strategie wdrożeniowe opisane są w `Dokumentacji Django `_. -6. Uruchom serwer deweloperski:: +Wdrożenie +========= +#. Ściągnij i zainstaluj `fabric `_ +#. Przejdź do katalogu serwisu w konsoli +#. Aby wdrożyć serwis na serwer deweloperski wpisz komendę:: - ./manage.py runserver + fab staging deploy + + Aby wdrożyć serwis na serwer produkcyjny wpisz:: -7. Zalecane jest serwowanie aplikacji przez `modwsgi `_ na serwerze `Apache2 `_ przy pomocy załączonego skryptu `dispatch.fcgi`. Inne strategie wdrożeniowe opisane są w `Dokumentacji Django `_. + fab production deploy diff --git a/fabfile.py b/fabfile.py new file mode 100644 index 00000000..1cf26790 --- /dev/null +++ b/fabfile.py @@ -0,0 +1,11 @@ +from fabric.api import run, env, cd + +def staging(): + '''Add staging server to hosts''' + env.hosts += ['platforma@stigma.nowoczesnapolska.org.pl:2222'] + +def deploy(): + '''Deploy server''' + with cd('platforma'): + run('git pull') + run('./project/manage.py syncdb') diff --git a/project/static/css/master.css b/project/static/css/master.css index d9309094..ae51e475 100644 --- a/project/static/css/master.css +++ b/project/static/css/master.css @@ -392,4 +392,24 @@ body#base button:hover { padding: 0px; z-index: 100; -} \ No newline at end of file +} + +/* ================= */ +/* = Message boxes = */ +/* ================= */ +.info { + background-color: gray; +} + +.success { + background-color: green; +} + +.error { + background-color: yellow; +} + +.critical { + background-color: red; +} + diff --git a/project/static/js/messages.js b/project/static/js/messages.js index c64aa5bd..51a457dd 100644 --- a/project/static/js/messages.js +++ b/project/static/js/messages.js @@ -7,13 +7,14 @@ Editor.MessageCenter = Editor.Object.extend({ }, addMessage: function(type, text, flash) { + if (!flash) { + flash = text; + } this.messages.push({type: type, text: text}); - if (flash) { - this.flashMessages.push({type: type, text: flash}); - if (this.flashMessages.length == 1) { - this.set('firstFlashMessage', this.flashMessages[0]); - setTimeout(this.changeFlashMessage.bind(this), 1000 * 10); - } + this.flashMessages.push({type: type, text: flash}); + if (this.flashMessages.length == 1) { + this.set('firstFlashMessage', this.flashMessages[0]); + setTimeout(this.changeFlashMessage.bind(this), 1000 * 10); } }, @@ -21,7 +22,7 @@ Editor.MessageCenter = Editor.Object.extend({ this.flashMessages.splice(0, 1); if (this.flashMessages.length > 0) { this.set('firstFlashMessage', this.flashMessages[0]); - setTimeout(this.changeFlashMessage.bind(this), 1000 * 10); + setTimeout(this.changeFlashMessage.bind(this), 1000 * 3); // 3 seconds } else { this.set('firstFlashMessage', null); } diff --git a/project/static/js/models.js b/project/static/js/models.js index d183f992..e2ee8b15 100644 --- a/project/static/js/models.js +++ b/project/static/js/models.js @@ -1,31 +1,31 @@ /*globals Editor fileId SplitView PanelContainerView EditorView FlashView messageCenter*/ Editor.Model = Editor.Object.extend({ - synced: false, - data: null + synced: false, + data: null }); Editor.ToolbarButtonsModel = Editor.Model.extend({ - className: 'Editor.ToolbarButtonsModel', - buttons: {}, + className: 'Editor.ToolbarButtonsModel', + buttons: {}, - init: function() { - this._super(); - }, + init: function() { + this._super(); + }, - load: function() { - if (!this.get('buttons').length) { - $.ajax({ - url: toolbarUrl, - dataType: 'json', - success: this.loadSucceeded.bind(this) - }); - } - }, + load: function() { + if (!this.get('buttons').length) { + $.ajax({ + url: toolbarUrl, + dataType: 'json', + success: this.loadSucceeded.bind(this) + }); + } + }, - loadSucceeded: function(data) { - this.set('buttons', data); - } + loadSucceeded: function(data) { + this.set('buttons', data); + } }); @@ -38,474 +38,505 @@ Editor.ToolbarButtonsModel = Editor.Model.extend({ // -> dirty -> updating -> updated -> synced // Editor.XMLModel = Editor.Model.extend({ - _className: 'Editor.XMLModel', - serverURL: null, - data: '', - state: 'empty', + _className: 'Editor.XMLModel', + serverURL: null, + data: '', + state: 'empty', - init: function(serverURL, revision) { - this._super(); - this.set('state', 'empty'); - this.set('revision', revision); - this.serverURL = serverURL; - this.toolbarButtonsModel = new Editor.ToolbarButtonsModel(); - this.addObserver(this, 'data', this.dataChanged.bind(this)); - }, + init: function(serverURL, revision) { + this._super(); + this.set('state', 'empty'); + this.set('revision', revision); + this.serverURL = serverURL; + this.toolbarButtonsModel = new Editor.ToolbarButtonsModel(); + this.addObserver(this, 'data', this.dataChanged.bind(this)); + }, - load: function(force) { - if (force || this.get('state') == 'empty') { - this.set('state', 'loading'); - $.ajax({ - url: this.serverURL, - dataType: 'text', - data: {revision: this.get('revision')}, - success: this.loadingSucceeded.bind(this), - error: this.loadingFailed.bind(this) - }); - return true; - } - return false; - }, + load: function(force) { + if (force || this.get('state') == 'empty') { + this.set('state', 'loading'); + messageCenter.addMessage('info', 'Wczytuję XML...'); + $.ajax({ + url: this.serverURL, + dataType: 'text', + data: { + revision: this.get('revision') + }, + success: this.loadingSucceeded.bind(this), + error: this.loadingFailed.bind(this) + }); + return true; + } + return false; + }, - loadingSucceeded: function(data) { - if (this.get('state') != 'loading') { - alert('erroneous state:', this.get('state')); - } - this.set('data', data); - this.set('state', 'synced'); - }, + loadingSucceeded: function(data) { + if (this.get('state') != 'loading') { + alert('erroneous state:', this.get('state')); + } + this.set('data', data); + this.set('state', 'synced'); + messageCenter.addMessage('success', 'Wczytałem XML :-)'); + }, - loadingFailed: function() { - if (this.get('state') != 'loading') { - alert('erroneous state:', this.get('state')); - } - this.set('error', 'Nie udało się załadować panelu'); - this.set('state', 'error'); - }, + loadingFailed: function() { + if (this.get('state') != 'loading') { + alert('erroneous state:', this.get('state')); + } + this.set('error', 'Nie udało się załadować panelu'); + this.set('state', 'error'); + messageCenter.addMessage('error', 'Nie udało mi się wczytać XML. Spróbuj ponownie :-('); + }, - update: function(message) { - if (this.get('state') == 'dirty') { - this.set('state', 'updating'); + update: function(message) { + if (this.get('state') == 'dirty') { + this.set('state', 'updating'); + messageCenter.addMessage('info', 'Zapisuję XML...'); - var payload = { - contents: this.get('data'), - revision: this.get('revision') - }; - if (message) { - payload.message = message; - } + var payload = { + contents: this.get('data'), + revision: this.get('revision') + }; + if (message) { + payload.message = message; + } - $.ajax({ - url: this.serverURL, - type: 'post', - dataType: 'json', - data: payload, - success: this.updatingSucceeded.bind(this), - error: this.updatingFailed.bind(this) - }); - return true; - } - return false; - }, + $.ajax({ + url: this.serverURL, + type: 'post', + dataType: 'json', + data: payload, + success: this.updatingSucceeded.bind(this), + error: this.updatingFailed.bind(this) + }); + return true; + } + return false; + }, - updatingSucceeded: function(data) { - if (this.get('state') != 'updating') { - alert('erroneous state:', this.get('state')); - } - this.set('revision', data.revision); - this.set('state', 'updated'); - }, + updatingSucceeded: function(data) { + if (this.get('state') != 'updating') { + alert('erroneous state:', this.get('state')); + } + this.set('revision', data.revision); + this.set('state', 'updated'); + messageCenter.addMessage('success', 'Zapisałem XML :-)'); + }, - updatingFailed: function() { - if (this.get('state') != 'updating') { - alert('erroneous state:', this.get('state')); - } - messageCenter.addMessage('error', 'Uaktualnienie nie powiodło się', 'Uaktualnienie nie powiodło się'); - this.set('state', 'dirty'); - }, + updatingFailed: function() { + if (this.get('state') != 'updating') { + alert('erroneous state:', this.get('state')); + } + messageCenter.addMessage('error', 'Nie udało mi się zapisać XML. Spróbuj ponownie :-('); + this.set('state', 'dirty'); + }, - // For debbuging - set: function(property, value) { - if (property == 'state') { - console.log(this.description(), ':', property, '=', value); - } - return this._super(property, value); - }, + // For debbuging + set: function(property, value) { + if (property == 'state') { + console.log(this.description(), ':', property, '=', value); + } + return this._super(property, value); + }, - dataChanged: function(property, value) { - if (this.get('state') == 'synced') { - this.set('state', 'dirty'); - } - }, + dataChanged: function(property, value) { + if (this.get('state') == 'synced') { + this.set('state', 'dirty'); + } + }, - dispose: function() { - this.removeObserver(this); - this._super(); - } + dispose: function() { + this.removeObserver(this); + this._super(); + } }); Editor.HTMLModel = Editor.Model.extend({ - _className: 'Editor.HTMLModel', - dataURL: null, - htmlURL: null, - renderURL: null, - displaData: '', - xmlParts: {}, - state: 'empty', + _className: 'Editor.HTMLModel', + dataURL: null, + htmlURL: null, + renderURL: null, + displaData: '', + xmlParts: {}, + state: 'empty', - init: function(htmlURL, revision, dataURL) { - this._super(); - this.set('state', 'empty'); - this.set('revision', revision); - this.htmlURL = htmlURL; - this.dataURL = dataURL; - this.renderURL = "http://localhost:8000/api/render"; - this.xmlParts = {}; - }, + init: function(htmlURL, revision, dataURL) { + this._super(); + this.set('state', 'empty'); + this.set('revision', revision); + this.htmlURL = htmlURL; + this.dataURL = dataURL; + this.renderURL = "http://localhost:8000/api/render"; + this.xmlParts = {}; + }, - load: function(force) { - if (force || this.get('state') == 'empty') { - this.set('state', 'loading'); - - // load the transformed data - $.ajax({ - url: this.htmlURL, - dataType: 'text', - data: {revision: this.get('revision')}, - success: this.loadingSucceeded.bind(this), - error: this.loadingFailed.bind(this) - }); - } - }, + load: function(force) { + if (force || this.get('state') == 'empty') { + this.set('state', 'loading'); + + // load the transformed data + messageCenter.addMessage('info', 'Wczytuję HTML...'); + + $.ajax({ + url: this.htmlURL, + dataType: 'text', + data: { + revision: this.get('revision') + }, + success: this.loadingSucceeded.bind(this), + error: this.loadingFailed.bind(this) + }); + } + }, - loadingSucceeded: function(data) { - if (this.get('state') != 'loading') { - alert('erroneous state:', this.get('state')); - } - this.set('data', data); - this.set('state', 'synced'); - }, + loadingSucceeded: function(data) { + if (this.get('state') != 'loading') { + alert('erroneous state:', this.get('state')); + } + this.set('data', data); + this.set('state', 'synced'); + messageCenter.addMessage('success', 'Wczytałem HTML :-)'); + }, - loadingFailed: function() { - if (this.get('state') != 'loading') { - alert('erroneous state:', this.get('state')); - } - this.set('error', 'Nie udało się załadować panelu'); - this.set('state', 'error'); - }, - - getXMLPart: function(elem, callback) - { - var path = elem.attr('wl2o:path'); - if(!this.xmlParts[path]) - this.loadXMLPart(elem, callback); - else - callback(path, this.xmlParts[path]); - }, - - loadXMLPart: function(elem, callback) - { - var path = elem.attr('wl2o:path'); - var self = this; - - $.ajax({ - url: this.dataURL, - dataType: 'text; charset=utf-8', - data: { - revision: this.get('revision'), - part: path - }, - success: function(data) { - self.xmlParts[path] = data; - callback(path, data); - }, - // TODO: error handling - error: function(data) { - console.log('Failed to load fragment'); - callback(undefined, undefined); + loadingFailed: function() { + if (this.get('state') != 'loading') { + alert('erroneous state:', this.get('state')); } - }); - }, - - putXMLPart: function(elem, data) { - var self = this; + this.set('error', 'Nie udało się załadować panelu'); + this.set('state', 'error'); + messageCenter.addMessage('error', 'Nie udało mi się wczytać HTML. Spróbuj ponownie :-('); + }, + + getXMLPart: function(elem, callback) + { + var path = elem.attr('wl2o:path'); + if(!this.xmlParts[path]) + this.loadXMLPart(elem, callback); + else + callback(path, this.xmlParts[path]); + }, + + loadXMLPart: function(elem, callback) + { + var path = elem.attr('wl2o:path'); + var self = this; + + $.ajax({ + url: this.dataURL, + dataType: 'text; charset=utf-8', + data: { + revision: this.get('revision'), + part: path + }, + success: function(data) { + self.xmlParts[path] = data; + callback(path, data); + }, + // TODO: error handling + error: function(data) { + console.log('Failed to load fragment'); + callback(undefined, undefined); + } + }); + }, + + putXMLPart: function(elem, data) { + var self = this; - var path = elem.attr('wl2o:path'); - this.xmlParts[path] = data; - - this.set('state', 'unsynced'); - - /* re-render the changed fragment */ - $.ajax({ - url: this.renderURL, - type: "POST", - dataType: 'text; charset=utf-8', - data: {fragment: data, part: path}, - success: function(htmldata) { - elem.replaceWith(htmldata); - self.set('state', 'dirty'); - } - }); - }, - - update: function(message) { - if (this.get('state') == 'dirty') { - this.set('state', 'updating'); - - var payload = { - chunks: $.toJSON(this.xmlParts), - revision: this.get('revision') - }; - - if (message) { - payload.message = message; - } - - console.log(payload) - - $.ajax({ - url: this.dataURL, - type: 'post', - dataType: 'json', - data: payload, - success: this.updatingSucceeded.bind(this), - error: this.updatingFailed.bind(this) - }); - return true; - } - return false; + var path = elem.attr('wl2o:path'); + this.xmlParts[path] = data; + + this.set('state', 'unsynced'); + + /* re-render the changed fragment */ + $.ajax({ + url: this.renderURL, + type: "POST", + dataType: 'text; charset=utf-8', + data: { + fragment: data, + part: path + }, + success: function(htmldata) { + elem.replaceWith(htmldata); + self.set('state', 'dirty'); + } + }); + }, + + update: function(message) { + if (this.get('state') == 'dirty') { + this.set('state', 'updating'); + + var payload = { + chunks: $.toJSON(this.xmlParts), + revision: this.get('revision') + }; + + if (message) { + payload.message = message; + } + + console.log(payload) + + $.ajax({ + url: this.dataURL, + type: 'post', + dataType: 'json', + data: payload, + success: this.updatingSucceeded.bind(this), + error: this.updatingFailed.bind(this) + }); + return true; + } + return false; - }, + }, - updatingSucceeded: function(data) { - if (this.get('state') != 'updating') { - alert('erroneous state:', this.get('state')); - } + updatingSucceeded: function(data) { + if (this.get('state') != 'updating') { + alert('erroneous state:', this.get('state')); + } - // flush the cache - this.xmlParts = {}; + // flush the cache + this.xmlParts = {}; - this.set('revision', data.revision); - this.set('state', 'updated'); - }, + this.set('revision', data.revision); + this.set('state', 'updated'); + }, - updatingFailed: function() { - if (this.get('state') != 'updating') { - alert('erroneous state:', this.get('state')); - } - messageCenter.addMessage('error', 'Uaktualnienie nie powiodło się', 'Uaktualnienie nie powiodło się'); - this.set('state', 'dirty'); - }, - - // For debbuging - set: function(property, value) { - if (property == 'state') { - console.log(this.description(), ':', property, '=', value); + updatingFailed: function() { + if (this.get('state') != 'updating') { + alert('erroneous state:', this.get('state')); + } + messageCenter.addMessage('error', 'Uaktualnienie nie powiodło się', 'Uaktualnienie nie powiodło się'); + this.set('state', 'dirty'); + }, + + // For debbuging + set: function(property, value) { + if (property == 'state') { + console.log(this.description(), ':', property, '=', value); + } + return this._super(property, value); } - return this._super(property, value); - } }); Editor.ImageGalleryModel = Editor.Model.extend({ - _className: 'Editor.ImageGalleryModel', - serverURL: null, - data: [], - state: 'empty', - - init: function(serverURL) { - this._super(); - this.set('state', 'empty'); - this.serverURL = serverURL; - // olewać data - this.pages = []; - }, - - load: function(force) { - if (force || this.get('state') == 'empty') { - this.set('state', 'loading'); - $.ajax({ - url: this.serverURL, - dataType: 'json', - success: this.loadingSucceeded.bind(this) - }); - } - }, + _className: 'Editor.ImageGalleryModel', + serverURL: null, + data: [], + state: 'empty', + + init: function(serverURL) { + this._super(); + this.set('state', 'empty'); + this.serverURL = serverURL; + // olewać data + this.pages = []; + }, + + load: function(force) { + if (force || this.get('state') == 'empty') { + this.set('state', 'loading'); + $.ajax({ + url: this.serverURL, + dataType: 'json', + success: this.loadingSucceeded.bind(this) + }); + } + }, - loadingSucceeded: function(data) { - if (this.get('state') != 'loading') { - alert('erroneous state:', this.get('state')); - } + loadingSucceeded: function(data) { + if (this.get('state') != 'loading') { + alert('erroneous state:', this.get('state')); + } - console.log('galleries:', data); + console.log('galleries:', data); - if (data.length === 0) { - this.set('data', []); - } else { - console.log('dupa'); - this.set('data', data[0].pages); - } + if (data.length === 0) { + this.set('data', []); + } else { + console.log('dupa'); + this.set('data', data[0].pages); + } - this.set('state', 'synced'); - }, + this.set('state', 'synced'); + }, - set: function(property, value) { - if (property == 'state') { - console.log(this.description(), ':', property, '=', value); + set: function(property, value) { + if (property == 'state') { + console.log(this.description(), ':', property, '=', value); + } + return this._super(property, value); } - return this._super(property, value); - } }); Editor.DocumentModel = Editor.Model.extend({ - _className: 'Editor.DocumentModel', - data: null, // name, text_url, user_revision, latest_shared_rev, parts_url, dc_url, size, merge_url - contentModels: {}, - state: 'empty', + _className: 'Editor.DocumentModel', + data: null, // name, text_url, user_revision, latest_shared_rev, parts_url, dc_url, size, merge_url + contentModels: {}, + state: 'empty', - init: function() { - this._super(); - this.set('state', 'empty'); - this.load(); - }, + init: function() { + this._super(); + this.set('state', 'empty'); + this.load(); + }, - load: function() { - if (this.get('state') == 'empty') { - this.set('state', 'loading'); - $.ajax({ - cache: false, - url: documentsUrl + fileId, - dataType: 'json', - success: this.successfulLoad.bind(this) - }); - } - }, - - successfulLoad: function(data) { - this.set('data', data); - this.set('state', 'synced'); - this.contentModels = { - 'xml': new Editor.XMLModel(data.text_url, data.user_revision), - 'html': new Editor.HTMLModel(data.html_url, data.user_revision, data.text_url), - 'gallery': new Editor.ImageGalleryModel(data.gallery_url) - }; - for (var key in this.contentModels) { - this.contentModels[key].addObserver(this, 'state', this.contentModelStateChanged.bind(this)); - } - }, - - contentModelStateChanged: function(property, value, contentModel) { - if (value == 'dirty') { - this.set('state', 'dirty'); - for (var key in this.contentModels) { - if (this.contentModels[key].guid() != contentModel.guid()) { - this.contentModels[key].set('state', 'unsynced'); + load: function() { + if (this.get('state') == 'empty') { + this.set('state', 'loading'); + messageCenter.addMessage('info', 'Ładuję dane dokumentu...'); + $.ajax({ + cache: false, + url: documentsUrl + fileId, + dataType: 'json', + success: this.successfulLoad.bind(this) + }); } - } - } else if (value == 'updated') { - this.set('state', 'synced'); - for (key in this.contentModels) { - if (this.contentModels[key].guid() == contentModel.guid()) { - this.contentModels[key].set('state', 'synced'); - this.data.user_revision = this.contentModels[key].get('revision'); - messageCenter.addMessage('info', 'Uaktualnienie dokumentu do wersji ' + this.data.user_revision, - 'Uaktualnienie dokumentu do wersji ' + this.data.user_revision); + }, + + successfulLoad: function(data) { + this.set('data', data); + this.set('state', 'synced'); + this.contentModels = { + 'xml': new Editor.XMLModel(data.text_url, data.user_revision), + 'html': new Editor.HTMLModel(data.html_url, data.user_revision, data.text_url), + 'gallery': new Editor.ImageGalleryModel(data.gallery_url) + }; + for (var key in this.contentModels) { + this.contentModels[key].addObserver(this, 'state', this.contentModelStateChanged.bind(this)); } - } - for (key in this.contentModels) { - if (this.contentModels[key].guid() != contentModel.guid()) { - this.contentModels[key].set('revision', this.data.user_revision); - this.contentModels[key].set('state', 'empty'); + messageCenter.addMessage('success', 'Dane dokumentu zostały załadowane :-)'); + }, + + contentModelStateChanged: function(property, value, contentModel) { + if (value == 'dirty') { + this.set('state', 'dirty'); + for (var key in this.contentModels) { + if (this.contentModels[key].guid() != contentModel.guid()) { + this.contentModels[key].set('state', 'unsynced'); + } + } + } else if (value == 'updated') { + this.set('state', 'synced'); + for (key in this.contentModels) { + if (this.contentModels[key].guid() == contentModel.guid()) { + this.contentModels[key].set('state', 'synced'); + this.data.user_revision = this.contentModels[key].get('revision'); + } + } + for (key in this.contentModels) { + if (this.contentModels[key].guid() != contentModel.guid()) { + this.contentModels[key].set('revision', this.data.user_revision); + this.contentModels[key].set('state', 'empty'); + } + } } - } - } - }, + }, - saveDirtyContentModel: function(message) { - for (var key in this.contentModels) { - if (this.contentModels[key].get('state') == 'dirty') { - this.contentModels[key].update(message); - break; - } - } - }, + saveDirtyContentModel: function(message) { + for (var key in this.contentModels) { + if (this.contentModels[key].get('state') == 'dirty') { + this.contentModels[key].update(message); + break; + } + } + }, - update: function() { - this.set('state', 'loading'); - $.ajax({ - url: this.data.merge_url, - dataType: 'json', - type: 'post', - data: { - type: 'update', - target_revision: this.data.user_revision - }, - complete: this.updateCompleted.bind(this), - success: function(data) { this.set('updateData', data); }.bind(this) - }); - }, + update: function() { + this.set('state', 'loading'); + messageCenter.addMessage('info', 'Uaktualniam dokument...'); + $.ajax({ + url: this.data.merge_url, + dataType: 'json', + type: 'post', + data: { + type: 'update', + target_revision: this.data.user_revision + }, + complete: this.updateCompleted.bind(this), + success: function(data) { + this.set('updateData', data); + }.bind(this) + }); + }, - updateCompleted: function(xhr, textStatus) { - console.log(xhr.status, textStatus); - if (xhr.status == 200) { // Sukces - this.data.user_revision = this.get('updateData').revision; - messageCenter.addMessage('info', 'Uaktualnienie dokumentu do wersji ' + this.get('updateData').revision, - 'Uaktualnienie dokumentu do wersji ' + this.get('updateData').revision); - for (var key in this.contentModels) { - this.contentModels[key].set('revision', this.data.user_revision); - this.contentModels[key].set('state', 'empty'); - } - } else if (xhr.status == 202) { // Wygenerowano PullRequest (tutaj?) - } else if (xhr.status == 204) { // Nic nie zmieniono - } else if (xhr.status == 409) { // Konflikt podczas operacji - } - this.set('state', 'synced'); - this.set('updateData', null); - }, + updateCompleted: function(xhr, textStatus) { + console.log(xhr.status, textStatus); + if (xhr.status == 200) { // Sukces + this.data.user_revision = this.get('updateData').revision; + messageCenter.addMessage('info', 'Uaktualnienie dokumentu do wersji ' + this.get('updateData').revision, + 'Uaktualnienie dokumentu do wersji ' + this.get('updateData').revision); + for (var key in this.contentModels) { + this.contentModels[key].set('revision', this.data.user_revision); + this.contentModels[key].set('state', 'empty'); + } + messageCenter.addMessage('success', 'Uaktualniłem dokument do najnowszej wersji :-)'); + } else if (xhr.status == 202) { // Wygenerowano PullRequest (tutaj?) + } else if (xhr.status == 204) { // Nic nie zmieniono + messageCenter.addMessage('info', 'Nic się nie zmieniło od ostatniej aktualizacji. Po co mam uaktualniać?'); + } else if (xhr.status == 409) { // Konflikt podczas operacji + messageCenter.addMessage('error', 'Wystąpił konflikt podczas aktualizacji. Pędź po programistów! :-('); + } else if (xhr.status == 500) { + messageCenter.addMessage('critical', 'Błąd serwera. Pędź po programistów! :-('); + } + this.set('state', 'synced'); + this.set('updateData', null); + }, - merge: function(message) { - this.set('state', 'loading'); - $.ajax({ - url: this.data.merge_url, - type: 'post', - dataType: 'json', - data: { - type: 'share', - target_revision: this.data.user_revision, - message: message - }, - complete: this.mergeCompleted.bind(this), - success: function(data) { this.set('mergeData', data); }.bind(this) - }); - }, + merge: function(message) { + this.set('state', 'loading'); + messageCenter.addMessage('info', 'Scalam dokument z głównym repozytorium...'); + $.ajax({ + url: this.data.merge_url, + type: 'post', + dataType: 'json', + data: { + type: 'share', + target_revision: this.data.user_revision, + message: message + }, + complete: this.mergeCompleted.bind(this), + success: function(data) { + this.set('mergeData', data); + }.bind(this) + }); + }, - mergeCompleted: function(xhr, textStatus) { - console.log(xhr.status, textStatus); - if (xhr.status == 200) { // Sukces - this.data.user_revision = this.get('mergeData').revision; - for (var key in this.contentModels) { - this.contentModels[key].set('revision', this.data.user_revision); - this.contentModels[key].set('state', 'empty'); - } - messageCenter.addMessage('info', 'Uaktualnienie dokumentu do wersji ' + this.get('mergeData').revision, - 'Uaktualnienie dokumentu do wersji ' + this.get('mergeData').revision); - } else if (xhr.status == 202) { // Wygenerowano PullRequest - } else if (xhr.status == 204) { // Nic nie zmieniono - } else if (xhr.status == 409) { // Konflikt podczas operacji - } - this.set('state', 'synced'); - this.set('mergeData', null); - }, + mergeCompleted: function(xhr, textStatus) { + console.log(xhr.status, textStatus); + if (xhr.status == 200) { // Sukces + this.data.user_revision = this.get('mergeData').revision; + for (var key in this.contentModels) { + this.contentModels[key].set('revision', this.data.user_revision); + this.contentModels[key].set('state', 'empty'); + } + messageCenter.addMessage('success', 'Scaliłem dokument z głównym repozytorium :-)'); + } else if (xhr.status == 202) { // Wygenerowano PullRequest + messageCenter.addMessage('success', 'Wysłałem prośbę o scalenie dokumentu z głównym repozytorium.'); + } else if (xhr.status == 204) { // Nic nie zmieniono + messageCenter.addMessage('info', 'Nic się nie zmieniło od ostatniego scalenia. Po co mam scalać?'); + } else if (xhr.status == 409) { // Konflikt podczas operacji + messageCenter.addMessage('error', 'Wystąpił konflikt podczas scalania. Pędź po programistów! :-('); + } else if (xhr.status == 500) { + messageCenter.addMessage('critical', 'Błąd serwera. Pędź po programistów! :-('); + } + this.set('state', 'synced'); + this.set('mergeData', null); + }, - // For debbuging - set: function(property, value) { - if (property == 'state') { - console.log(this.description(), ':', property, '=', value); + // For debbuging + set: function(property, value) { + if (property == 'state') { + console.log(this.description(), ':', property, '=', value); + } + return this._super(property, value); } - return this._super(property, value); - } }); @@ -513,16 +544,16 @@ var leftPanelView, rightPanelContainer, doc; $(function() { - documentsUrl = $('#api-base-url').text() + '/'; - toolbarUrl = $('#api-toolbar-url').text(); + documentsUrl = $('#api-base-url').text() + '/'; + toolbarUrl = $('#api-toolbar-url').text(); - doc = new Editor.DocumentModel(); - var editor = new EditorView('#body-wrap', doc); - editor.freeze(); + doc = new Editor.DocumentModel(); + var editor = new EditorView('#body-wrap', doc); + editor.freeze(); - var flashView = new FlashView('#flashview', messageCenter); - var splitView = new SplitView('#splitview', doc); + var flashView = new FlashView('#flashview', messageCenter); + var splitView = new SplitView('#splitview', doc); - leftPanelView = new PanelContainerView('#left-panel-container', doc); - rightPanelContainer = new PanelContainerView('#right-panel-container', doc); + leftPanelView = new PanelContainerView('#left-panel-container', doc); + rightPanelContainer = new PanelContainerView('#right-panel-container', doc); }); diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html index fb7b2520..b338e6d3 100644 --- a/project/templates/explorer/editor.html +++ b/project/templates/explorer/editor.html @@ -64,7 +64,7 @@ @@ -162,8 +162,7 @@

Wiadomość nie może być pusta.

-