From: zuber <marek@stepniowski.com>
Date: Mon, 30 Nov 2009 17:00:37 +0000 (+0100)
Subject: CodeMirror i splitter w widoku edycji.
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/33bd7ddbe67e3ddc5c4b6422ec641b5093b7fd5c?ds=sidebyside
CodeMirror i splitter w widoku edycji.
---
diff --git a/platforma/static/img/gallery.png b/platforma/static/img/gallery.png
new file mode 100644
index 00000000..0b843290
Binary files /dev/null and b/platforma/static/img/gallery.png differ
diff --git a/platforma/static/js/lib/jquery.splitter.js b/platforma/static/js/lib/jquery.splitter.js
new file mode 100755
index 00000000..d8888c3c
--- /dev/null
+++ b/platforma/static/js/lib/jquery.splitter.js
@@ -0,0 +1,213 @@
+/*
+ * jQuery.splitter.js - two-pane splitter window plugin
+ *
+ * version 1.51 (2009/01/09)
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+/**
+ * The splitter() plugin implements a two-pane resizable splitter window.
+ * The selected elements in the jQuery object are converted to a splitter;
+ * each selected element should have two child elements, used for the panes
+ * of the splitter. The plugin adds a third child element for the splitbar.
+ *
+ * For more details see: http://methvin.com/splitter/
+ *
+ *
+ * @example $('#MySplitter').splitter();
+ * @desc Create a vertical splitter with default settings
+ *
+ * @example $('#MySplitter').splitter({type: 'h', accessKey: 'M'});
+ * @desc Create a horizontal splitter resizable via Alt+Shift+M
+ *
+ * @name splitter
+ * @type jQuery
+ * @param Object options Options for the splitter (not required)
+ * @cat Plugins/Splitter
+ * @return jQuery
+ * @author Dave Methvin (dave.methvin@gmail.com)
+ */
+ ;(function($){
+
+ $.fn.splitter = function(args){
+ args = args || {};
+ return this.each(function() {
+ var zombie; // left-behind splitbar for outline resizes
+ function startSplitMouse(evt) {
+ if ( opts.outline )
+ zombie = zombie || bar.clone(false).insertAfter(A);
+ panes.css("-webkit-user-select", "none"); // Safari selects A/B text on a move
+ bar.addClass(opts.activeClass);
+ A._posSplit = A[0][opts.pxSplit] - evt[opts.eventPos];
+ $(document)
+ .bind("mousemove", doSplitMouse)
+ .bind("mouseup", endSplitMouse);
+ }
+ function doSplitMouse(evt) {
+ var newPos = A._posSplit+evt[opts.eventPos];
+ if ( opts.outline ) {
+ newPos = Math.max(0, Math.min(newPos, splitter._DA - bar._DA));
+ bar.css(opts.origin, newPos);
+ } else
+ resplit(newPos);
+ }
+ function endSplitMouse(evt) {
+ bar.removeClass(opts.activeClass);
+ var newPos = A._posSplit+evt[opts.eventPos];
+ if ( opts.outline ) {
+ zombie.remove(); zombie = null;
+ resplit(newPos);
+ }
+ panes.css("-webkit-user-select", "text"); // let Safari select text again
+ $(document)
+ .unbind("mousemove", doSplitMouse)
+ .unbind("mouseup", endSplitMouse);
+ }
+ function resplit(newPos) {
+ // Constrain new splitbar position to fit pane size limits
+ newPos = Math.max(A._min, splitter._DA - B._max,
+ Math.min(newPos, A._max, splitter._DA - bar._DA - B._min));
+ // Resize/position the two panes
+ bar._DA = bar[0][opts.pxSplit]; // bar size may change during dock
+ bar.css(opts.origin, newPos).css(opts.fixed, splitter._DF);
+ A.css(opts.origin, 0).css(opts.split, newPos).css(opts.fixed, splitter._DF);
+ B.css(opts.origin, newPos+bar._DA)
+ .css(opts.split, splitter._DA-bar._DA-newPos).css(opts.fixed, splitter._DF);
+ // IE fires resize for us; all others pay cash
+ if ( !$.browser.msie )
+ panes.trigger("resize");
+ }
+ function dimSum(jq, dims) {
+ // Opera returns -1 for missing min/max width, turn into 0
+ var sum = 0;
+ for ( var i=1; i < arguments.length; i++ )
+ sum += Math.max(parseInt(jq.css(arguments[i])) || 0, 0);
+ return sum;
+ }
+
+ // Determine settings based on incoming opts, element classes, and defaults
+ var vh = (args.splitHorizontal? 'h' : args.splitVertical? 'v' : args.type) || 'v';
+ var opts = $.extend({
+ activeClass: 'active', // class name for active splitter
+ pxPerKey: 8, // splitter px moved per keypress
+ tabIndex: 0, // tab order indicator
+ accessKey: '' // accessKey for splitbar
+ },{
+ v: { // Vertical splitters:
+ keyLeft: 39, keyRight: 37, cursor: "e-resize",
+ splitbarClass: "vsplitbar", outlineClass: "voutline",
+ type: 'v', eventPos: "pageX", origin: "left",
+ split: "width", pxSplit: "offsetWidth", side1: "Left", side2: "Right",
+ fixed: "height", pxFixed: "offsetHeight", side3: "Top", side4: "Bottom"
+ },
+ h: { // Horizontal splitters:
+ keyTop: 40, keyBottom: 38, cursor: "n-resize",
+ splitbarClass: "hsplitbar", outlineClass: "houtline",
+ type: 'h', eventPos: "pageY", origin: "top",
+ split: "height", pxSplit: "offsetHeight", side1: "Top", side2: "Bottom",
+ fixed: "width", pxFixed: "offsetWidth", side3: "Left", side4: "Right"
+ }
+ }[vh], args);
+
+ // Create jQuery object closures for splitter and both panes
+ var splitter = $(this).css({position: "relative"});
+ var panes = $(">*", splitter[0]).css({
+ position: "absolute", // positioned inside splitter container
+ "z-index": "1", // splitbar is positioned above
+ "-moz-outline-style": "none" // don't show dotted outline
+ });
+ var A = $(panes[0]); // left or top
+ var B = $(panes[1]); // right or bottom
+
+ // Focuser element, provides keyboard support; title is shown by Opera accessKeys
+ var focuser = $('<a href="javascript:void(0)"></a>')
+ .attr({accessKey: opts.accessKey, tabIndex: opts.tabIndex, title: opts.splitbarClass})
+ .bind($.browser.opera?"click":"focus", function(){ this.focus(); bar.addClass(opts.activeClass) })
+ .bind("keydown", function(e){
+ var key = e.which || e.keyCode;
+ var dir = key==opts["key"+opts.side1]? 1 : key==opts["key"+opts.side2]? -1 : 0;
+ if ( dir )
+ resplit(A[0][opts.pxSplit]+dir*opts.pxPerKey, false);
+ })
+ .bind("blur", function(){ bar.removeClass(opts.activeClass) });
+
+ // Splitbar element, can be already in the doc or we create one
+ var bar = $(panes[2] || '<div></div>')
+ .insertAfter(A).css("z-index", "100").append(focuser)
+ .attr({"class": opts.splitbarClass, unselectable: "on"})
+ .css({position: "absolute", "user-select": "none", "-webkit-user-select": "none",
+ "-khtml-user-select": "none", "-moz-user-select": "none"})
+ .bind("mousedown", startSplitMouse);
+ // Use our cursor unless the style specifies a non-default cursor
+ if ( /^(auto|default|)$/.test(bar.css("cursor")) )
+ bar.css("cursor", opts.cursor);
+
+ // Cache several dimensions for speed, rather than re-querying constantly
+ bar._DA = bar[0][opts.pxSplit];
+ splitter._PBF = $.boxModel? dimSum(splitter, "border"+opts.side3+"Width", "border"+opts.side4+"Width") : 0;
+ splitter._PBA = $.boxModel? dimSum(splitter, "border"+opts.side1+"Width", "border"+opts.side2+"Width") : 0;
+ A._pane = opts.side1;
+ B._pane = opts.side2;
+ $.each([A,B], function(){
+ this._min = opts["min"+this._pane] || dimSum(this, "min-"+opts.split);
+ this._max = opts["max"+this._pane] || dimSum(this, "max-"+opts.split) || 9999;
+ this._init = opts["size"+this._pane]===true ?
+ parseInt($.curCSS(this[0],opts.split)) : opts["size"+this._pane];
+ });
+
+ // Determine initial position, get from cookie if specified
+ var initPos = A._init;
+ if ( !isNaN(B._init) ) // recalc initial B size as an offset from the top or left side
+ initPos = splitter[0][opts.pxSplit] - splitter._PBA - B._init - bar._DA;
+ if ( opts.cookie ) {
+ if ( !$.cookie )
+ alert('jQuery.splitter(): jQuery cookie plugin required');
+ var ckpos = parseInt($.cookie(opts.cookie));
+ if ( !isNaN(ckpos) )
+ initPos = ckpos;
+ $(window).bind("unload", function(){
+ var state = String(bar.css(opts.origin)); // current location of splitbar
+ $.cookie(opts.cookie, state, {expires: opts.cookieExpires || 365,
+ path: opts.cookiePath || document.location.pathname});
+ });
+ }
+ if ( isNaN(initPos) ) // King Solomon's algorithm
+ initPos = Math.round((splitter[0][opts.pxSplit] - splitter._PBA - bar._DA)/2);
+
+ // Resize event propagation and splitter sizing
+ if ( opts.anchorToWindow ) {
+ // Account for margin or border on the splitter container and enforce min height
+ splitter._hadjust = dimSum(splitter, "borderTopWidth", "borderBottomWidth", "marginBottom");
+ splitter._hmin = Math.max(dimSum(splitter, "minHeight"), 20);
+ $(window).bind("resize", function(){
+ var top = splitter.offset().top;
+ var wh = $(window).height();
+ splitter.css("height", Math.max(wh-top-splitter._hadjust, splitter._hmin)+"px");
+ if ( !$.browser.msie ) splitter.trigger("resize");
+ }).trigger("resize");
+ }
+ else if ( opts.resizeToWidth && !$.browser.msie )
+ $(window).bind("resize", function(){
+ splitter.trigger("resize");
+ });
+
+ // Resize event handler; triggered immediately to set initial position
+ splitter.bind("resize", function(e, size){
+ // Custom events bubble in jQuery 1.3; don't Yo Dawg
+ if ( e.target != this ) return;
+ // Determine new width/height of splitter container
+ splitter._DF = splitter[0][opts.pxFixed] - splitter._PBF;
+ splitter._DA = splitter[0][opts.pxSplit] - splitter._PBA;
+ // Bail if splitter isn't visible or content isn't there yet
+ if ( splitter._DF <= 0 || splitter._DA <= 0 ) return;
+ // Re-divvy the adjustable dimension; maintain size of the preferred pane
+ resplit(!isNaN(size)? size : (!(opts.sizeRight||opts.sizeBottom)? A[0][opts.pxSplit] :
+ splitter._DA-B[0][opts.pxSplit]-bar._DA));
+ }).trigger("resize" , [initPos]);
+ });
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/platforma/templates/base.html b/platforma/templates/base.html
index 5abf44bc..57d8f985 100755
--- a/platforma/templates/base.html
+++ b/platforma/templates/base.html
@@ -4,8 +4,8 @@
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<title>{% block title %}Platforma Redakcyjna{% block subtitle %}{% endblock subtitle %}{% endblock title%}</title>
- <link rel="stylesheet" href="{{ STATIC_URL }}css/master.css" type="text/css" />
- <link rel="stylesheet" href="{{ STATIC_URL }}css/buttons.css" type="text/css" />
+ {# <link rel="stylesheet" href="{{ STATIC_URL }}css/master.css" type="text/css" /> #}
+ {# <link rel="stylesheet" href="{{ STATIC_URL }}css/buttons.css" type="text/css" /> #}
<script src="{{ STATIC_URL }}js/lib/jquery.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}js/lib/jquery.logging.js" type="text/javascript" charset="utf-8"></script>
{% block extrahead %}
@@ -13,14 +13,14 @@
</head>
<body id="{% block bodyid %}base{% endblock %}">
<div id="body-wrap">
- <div id="header">
- <span id="breadcrumbs">{% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a>{% endblock breadcrumbs %}</span>
- <span id="header-right-toolbar">
- {% block header-toolbar %}{% endblock %}
- <span id="login_info">{% include "registration/head_login.html" %}</span>
- </span>
- <div id="message-box">{% block message-box %} {% endblock %}</div>
- </div>
+ {# <div id="header"> #}
+ {# <span id="breadcrumbs">{% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a>{% endblock breadcrumbs %}</span> #}
+ {# <span id="header-right-toolbar"> #}
+ {# {% block header-toolbar %}{% endblock %} #}
+ {# <span id="login_info">{% include "registration/head_login.html" %}</span> #}
+ {# </span> #}
+ {# <div id="message-box">{% block message-box %} {% endblock %}</div> #}
+ {# </div> #}
<div id="content">{% block maincontent %} {% endblock %}</div>
</div>
{% block extrabody %}{% endblock %}
diff --git a/platforma/templates/wiki/document_details.html b/platforma/templates/wiki/document_details.html
index 7a2aa4bb..ebb7242e 100644
--- a/platforma/templates/wiki/document_details.html
+++ b/platforma/templates/wiki/document_details.html
@@ -2,6 +2,7 @@
{% block extrahead %}
<script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
+ <script src="{{STATIC_URL}}js/lib/jquery.splitter.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
$(function() {
var editor = CodeMirror.fromTextArea('id_text', {
@@ -15,13 +16,114 @@
tabMode: 'spaces',
indentUnit: 0,
});
+
+ $('#splitter').splitter({
+ type: "v",
+ outline: true,
+ minLeft: 480,
+ sizeRight: 0,
+ anchorToWindow: true,
+ resizeToWidth: true,
+ });
+
+ $(window).resize(function() {
+ $('iframe').height($(window).height() - $('#tabs').outerHeight());
+ });
+
+ $(window).resize();
});
</script>
+
+ <style type="text/css" media="screen">
+
+ body {
+ margin: 0;
+ }
+ .vsplitbar {
+ width: 15px;
+ background: #C1C1C1 url(/static/img/gallery.png) no-repeat scroll 2px 2px;
+ border-left: 1px solid #777;
+ }
+
+ .active {
+ background-color: #DDD;
+ }
+
+ #splitter {
+/* height: 200px;*/
+/* width: 500px;*/
+/* border: 2px solid #B3B3B3;*/
+ }
+
+ #sidebar {
+ overflow: auto;
+ }
+
+ #sidebar {
+ background: #989944;
+ }
+
+ #tabs {
+ margin: 0;
+ padding: 0;
+ background-color: #C1C1C1;
+ width: 100%;
+ height: 22px;
+ padding-top: 2px;
+ border-bottom: 1px solid #777;
+ }
+
+ #tabs li {
+ display: block;
+ float: left;
+/* width: 140px;*/
+ padding: 5px 12px 3px 12px;
+ border: 1px solid #999;
+ -webkit-border-radius: 4px;
+ -webkit-border-bottom-left-radius: 0;
+ -webkit-border-bottom-right-radius: 0;
+ font: 11px Helvetica, Verdana, sans-serif;
+ font-weight: bold;
+ color: #222;
+/* text-shadow: #CCC 1px 1px 1px;*/
+ height: 13px;
+ background-color: #A2A2A2;
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.25, #A2A2A2), to(#C1C1C1));
+/* -webkit-box-shadow: 2px 0px 2px #888;*/
+ margin-left: 4px;
+ margin-bottom: -1px;
+ }
+
+ #tabs li.active {
+ background-color: #FFF;
+ background-image: none;
+/* background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.25, #C1C1C1), to(#FFFFFF)); */
+ border-bottom: 1px solid #FFF;
+ }
+ </style>
{% endblock %}
{% block maincontent %}
- <form action="{% url wiki.views.document_detail document.name|urlencode %}" method="post" accept-charset="utf-8">
- {{ form.as_p }}
- <p><input type="submit" value="Continue →"></p>
- </form>
+ <div id="header">
+ <ol id="tabs">
+ <li>Widok prosty</li>
+ <li class="active">Widok zaawansowany</li>
+ </ol>
+ <div style="clear: both"></div>
+ </div>
+ <div id="splitter">
+ <div id="editor">
+ <form action="{% url wiki.views.document_detail document.name|urlencode %}" method="post" accept-charset="utf-8">
+ {{ form.text }}
+ {# #}
+ {# <p>Autor: {{ form.author }}</p> #}
+ {# <p>Komentarz: {{ form.comment }}</p> #}
+ {# <p><input type="submit" value="Continue →"></p> #}
+ </form>
+ </div>
+
+ <div id="sidebar" style="width: 200px">
+ <p>Cokolwiek tutaj :-)</p>
+ </div>
+ </div>
{% endblock %}
\ No newline at end of file