Dodanie przycisku reload.

diff --git a/project/static/css/html.css b/project/static/css/html.css
index 8573449..4904a0d 100644 (file)
--- a/project/static/css/html.css
+++ b/project/static/css/html.css
@@ -1,9 +1,12 @@
+/* Style widoku HTML. Nie należy tu ustawiać position ani marginesów */

 .htmlview {
     font-size: 16px;
     font: Georgia, "Times New Roman", serif;
     line-height: 1.5em;
 .htmlview {
     font-size: 16px;
     font: Georgia, "Times New Roman", serif;
     line-height: 1.5em;

-    margin: 0;
-    margin: 3em;
+    padding: 3em;
+}
+
+.htmlview div {

     max-width: 36em;
 }
 
     max-width: 36em;
 }
 

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 1649a4b..5f81f17 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -210,7 +210,7 @@ text#commit-dialog-message {
     right: 0;
     bottom: 0;
     left: 0;
     right: 0;
     bottom: 0;
     left: 0;

-    overflow: none;
+    overflow: hidden;

 }
 
 .panel-main-toolbar {
 }
 
 .panel-main-toolbar {


@@ -323,6 +323,16 @@ input.image-gallery-current-page {
     padding: 0px;
 }
 
     padding: 0px;
 }
 

+.htmlview {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    overflow: auto;
+    margin: 0;
+}
+

 .image-gallery-page-container img {
     /* border: 2px solid green; */
     margin: 0px;
 .image-gallery-page-container img {
     /* border: 2px solid green; */
     margin: 0px;

diff --git a/project/static/js/views/gallery.js b/project/static/js/views/gallery.js
index ad17c4b..fe54b93 100644 (file)
--- a/project/static/js/views/gallery.js
+++ b/project/static/js/views/gallery.js
@@ -79,6 +79,8 @@ var ImageGalleryView = View.extend({
       this.$pageInput.val( (this.currentPage+1) );
   },
   
       this.$pageInput.val( (this.currentPage+1) );
   },
   

+  reload: function() {},
+  

   modelStateChanged: function(property, value) {   
     if (value == 'loading') {
       this.parent.freeze('Ładowanie...');
   modelStateChanged: function(property, value) {   
     if (value == 'loading') {
       this.parent.freeze('Ładowanie...');

diff --git a/project/static/js/views/html.js b/project/static/js/views/html.js
index 2e5f7cf..8057138 100644 (file)
--- a/project/static/js/views/html.js
+++ b/project/static/js/views/html.js
@@ -24,18 +24,20 @@ var HTMLView = View.extend({
   
   modelStateChanged: function(property, value) {
     if (value == 'synced' || value == 'dirty') {
   
   modelStateChanged: function(property, value) {
     if (value == 'synced' || value == 'dirty') {

-      this.parent.unfreeze();
+      this.unfreeze();

     } else if (value == 'unsynced') {
     } else if (value == 'unsynced') {

-      this.parent.freeze('Niezsynchronizowany...');
+      this.freeze('Niezsynchronizowany...');

     } else if (value == 'loading') {
     } else if (value == 'loading') {

-      this.parent.freeze('Ładowanie...');
+      this.freeze('Ładowanie...');

     } else if (value == 'saving') {
     } else if (value == 'saving') {

-      this.parent.freeze('Zapisywanie...');
+      this.freeze('Zapisywanie...');

     } else if (value == 'error') {
     } else if (value == 'error') {

-      this.parent.freeze(this.model.get('error'));
+      this.freeze(this.model.get('error'));

     }
   },
   
     }
   },
   

+  reload: function() {},
+  

   dispose: function() {
     this.model.removeObserver(this);
     this._super();
   dispose: function() {
     this.model.removeObserver(this);
     this._super();

diff --git a/project/static/js/views/panel_container.js b/project/static/js/views/panel_container.js
index 332e83a..aead0e7 100644 (file)
--- a/project/static/js/views/panel_container.js
+++ b/project/static/js/views/panel_container.js
@@ -10,7 +10,10 @@ var PanelContainerView = View.extend({
   init: function(element, model, template) {
     this._super(element, model, template);
 
   init: function(element, model, template) {
     this._super(element, model, template);
 

-    $('select', this.element.get(0)).bind('change.panel-container-view', this.selectChanged.bind(this));
+    $('.panel-main-toolbar select', this.element.get(0)).bind('change.panel-container-view', this.selectChanged.bind(this));
+    $('.panel-main-toolbar .refresh', this.element.get(0))
+      .bind('click.panel-container-view', this.refreshButtonClicked.bind(this))
+      .attr('disabled', 'disabled');

   },
   
   selectChanged: function(event) {
   },
   
   selectChanged: function(event) {


@@ -22,10 +25,18 @@ var PanelContainerView = View.extend({
     }
     this.contentView = new klass($('.content-view', 
       this.element.get(0)), this.model.contentModels[value], this);
     }
     this.contentView = new klass($('.content-view', 
       this.element.get(0)), this.model.contentModels[value], this);

+    $('.panel-main-toolbar .refresh', this.element.get(0)).attr('disabled', null);
+  },
+  
+  refreshButtonClicked: function(event) {
+    if (this.contentView) {
+      this.contentView.reload();
+    }

   },
   
   dispose: function() {
   },
   
   dispose: function() {

-    $('select', this.element.get(0)).unbind('change.panel-container-view');
+    $('.panel-main-toolbar .refresh', this.element.get(0)).unbind('click.panel-container-view');
+    $('.panel-main-toolbar select', this.element.get(0)).unbind('change.panel-container-view');

     this._super();
   }
 });
     this._super();
   }
 });

diff --git a/project/static/js/views/xml.js b/project/static/js/views/xml.js
index d272e27..20e2ee9 100644 (file)
--- a/project/static/js/views/xml.js
+++ b/project/static/js/views/xml.js
@@ -35,6 +35,8 @@ var XMLView = View.extend({
     $('.xmlview', this.element).height(height);
   },
   
     $('.xmlview', this.element).height(height);
   },
   

+  reload: function() {},
+  

   editorDidLoad: function(editor) {
     $(editor.frame).css({width: '100%', height: '100%'});
     this.model
   editorDidLoad: function(editor) {
     $(editor.frame).css({width: '100%', height: '100%'});
     this.model


@@ -65,15 +67,15 @@ var XMLView = View.extend({
   
   modelStateChanged: function(property, value) {
     if (value == 'synced' || value == 'dirty') {
   
   modelStateChanged: function(property, value) {
     if (value == 'synced' || value == 'dirty') {

-      this.parent.unfreeze();
+      this.unfreeze();

     } else if (value == 'unsynced') {
     } else if (value == 'unsynced') {

-      this.parent.freeze('Niezsynchronizowany...');
+      this.freeze('Niezsynchronizowany...');

     } else if (value == 'loading') {
     } else if (value == 'loading') {

-      this.parent.freeze('Ładowanie...');
+      this.freeze('Ładowanie...');

     } else if (value == 'saving') {
     } else if (value == 'saving') {

-      this.parent.freeze('Zapisywanie...');
+      this.freeze('Zapisywanie...');

     } else if (value == 'error') {
     } else if (value == 'error') {

-      this.parent.freeze(this.model.get('error'));
+      this.freeze(this.model.get('error'));

     }
   },
     
     }
   },
     

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index b047287..40b5f7a 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -38,7 +38,7 @@
                        <% for (panel in panels) { %>
                        <option value="<%= panel %>"><%= panel %></option>
                        <% }; %>
                        <% for (panel in panels) { %>
                        <option value="<%= panel %>"><%= panel %></option>
                        <% }; %>

-               </select></p>
+               </select> <button class="refresh">Odśwież panel</button></p>

                 </div>
                <div class="content-view"></div>
        </script>
                 </div>
                <div class="content-view"></div>
        </script>