From: zuber <marek@stepniowski.com>
Date: Thu, 24 Sep 2009 20:04:58 +0000 (+0200)
Subject: Merge branch 'master' into view-refactor
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/d3c74552a8f8509ff85cf956cf2b750d8387b683?ds=inline;hp=-c

Merge branch 'master' into view-refactor

Conflicts:
	project/templates/explorer/editor.html
---

d3c74552a8f8509ff85cf956cf2b750d8387b683
diff --combined project/static/js/editor.js
index d9166cf6,94b4ca97..d81a7b06
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@@ -92,7 -92,8 +92,8 @@@ Panel.prototype.unload = function(event
          $(this.contentDiv).html('');
  
          // disconnect the toolbar
-         $('div.panel-toolbar span.panel-toolbar-extra', this.wrap).empty();
+         $('div.panel-toolbar span.panel-toolbar-extra', this.wrap).html(
+             '<span />');
          
          this.callHook('unload');
          this.hooks = null; // flush the hooks
@@@ -149,10 -150,9 +150,9 @@@ Panel.prototype.connectToolbar = functi
      if(toolbar.length === 0) return;
  
      // move the extra
-     var extra_buttons = $('span.panel-toolbar-extra', toolbar);
-     var placeholder = $('div.panel-toolbar span.panel-toolbar-extra', this.wrap);
-     placeholder.replaceWith(extra_buttons);
-     placeholder.hide();
+     var extra_buttons = $('span.panel-toolbar-extra button', toolbar);
+     var placeholder = $('div.panel-toolbar span.panel-toolbar-extra > span', this.wrap);
+     placeholder.replaceWith(extra_buttons);    
  
      var action_buttons = $('button', extra_buttons);
  
@@@ -322,30 -322,30 +322,30 @@@ Editor.prototype.loadConfig = function(
  };
  
  Editor.prototype.loadPanelOptions = function() {
 -    var self = this;
 -    var totalWidth = 0;
 -    
 -    $('.panel-wrap', self.rootDiv).each(function(index) {
 -        var panelWidth = self.fileOptions.panels[index].ratio * self.rootDiv.width();
 -        if ($(this).hasClass('last-panel')) {
 -            $(this).css({
 -                left: totalWidth,
 -                right: 0
 -            });
 -        } else {
 -            $(this).css({
 -                left: totalWidth,
 -                width: panelWidth
 -            });
 -            totalWidth += panelWidth;               
 -        }
 -        $.log('panel:', this, $(this).css('left'));
 -        $('.panel-toolbar option', this).each(function() {
 -            if ($(this).attr('p:panel-name') == self.fileOptions.panels[index].name) {
 -                $(this).parent('select').val($(this).attr('value'));
 -            }
 -        });
 -    });   
 +    // var self = this;
 +    // var totalWidth = 0;
 +    // 
 +    // $('.panel-wrap', self.rootDiv).each(function(index) {
 +    //     var panelWidth = self.fileOptions.panels[index].ratio * self.rootDiv.width();
 +    //     if ($(this).hasClass('last-panel')) {
 +    //         $(this).css({
 +    //             left: totalWidth,
 +    //             right: 0
 +    //         });
 +    //     } else {
 +    //         $(this).css({
 +    //             left: totalWidth,
 +    //             width: panelWidth
 +    //         });
 +    //         totalWidth += panelWidth;               
 +    //     }
 +    //     $.log('panel:', this, $(this).css('left'));
 +    //     $('.panel-toolbar option', this).each(function() {
 +    //         if ($(this).attr('p:panel-name') == self.fileOptions.panels[index].name) {
 +    //             $(this).parent('select').val($(this).attr('value'));
 +    //         }
 +    //     });
 +    // });   
  };
  
  Editor.prototype.savePanelOptions = function() {
diff --combined project/static/js/editor.ui.js
index 282df773,f66d977b..c8d47f66
--- a/project/static/js/editor.ui.js
+++ b/project/static/js/editor.ui.js
@@@ -2,116 -2,116 +2,116 @@@
   * UI related Editor methods
   */
  Editor.prototype.setupUI = function() {
 -    // set up the UI visually and attach callbacks
 +//     // set up the UI visually and attach callbacks
      var self = this;
 -
 -    var resize_start = function(event, mydata) {
 -        $(document).bind('mousemove', mydata, resize_changed).
 -        bind('mouseup', mydata, resize_stop);
 -
 -        $('.panel-overlay', mydata.root).css('display', 'block');
 -        return false;
 -    }
 -    var resize_changed =  function(event) {
 -        var old_width = parseInt(event.data.overlay.css('width'));
 -        var delta = event.pageX + event.data.hotspot_x - old_width;
 -
 -        if(old_width + delta < 12) delta = 12 - old_width;
 -        if(old_width + delta > $(window).width()) 
 -            delta = $(window).width() - old_width;
 -        
 -        event.data.overlay.css({
 -            'width': old_width + delta
 -        });
 -
 -        if(event.data.overlay.next) {
 -            var left = parseInt(event.data.overlay.next.css('left'));
 -            event.data.overlay.next.css('left', left+delta);
 -        }
 -
 -        return false;
 -    };
 -
 -    var resize_stop = function(event) {
 -        $(document).unbind('mousemove', resize_changed).unbind('mouseup', resize_stop);
 -        // $('.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) {
 -            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');
 -        $(event.data.root).trigger('stopResize');
 -    };
 -
 -    /*
 -     * Prepare panels (overlays & stuff)
 -     */
 -    /* create an overlay */
 -    var panel_root = self.rootDiv;
 -    var overlay_root = $("<div class='panel-overlay'></div>");
 -    panel_root.append(overlay_root);
 -
 -    var prev = null;
 -
 -    $('*.panel-wrap', panel_root).each( function()
 -    {
 -        var panel = $(this);
 -        var handle = $('.panel-slider', panel);
 -        var overlay = $("<div class='panel-content-overlay panel-wrap'>&nbsp;</div>");
 -        overlay_root.append(overlay);
 -        overlay.data('panel', panel);
 -        overlay.data('next', null);
 -
 -        if (prev) prev.next = overlay;
 -
 -        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')
 -            });
 -            // $.log('Has handle: ' + panel.attr('id'));
 -            overlay.append(handle.clone());
 -            /* attach the trigger */
 -            handle.mousedown(function(event) {
 -                var touch_data = {
 -                    root: panel_root,
 -                    overlay: overlay,
 -                    hotspot_x: event.pageX - handle.position().left
 -                };
 -
 -                $(this).trigger('hpanel:panel-resize-start', touch_data);
 -                return false;
 -            });
 -            $('.panel-content', panel).css('right',
 -                (handle.outerWidth() || 10) + 'px');
 -            $('.panel-content-overlay', panel).css('right',
 -                (handle.outerWidth() || 10) + 'px');
 -        };
 -
 -        prev = overlay;
 -    });
 -
 -    panel_root.bind('hpanel:panel-resize-start', resize_start);
 -    self.rootDiv.bind('stopResize', function() {
 -        self.savePanelOptions();      
 -    });
 -    
 +// 
 +//     var resize_start = function(event, mydata) {
 +//         $(document).bind('mousemove', mydata, resize_changed).
 +//         bind('mouseup', mydata, resize_stop);
 +// 
 +//         $('.panel-overlay', mydata.root).css('display', 'block');
 +//         return false;
 +//     }
 +//     var resize_changed =  function(event) {
 +//         var old_width = parseInt(event.data.overlay.css('width'));
 +//         var delta = event.pageX + event.data.hotspot_x - old_width;
 +// 
 +//         if(old_width + delta < 12) delta = 12 - old_width;
 +//         if(old_width + delta > $(window).width()) 
 +//             delta = $(window).width() - old_width;
 +//         
 +//         event.data.overlay.css({
 +//             'width': old_width + delta
 +//         });
 +// 
 +//         if(event.data.overlay.next) {
 +//             var left = parseInt(event.data.overlay.next.css('left'));
 +//             event.data.overlay.next.css('left', left+delta);
 +//         }
 +// 
 +//         return false;
 +//     };
 +// 
 +//     var resize_stop = function(event) {
 +//         $(document).unbind('mousemove', resize_changed).unbind('mouseup', resize_stop);
 +//         // $('.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) {
 +//             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');
 +//         $(event.data.root).trigger('stopResize');
 +//     };
 +// 
 +//     /*
 +//      * Prepare panels (overlays & stuff)
 +//      */
 +//     /* create an overlay */
 +//     var panel_root = self.rootDiv;
 +//     var overlay_root = $("<div class='panel-overlay'></div>");
 +//     panel_root.append(overlay_root);
 +// 
 +//     var prev = null;
 +// 
 +//     $('*.panel-wrap', panel_root).each( function()
 +//     {
 +//         var panel = $(this);
 +//         var handle = $('.panel-slider', panel);
 +//         var overlay = $("<div class='panel-content-overlay panel-wrap'>&nbsp;</div>");
 +//         overlay_root.append(overlay);
 +//         overlay.data('panel', panel);
 +//         overlay.data('next', null);
 +// 
 +//         if (prev) prev.next = overlay;
 +// 
 +//         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')
 +//             });
 +//             // $.log('Has handle: ' + panel.attr('id'));
 +//             overlay.append(handle.clone());
 +//             /* attach the trigger */
 +//             handle.mousedown(function(event) {
 +//                 var touch_data = {
 +//                     root: panel_root,
 +//                     overlay: overlay,
 +//                     hotspot_x: event.pageX - handle.position().left
 +//                 };
 +// 
 +//                 $(this).trigger('hpanel:panel-resize-start', touch_data);
 +//                 return false;
 +//             });
 +//             $('.panel-content', panel).css('right',
 +//                 (handle.outerWidth() || 10) + 'px');
 +//             $('.panel-content-overlay', panel).css('right',
 +//                 (handle.outerWidth() || 10) + 'px');
 +//         };
 +// 
 +//         prev = overlay;
 +//     });
 +// 
 +//     panel_root.bind('hpanel:panel-resize-start', resize_start);
 +//     self.rootDiv.bind('stopResize', function() {
 +//         self.savePanelOptions();      
 +//     });
 +//     
      /*
       * Connect panel actions
       */
@@@ -187,6 -187,8 +187,6 @@@
          onShow: $.fbind(self, self.loadSplitDialog)
      }).
      jqmAddClose('button.dialog-close-button');
 -
 -// $('#split-dialog').   
  }
  
  Editor.prototype.loadRelatedIssues = function(hash)
@@@ -275,7 -277,7 +275,7 @@@ Editor.prototype.loadSplitDialog = func
              hash.t.success();
          });
  
-         if($('#id_splitform-autoxml').is(':checked'))
+         /* if($('#id_splitform-autoxml').is(':checked'))
              $('#split-form-dc-subform').show();
          else
              $('#split-form-dc-subform').hide();
@@@ -285,7 -287,7 +285,7 @@@
                  $('#split-form-dc-subform').show();
              else
                  $('#split-form-dc-subform').hide();
-         });
+         }); */
      };   
  
      $.ajax({
diff --combined project/templates/explorer/editor.html
index 5848b0f5,22a60f60..e752286d
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@@ -12,29 -12,9 +12,33 @@@
      <script src="{{STATIC_URL}}js/lib/jquery.json.js" type="text/javascript" charset="utf-8"></script>
      <script src="{{STATIC_URL}}js/lib/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
      <script src="{{STATIC_URL}}js/lib/jquery.modal.js" type="text/javascript" charset="utf-8"></script>
 -
 +	<script src="{{STATIC_URL}}js/app.js" type="text/javascript" charset="utf-8"></script>
 +	<script src="{{STATIC_URL}}js/views/split.js" type="text/javascript" charset="utf-8"></script>
 +	<script src="{{STATIC_URL}}js/views/xml.js" type="text/javascript" charset="utf-8"></script>
 +	<script src="{{STATIC_URL}}js/views/html.js" type="text/javascript" charset="utf-8"></script>
 +	<script src="{{STATIC_URL}}js/views/panel_container.js" type="text/javascript" charset="utf-8"></script>
      <script src="{{STATIC_URL}}js/editor.js" type="text/javascript" charset="utf-8"></script>
      <script src="{{STATIC_URL}}js/editor.ui.js" type="text/javascript" charset="utf-8"></script>
 +
 +	{# JavaScript templates #}
 +	<script type="text/html" charset="utf-8" id="panel-container-view-template">
 +		<select>
 +			<% for (var i = 0; i < panels.length; i++) { %>
 +			<option value="<%= i %>"><%= panels[i].name %></option>
 +			<% }; %>
 +		</select>
 +		<div class="content-view"></div>
 +	</script>
++	
++	<script type="text/html" charset="utf-8" id="xml-view-template">
++		<div class="xmlview" style="position: absolute; top: 40px; left:0px; right:0px; bottom: 0px;">
++			<textarea name="text">Ala ma kota</textarea>
++		</div>
++	</script>
++	
 +	<script type="text/html" charset="utf-8" id="html-view-template">
 +		<p>Hej! Jestem widokiem HTML!</p>
 +	</script>
- 	<script type="text/html" charset="utf-8" id="xml-view-template">
- 		<p>Hej! Jestem widokiem XML!</p>
- 	</script>
  {% endblock extrahead %}
  
  {% block extrabody %}
@@@ -77,55 -57,63 +81,41 @@@
  {% endblock %}
  
  {% block maincontent %}
 -        <div id="panels">
 -            {% for n in panel_list %}
 -            <div class="panel-wrap{% if forloop.last %} last-panel{% endif %}" id="panel-{{n}}">
 -                <div class="panel-toolbar">
 -                    <p><label>{{n|capfirst}} panel:
 -                    <select name="select-{{n}}-panel" id="panel-{{n}}-select">
 -                        {% for panel_type in availble_panels %}
 -                        <option value="{% url panel_view path=fileid,name=panel_type.id  %}" p:panel-name="{{ panel_type.id }}">{{panel_type.display_name}}</option>
 -                        {% endfor %}
 -                    </select>
 -                    </label>
 +	<div id="splitview">
- 		<div id="left-panel-container" class='panel-container'>
- 			<select name="select-left-panel" id="panel-left-select">
- 				{% for panel_type in availble_panels %}
- 				<option value="{% url panel_view path=fileid,name=panel_type.id  %}" p:panel-name="{{ panel_type.id }}">{{panel_type.display_name}}</option>
- 				{% endfor %}
- 			</select>
- 			            <div id="panel-left-content" class="panel-content"></div>			
- 			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
- 		</div>
- 	    <div id="right-panel-container" class='panel-container'>
- 			{# <select name="select-right-panel" id="panel-right-select"> #}
- 			{# 	{% for panel_type in availble_panels %} #}
- 			{# 	<option value="{% url panel_view path=fileid,name=panel_type.id  %}" p:panel-name="{{ panel_type.id }}">{{panel_type.display_name}}</option> #}
- 			{# 	{% endfor %} #}
- 			{# </select> #}
-             {# <div id="panel-right-content" class="panel-content"></div> #}
- 		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p></div>
- 	</div>
++		<div id="left-panel-container" class='panel-container'></div>
++	    <div id="right-panel-container" class='panel-container'></div>
++    </div>
  
-         <div id="commit-dialog" class="jqmWindow">
-             <form action="{% url file_commit fileid %}" method="POST">
-                 <label for="message">Commit message:</label>
-                 <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>
-                 <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>                
-                 <fieldset id="commit-dialog-related-issues" 
-                           ui:ajax-src="http://localhost:3000/publications/issues/{{fileid}}">
-                     <legend>Related issues</legend>
-                     <div class="loading-box" style="display: none;">
-                         <p>Loading related issues...</p>
-                     </div>
-                     <div class="container-box">No related issues.</div>
-                 </fieldset>
-                 <p>
-                    <input type="button" value="Save" id="commit-dialog-save-button" />
-                    <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
-                 </p>
-             </form>
 -                    <span
 -                    <span class="toolbar-buttons-container panel-toolbar-extra">
 -                        </span>
 -                    </span>
 -                    <!-- rethink the refresh button - it doesn't work very well -->
 -                    <!-- <button type="button" class="refresh-button">Odśwież</button> -->
 -                    {# <a href="{% url print_xml fileid %}" target="_new">Wydruk</a> #}
 -                    <strong class="change-notification" style="display: none">Widok nieaktualny!</strong>
 -                    </p>
 -               </div>
 -               <div id="panel-{{n}}-content" class="panel-content"></div>
 -               <button type="button" class="panel-slider"></button>
 -            </div>
 -            {% endfor %}
--        </div>
  
-         <div id="split-dialog" class="jqmWindow">
-             <div class="container-box"> </div>
-             <div class="loading-box" style="display: none;">
-                 <p>Loading dialog contents...</p>
-                 <!-- <p><button type="button" class="dialog-close-button">Close</button></p> -->
-             </div>
-             <div class="fatal-error-box" style="display: none;">
-                 <p>Server error, while loading dialog :(</p>
-                 <p><button type="button" class="dialog-close-button">Close</button></p>
-             </div>
 -        <div id="commit-dialog" class="jqmWindow">
 -            <form action="{% url file_commit fileid %}" method="POST">
 -                <label for="message">Commit message:</label>
 -                <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>
 -                <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>                
 -                <fieldset id="commit-dialog-related-issues" 
 -                          ui:ajax-src="http://localhost:3000/publications/issues/{{fileid}}">
 -                    <legend>Related issues</legend>
 -                    <div class="loading-box" style="display: none;">
 -                        <p>Loading related issues...</p>
 -                    </div>
 -                    <div class="container-box">No related issues.</div>
 -                </fieldset>
 -                <p>
 -                   <input type="button" value="Save" id="commit-dialog-save-button" />
 -                   <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
 -                </p>
 -            </form>
 -        </div>
++    <div id="commit-dialog" class="jqmWindow">
++        <form action="{% url file_commit fileid %}" method="POST">
++            <label for="message">Commit message:</label>
++            <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>
++            <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>                
++            <fieldset id="commit-dialog-related-issues" 
++                      ui:ajax-src="http://localhost:3000/publications/issues/{{fileid}}">
++                <legend>Related issues</legend>
++                <div class="loading-box" style="display: none;">
++                    <p>Loading related issues...</p>
++                </div>
++                <div class="container-box">No related issues.</div>
++            </fieldset>
++            <p>
++               <input type="button" value="Save" id="commit-dialog-save-button" />
++               <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
++            </p>
++        </form>
++    </div>
+ 
 -        <div id="split-dialog" class="jqmWindow">
 -            <div class="container-box"> </div>
 -            <div class="loading-box" style="display: none;">
 -                <p>Loading dialog contents...</p>
 -                <!-- <p><button type="button" class="dialog-close-button">Close</button></p> -->
 -            </div>
 -            <div class="fatal-error-box" style="display: none;">
 -                <p>Server error, while loading dialog :(</p>
 -                <p><button type="button" class="dialog-close-button">Close</button></p>
 -            </div>
++    <div id="split-dialog" class="jqmWindow">
++        <div class="container-box"> </div>
++        <div class="loading-box" style="display: none;">
++            <p>Loading dialog contents...</p>
++            <!-- <p><button type="button" class="dialog-close-button">Close</button></p> -->
++        </div>
++        <div class="fatal-error-box" style="display: none;">
++            <p>Server error, while loading dialog :(</p>
++            <p><button type="button" class="dialog-close-button">Close</button></p>
          </div>
++    </div>
  {% endblock maincontent %}