Carl Meyer avatar Carl Meyer committed 771c113

Removed compatibility with Django 1.1 and 1.2, bumped version to 1.0.0 for release.

Comments (0)

Files changed (102)

 tip (unreleased)
 ----------------
 
+1.0.0 (2011.07.11)
+------------------
+
+- Removed all compatibility shims for Django versions prior to 1.3, including
+  all support for static media at ``MEDIA_URL``, static assets under
+  ``media/``, and the ``MARKITUP_MEDIA_URL`` setting.
+
 - Updated to jquery 1.6.
 
 - Added check to avoid double _rendered fields when MarkupField is used on an
 include TODO.rst
 include HGREV
 recursive-include markitup/templates *.html
-recursive-include markitup/media *.html *.css *.js *.txt *.png
 recursive-include markitup/static *.html *.css *.js *.txt *.png
 
 .. _MarkItUp!: http://markitup.jaysalvat.com/
 
+
 Installation
 ============
 
 
     1. Add ``'markitup'`` to your ``INSTALLED_APPS`` setting.
 
-    2. Make the contents of the ``markitup/media/markitup`` directory
-       available at ``MEDIA_URL/markitup`` (or
-       ``MARKITUP_MEDIA_URL/markitup``, see `MARKITUP_MEDIA_URL`_).
-       This can be done by copying the files, making a symlink, or
-       through your webserver configuration.
+    2. Make the contents of the ``markitup/static/markitup`` directory
+       available at ``STATIC_URL/markitup``; the simplest way is via
+       `django.contrib.staticfiles`_.
 
     3. Set `the MARKITUP_FILTER setting`_.
 
     4. If you want to use AJAX-based preview, add
           ``url(r'^markitup/', include('markitup.urls'))`` in your root URLconf.
 
+.. _django.contrib.staticfiles: https://docs.djangoproject.com/en/dev/howto/static-files/
+
+
 Dependencies
 ------------
 
-``django-markitup`` requires `Django`_ 1.1 or later. `MarkItUp!`_ is
-not an external dependency; it is bundled with ``django-markitup``.
+``django-markitup`` 1.0 requires `Django`_ 1.3 or later and Python 2.5 or
+later. The 0.6.x series supports `Django`_ 1.1 and 1.2; it is missing
+1.3-compatibility additions but otherwise has feature-parity with 1.0, so
+remains a fine choice for older Django versions.
+
+`MarkItUp!`_ is not an external dependency; it is bundled with
+``django-markitup``.
 
 .. _Django: http://www.djangoproject.com/
 
 `the MarkItUp site <http://markitup.jaysalvat.com>`_, modified only to
 add previewParserPath).
 
-To use an alternate set, assign the ``MARKITUP_SET`` setting a URL
-path (absolute or relative to ``MEDIA_URL``/``MARKITUP_MEDIA_URL``) to
-the set directory.  For instance, to use the "markdown" set included
-with django-markitup::
+To use an alternate set, assign the ``MARKITUP_SET`` setting a URL path
+(absolute or relative to ``STATIC_URL``) to the set directory.  For
+instance, to use the "markdown" set included with django-markitup::
 
     MARKITUP_SET = 'markitup/sets/markdown'
 
 Other settings
 ==============
 
-MARKITUP_MEDIA_URL
-------------------
-
-Some projects separate user-uploaded media at ``MEDIA_URL`` from
-static assets. If you keep static assets at a URL other than
-``MEDIA_URL``, just set ``MARKITUP_MEDIA_URL`` to that URL, and make
-sure the contents of the ``markitup/media/markitup`` directory are
-available at ``MARKITUP_MEDIA_URL/markitup/``.
-
 MARKITUP_PREVIEW_FILTER
 -----------------------
 
 MarkItUp! requires the jQuery Javascript library.  By default,
 django-markitup links to the most recent minor version of jQuery 1.6
 available at ajax.googleapis.com (via the URL
-``http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js``).
+``http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js``).
 If you wish to use a different version of jQuery, or host it yourself,
 set the JQUERY_URL setting.  For example::
 
     JQUERY_URL = 'jquery.min.js'
 
-This will use the jQuery available at MEDIA_URL/jquery.min.js. Note
-that a relative ``JQUERY_URL`` is always relative to ``MEDIA_URL``, it
-does not use ``MARKITUP_MEDIA_URL``.
+This will use the jQuery available at STATIC_URL/jquery.min.js. A relative
+``JQUERY_URL`` is relative to ``STATIC_URL``.
 

markitup/media/markitup/ajax_csrf.js

-(function($) {
-     // from http://docs.djangoproject.com/en/1.3/ref/contrib/csrf/#ajax
-     $('html').ajaxSend(
-         function(event, xhr, settings) {
-             function getCookie(name) {
-                 var cookieValue = null;
-                 if (document.cookie && document.cookie != '') {
-                     var cookies = document.cookie.split(';');
-                     for (var i = 0; i < cookies.length; i++) {
-                         var cookie = $.trim(cookies[i]);
-                         // Does this cookie string begin with the name we want?
-                         if (cookie.substring(0, name.length + 1) == (name + '=')) {
-                             cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                             break;
-                         }
-                     }
-                 }
-                 return cookieValue;
-             }
-             if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {
-                 // Only send the token to relative URLs i.e. locally.
-                 xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
-             }
-         });
- })(jQuery);

markitup/media/markitup/jquery.markitup.js

-// ----------------------------------------------------------------------------
-// markItUp! Universal MarkUp Engine, JQuery plugin
-// v 1.1.6.2
-// Dual licensed under the MIT and GPL licenses.
-// ----------------------------------------------------------------------------
-// Copyright (C) 2007-2010 Jay Salvat
-// http://markitup.jaysalvat.com/
-// ----------------------------------------------------------------------------
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-// ----------------------------------------------------------------------------
-(function($) {
-	$.fn.markItUp = function(settings, extraSettings) {
-		var options, ctrlKey, shiftKey, altKey;
-		ctrlKey = shiftKey = altKey = false;
-
-		options = {	id:						'',
-					nameSpace:				'',
-					root:					'',
-					previewInWindow:		'', // 'width=800, height=600, resizable=yes, scrollbars=yes'
-					previewAutoRefresh:		true,
-					previewPosition:		'after',
-					previewTemplatePath:	'~/templates/preview.html',
-					previewParserPath:		'',
-					previewParserVar:		'data',
-					resizeHandle:			true,
-					beforeInsert:			'',
-					afterInsert:			'',
-					onEnter:				{},
-					onShiftEnter:			{},
-					onCtrlEnter:			{},
-					onTab:					{},
-					markupSet:			[	{ /* set */ } ]
-				};
-		$.extend(options, settings, extraSettings);
-
-		// compute markItUp! path
-		if (!options.root) {
-			$('script').each(function(a, tag) {
-				miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);
-				if (miuScript !== null) {
-					options.root = miuScript[1];
-				}
-			});
-		}
-
-		return this.each(function() {
-			var $$, textarea, levels, scrollPosition, caretPosition, caretOffset,
-				clicked, hash, header, footer, previewWindow, template, iFrame, abort;
-			$$ = $(this);
-			textarea = this;
-			levels = [];
-			abort = false;
-			scrollPosition = caretPosition = 0;
-			caretOffset = -1;
-
-			options.previewParserPath = localize(options.previewParserPath);
-			options.previewTemplatePath = localize(options.previewTemplatePath);
-
-			// apply the computed path to ~/
-			function localize(data, inText) {
-				if (inText) {
-					return 	data.replace(/("|')~\//g, "$1"+options.root);
-				}
-				return 	data.replace(/^~\//, options.root);
-			}
-
-			// init and build editor
-			function init() {
-				id = ''; nameSpace = '';
-				if (options.id) {
-					id = 'id="'+options.id+'"';
-				} else if ($$.attr("id")) {
-					id = 'id="markItUp'+($$.attr("id").substr(0, 1).toUpperCase())+($$.attr("id").substr(1))+'"';
-
-				}
-				if (options.nameSpace) {
-					nameSpace = 'class="'+options.nameSpace+'"';
-				}
-				$$.wrap('<div '+nameSpace+'></div>');
-				$$.wrap('<div '+id+' class="markItUp"></div>');
-				$$.wrap('<div class="markItUpContainer"></div>');
-				$$.addClass("markItUpEditor");
-
-				// add the header before the textarea
-				header = $('<div class="markItUpHeader"></div>').insertBefore($$);
-				$(dropMenus(options.markupSet)).appendTo(header);
-
-				// add the footer after the textarea
-				footer = $('<div class="markItUpFooter"></div>').insertAfter($$);
-
-				// add the resize handle after textarea
-				if (options.resizeHandle === true && $.browser.safari !== true) {
-					resizeHandle = $('<div class="markItUpResizeHandle"></div>')
-						.insertAfter($$)
-						.bind("mousedown", function(e) {
-							var h = $$.height(), y = e.clientY, mouseMove, mouseUp;
-							mouseMove = function(e) {
-								$$.css("height", Math.max(20, e.clientY+h-y)+"px");
-								return false;
-							};
-							mouseUp = function(e) {
-								$("html").unbind("mousemove", mouseMove).unbind("mouseup", mouseUp);
-								return false;
-							};
-							$("html").bind("mousemove", mouseMove).bind("mouseup", mouseUp);
-					});
-					footer.append(resizeHandle);
-				}
-
-				// listen key events
-				$$.keydown(keyPressed).keyup(keyPressed);
-				
-				// bind an event to catch external calls
-				$$.bind("insertion", function(e, settings) {
-					if (settings.target !== false) {
-						get();
-					}
-					if (textarea === $.markItUp.focused) {
-						markup(settings);
-					}
-				});
-
-				// remember the last focus
-				$$.focus(function() {
-					$.markItUp.focused = this;
-				});
-			}
-
-			// recursively build header with dropMenus from markupset
-			function dropMenus(markupSet) {
-				var ul = $('<ul></ul>'), i = 0;
-				$('li:hover > ul', ul).css('display', 'block');
-				$.each(markupSet, function() {
-					var button = this, t = '', title, li, j;
-					title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||'');
-					key   = (button.key) ? 'accesskey="'+button.key+'"' : '';
-					if (button.separator) {
-						li = $('<li class="markItUpSeparator">'+(button.separator||'')+'</li>').appendTo(ul);
-					} else {
-						i++;
-						for (j = levels.length -1; j >= 0; j--) {
-							t += levels[j]+"-";
-						}
-						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
-						.bind("contextmenu", function() { // prevent contextmenu on mac and allow ctrl+click
-							return false;
-						}).click(function() {
-							return false;
-						}).mousedown(function() {
-							if (button.call) {
-								eval(button.call)();
-							}
-							setTimeout(function() { markup(button) },1);
-							return false;
-						}).hover(function() {
-								$('> ul', this).show();
-								$(document).one('click', function() { // close dropmenu if click outside
-										$('ul ul', header).hide();
-									}
-								);
-							}, function() {
-								$('> ul', this).hide();
-							}
-						).appendTo(ul);
-						if (button.dropMenu) {
-							levels.push(i);
-							$(li).addClass('markItUpDropMenu').append(dropMenus(button.dropMenu));
-						}
-					}
-				}); 
-				levels.pop();
-				return ul;
-			}
-
-			// markItUp! markups
-			function magicMarkups(string) {
-				if (string) {
-					string = string.toString();
-					string = string.replace(/\(\!\(([\s\S]*?)\)\!\)/g,
-						function(x, a) {
-							var b = a.split('|!|');
-							if (altKey === true) {
-								return (b[1] !== undefined) ? b[1] : b[0];
-							} else {
-								return (b[1] === undefined) ? "" : b[0];
-							}
-						}
-					);
-					// [![prompt]!], [![prompt:!:value]!]
-					string = string.replace(/\[\!\[([\s\S]*?)\]\!\]/g,
-						function(x, a) {
-							var b = a.split(':!:');
-							if (abort === true) {
-								return false;
-							}
-							value = prompt(b[0], (b[1]) ? b[1] : '');
-							if (value === null) {
-								abort = true;
-							}
-							return value;
-						}
-					);
-					return string;
-				}
-				return "";
-			}
-
-			// prepare action
-			function prepare(action) {
-				if ($.isFunction(action)) {
-					action = action(hash);
-				}
-				return magicMarkups(action);
-			}
-
-			// build block to insert
-			function build(string) {
-				openWith 	= prepare(clicked.openWith);
-				placeHolder = prepare(clicked.placeHolder);
-				replaceWith = prepare(clicked.replaceWith);
-				closeWith 	= prepare(clicked.closeWith);
-				if (replaceWith !== "") {
-					block = openWith + replaceWith + closeWith;
-				} else if (selection === '' && placeHolder !== '') {
-					block = openWith + placeHolder + closeWith;
-				} else {
-					block = openWith + (string||selection) + closeWith;
-				}
-				return {	block:block, 
-							openWith:openWith, 
-							replaceWith:replaceWith, 
-							placeHolder:placeHolder,
-							closeWith:closeWith
-					};
-			}
-
-			// define markup to insert
-			function markup(button) {
-				var len, j, n, i;
-				hash = clicked = button;
-				get();
-
-				$.extend(hash, {	line:"", 
-						 			root:options.root,
-									textarea:textarea, 
-									selection:(selection||''), 
-									caretPosition:caretPosition,
-									ctrlKey:ctrlKey, 
-									shiftKey:shiftKey, 
-									altKey:altKey
-								}
-							);
-				// callbacks before insertion
-				prepare(options.beforeInsert);
-				prepare(clicked.beforeInsert);
-				if (ctrlKey === true && shiftKey === true) {
-					prepare(clicked.beforeMultiInsert);
-				}			
-				$.extend(hash, { line:1 });
-				
-				if (ctrlKey === true && shiftKey === true) {
-					lines = selection.split(/\r?\n/);
-					for (j = 0, n = lines.length, i = 0; i < n; i++) {
-						if ($.trim(lines[i]) !== '') {
-							$.extend(hash, { line:++j, selection:lines[i] } );
-							lines[i] = build(lines[i]).block;
-						} else {
-							lines[i] = "";
-						}
-					}
-					string = { block:lines.join('\n')};
-					start = caretPosition;
-					len = string.block.length + (($.browser.opera) ? n : 0);
-				} else if (ctrlKey === true) {
-					string = build(selection);
-					start = caretPosition + string.openWith.length;
-					len = string.block.length - string.openWith.length - string.closeWith.length;
-					len -= fixIeBug(string.block);
-				} else if (shiftKey === true) {
-					string = build(selection);
-					start = caretPosition;
-					len = string.block.length;
-					len -= fixIeBug(string.block);
-				} else {
-					string = build(selection);
-					start = caretPosition + string.block.length ;
-					len = 0;
-					start -= fixIeBug(string.block);
-				}
-				if ((selection === '' && string.replaceWith === '')) {
-					caretOffset += fixOperaBug(string.block);
-					
-					start = caretPosition + string.openWith.length;
-					len = string.block.length - string.openWith.length - string.closeWith.length;
-
-					caretOffset = $$.val().substring(caretPosition,  $$.val().length).length;
-					caretOffset -= fixOperaBug($$.val().substring(0, caretPosition));
-				}
-				$.extend(hash, { caretPosition:caretPosition, scrollPosition:scrollPosition } );
-
-				if (string.block !== selection && abort === false) {
-					insert(string.block);
-					set(start, len);
-				} else {
-					caretOffset = -1;
-				}
-				get();
-
-				$.extend(hash, { line:'', selection:selection });
-
-				// callbacks after insertion
-				if (ctrlKey === true && shiftKey === true) {
-					prepare(clicked.afterMultiInsert);
-				}
-				prepare(clicked.afterInsert);
-				prepare(options.afterInsert);
-
-				// refresh preview if opened
-				if (previewWindow && options.previewAutoRefresh) {
-					refreshPreview(); 
-				}
-																									
-				// reinit keyevent
-				shiftKey = altKey = ctrlKey = abort = false;
-			}
-
-			// Substract linefeed in Opera
-			function fixOperaBug(string) {
-				if ($.browser.opera) {
-					return string.length - string.replace(/\n*/g, '').length;
-				}
-				return 0;
-			}
-			// Substract linefeed in IE
-			function fixIeBug(string) {
-				if ($.browser.msie) {
-					return string.length - string.replace(/\r*/g, '').length;
-				}
-				return 0;
-			}
-				
-			// add markup
-			function insert(block) {	
-				if (document.selection) {
-					var newSelection = document.selection.createRange();
-					newSelection.text = block;
-				} else {
-					$$.val($$.val().substring(0, caretPosition)	+ block + $$.val().substring(caretPosition + selection.length, $$.val().length));
-				}
-			}
-
-			// set a selection
-			function set(start, len) {
-				if (textarea.createTextRange){
-					// quick fix to make it work on Opera 9.5
-					if ($.browser.opera && $.browser.version >= 9.5 && len == 0) {
-						return false;
-					}
-					range = textarea.createTextRange();
-					range.collapse(true);
-					range.moveStart('character', start); 
-					range.moveEnd('character', len); 
-					range.select();
-				} else if (textarea.setSelectionRange ){
-					textarea.setSelectionRange(start, start + len);
-				}
-				textarea.scrollTop = scrollPosition;
-				textarea.focus();
-			}
-
-			// get the selection
-			function get() {
-				textarea.focus();
-
-				scrollPosition = textarea.scrollTop;
-				if (document.selection) {
-					selection = document.selection.createRange().text;
-					if ($.browser.msie) { // ie
-						var range = document.selection.createRange(), rangeCopy = range.duplicate();
-						rangeCopy.moveToElementText(textarea);
-						caretPosition = -1;
-						while(rangeCopy.inRange(range)) { // fix most of the ie bugs with linefeeds...
-							rangeCopy.moveStart('character');
-							caretPosition ++;
-						}
-					} else { // opera
-						caretPosition = textarea.selectionStart;
-					}
-				} else { // gecko & webkit
-					caretPosition = textarea.selectionStart;
-					selection = $$.val().substring(caretPosition, textarea.selectionEnd);
-				} 
-				return selection;
-			}
-
-			// open preview window
-			function preview() {
-				if (!previewWindow || previewWindow.closed) {
-					if (options.previewInWindow) {
-						previewWindow = window.open('', 'preview', options.previewInWindow);
-					} else {
-						iFrame = $('<iframe class="markItUpPreviewFrame"></iframe>');
-						if (options.previewPosition == 'after') {
-							iFrame.insertAfter(footer);
-						} else {
-							iFrame.insertBefore(header);
-						}	
-						previewWindow = iFrame[iFrame.length - 1].contentWindow || frame[iFrame.length - 1];
-					}
-				} else if (altKey === true) {
-					// Thx Stephen M. Redd for the IE8 fix
-					if (iFrame) {
-						iFrame.remove();
-					} else {
-						previewWindow.close();
-					}
-					previewWindow = iFrame = false;
-				}
-				if (!options.previewAutoRefresh) {
-					refreshPreview(); 
-				}
-			}
-
-			// refresh Preview window
-			function refreshPreview() {
- 				renderPreview();
-			}
-
-			function renderPreview() {		
-				var phtml;
-				if (options.previewParserPath !== '') {
-					$.ajax( {
-						type: 'POST',
-						url: options.previewParserPath,
-						data: options.previewParserVar+'='+encodeURIComponent($$.val()),
-						success: function(data) {
-							writeInPreview( localize(data, 1) ); 
-						}
-					} );
-				} else {
-					if (!template) {
-						$.ajax( {
-							url: options.previewTemplatePath,
-							success: function(data) {
-								writeInPreview( localize(data, 1).replace(/<!-- content -->/g, $$.val()) );
-							}
-						} );
-					}
-				}
-				return false;
-			}
-			
-			function writeInPreview(data) {
-				if (previewWindow.document) {			
-					try {
-						sp = previewWindow.document.documentElement.scrollTop
-					} catch(e) {
-						sp = 0;
-					}	
-					previewWindow.document.open();
-					previewWindow.document.write(data);
-					previewWindow.document.close();
-					previewWindow.document.documentElement.scrollTop = sp;
-				}
-				if (options.previewInWindow) {
-					previewWindow.focus();
-				}
-			}
-			
-			// set keys pressed
-			function keyPressed(e) { 
-				shiftKey = e.shiftKey;
-				altKey = e.altKey;
-				ctrlKey = (!(e.altKey && e.ctrlKey)) ? e.ctrlKey : false;
-
-				if (e.type === 'keydown') {
-					if (ctrlKey === true) {
-						li = $("a[accesskey="+String.fromCharCode(e.keyCode)+"]", header).parent('li');
-						if (li.length !== 0) {
-							ctrlKey = false;
-							setTimeout(function() {
-								li.triggerHandler('mousedown');
-							},1);
-							return false;
-						}
-					}
-					if (e.keyCode === 13 || e.keyCode === 10) { // Enter key
-						if (ctrlKey === true) {  // Enter + Ctrl
-							ctrlKey = false;
-							markup(options.onCtrlEnter);
-							return options.onCtrlEnter.keepDefault;
-						} else if (shiftKey === true) { // Enter + Shift
-							shiftKey = false;
-							markup(options.onShiftEnter);
-							return options.onShiftEnter.keepDefault;
-						} else { // only Enter
-							markup(options.onEnter);
-							return options.onEnter.keepDefault;
-						}
-					}
-					if (e.keyCode === 9) { // Tab key
-						if (shiftKey == true || ctrlKey == true || altKey == true) { // Thx Dr Floob.
-							return false; 
-						}
-						if (caretOffset !== -1) {
-							get();
-							caretOffset = $$.val().length - caretOffset;
-							set(caretOffset, 0);
-							caretOffset = -1;
-							return false;
-						} else {
-							markup(options.onTab);
-							return options.onTab.keepDefault;
-						}
-					}
-				}
-			}
-
-			init();
-		});
-	};
-
-	$.fn.markItUpRemove = function() {
-		return this.each(function() {
-				var $$ = $(this).unbind().removeClass('markItUpEditor');
-				$$.parent('div').parent('div.markItUp').parent('div').replaceWith($$);
-			}
-		);
-	};
-
-	$.markItUp = function(settings) {
-		var options = { target:false };
-		$.extend(options, settings);
-		if (options.target) {
-			return $(options.target).each(function() {
-				$(this).focus();
-				$(this).trigger('insertion', [options]);
-			});
-		} else {
-			$('textarea').trigger('insertion', [options]);
-		}
-	};
-})(jQuery);

markitup/media/markitup/preview.css

-/* preview style examples */
-body {
-	background-color:#EFEFEF;
-	font:70% Verdana, Arial, Helvetica, sans-serif;
-}
Add a comment to this file

markitup/media/markitup/sets/default/images/bold.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/default/images/clean.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/default/images/image.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/default/images/italic.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/default/images/link.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/default/images/picture.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/default/images/preview.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/default/images/stroke.png

Removed
Old image

markitup/media/markitup/sets/default/set.js

-// ----------------------------------------------------------------------------
-// markItUp!
-// ----------------------------------------------------------------------------
-// Copyright (C) 2008 Jay Salvat
-// http://markitup.jaysalvat.com/
-// ----------------------------------------------------------------------------
-// Html tags
-// http://en.wikipedia.org/wiki/html
-// ----------------------------------------------------------------------------
-// Basic set. Feel free to add more tags
-// ----------------------------------------------------------------------------
-mySettings = {	
-	onShiftEnter:  	{keepDefault:false, replaceWith:'<br />\n'},
-	onCtrlEnter:  	{keepDefault:false, openWith:'\n<p>', closeWith:'</p>'},
-	onTab:    		{keepDefault:false, replaceWith:'    '},
-	markupSet:  [ 	
-		{name:'Bold', key:'B', openWith:'(!(<strong>|!|<b>)!)', closeWith:'(!(</strong>|!|</b>)!)' },
-		{name:'Italic', key:'I', openWith:'(!(<em>|!|<i>)!)', closeWith:'(!(</em>|!|</i>)!)'  },
-		{name:'Stroke through', key:'S', openWith:'<del>', closeWith:'</del>' },
-		{separator:'---------------' },
-		{name:'Picture', key:'P', replaceWith:'<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />' },
-		{name:'Link', key:'L', openWith:'<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
-		{separator:'---------------' },
-		{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },		
-		{name:'Preview', className:'preview',  call:'preview'}
-	]
-}

markitup/media/markitup/sets/default/style.css

-/* -------------------------------------------------------------------
-// markItUp!
-// By Jay Salvat - http://markitup.jaysalvat.com/
-// ------------------------------------------------------------------*/
-.markItUp .markItUpButton1 a {
-	background-image:url(images/bold.png);
-}
-.markItUp .markItUpButton2 a {
-	background-image:url(images/italic.png);
-}
-.markItUp .markItUpButton3 a {
-	background-image:url(images/stroke.png);
-}
-
-.markItUp .markItUpButton4 a {
-	background-image:url(images/picture.png); 
-}
-.markItUp .markItUpButton5 a {
-	background-image:url(images/link.png);
-}
-
-.markItUp .markItUpButton6 a {
-	background-image:url(images/clean.png);
-}
-.markItUp .preview a {
-	background-image:url(images/preview.png);
-}
Add a comment to this file

markitup/media/markitup/sets/markdown/images/bold.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/code.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/h1.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/h2.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/h3.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/h4.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/h5.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/h6.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/italic.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/link.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/list-bullet.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/list-numeric.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/picture.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/preview.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/markdown/images/quotes.png

Removed
Old image

markitup/media/markitup/sets/markdown/readme.txt

-Markup language: 
-Markdown
-
-Description:
-A basic Markdown markup set with Headings, Bold, Italic, Picture, Link, List, Quotes, Code, Preview button.
-
-Install:
-- Download the zip file
-- Unzip it in your markItUp! sets folder
-- Modify your JS link to point at this set.js
-- Modify your CSS link to point at this style.css

markitup/media/markitup/sets/markdown/set.js

-// -------------------------------------------------------------------
-// markItUp!
-// -------------------------------------------------------------------
-// Copyright (C) 2008 Jay Salvat
-// http://markitup.jaysalvat.com/
-// -------------------------------------------------------------------
-// MarkDown tags example
-// http://en.wikipedia.org/wiki/Markdown
-// http://daringfireball.net/projects/markdown/
-// -------------------------------------------------------------------
-// Feel free to add more tags
-// -------------------------------------------------------------------
-mySettings = {
-	previewParserPath:	'/markitup/preview/',
-	onShiftEnter:		{keepDefault:false, openWith:'\n\n'},
-	markupSet: [
-		{name:'First Level Heading', key:'1', placeHolder:'Your title here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '=') } },
-		{name:'Second Level Heading', key:'2', placeHolder:'Your title here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '-') } },
-		{name:'Heading 3', key:'3', openWith:'### ', placeHolder:'Your title here...' },
-		{name:'Heading 4', key:'4', openWith:'#### ', placeHolder:'Your title here...' },
-		{name:'Heading 5', key:'5', openWith:'##### ', placeHolder:'Your title here...' },
-		{name:'Heading 6', key:'6', openWith:'###### ', placeHolder:'Your title here...' },
-		{separator:'---------------' },		
-		{name:'Bold', key:'B', openWith:'**', closeWith:'**'},
-		{name:'Italic', key:'I', openWith:'_', closeWith:'_'},
-		{separator:'---------------' },
-		{name:'Bulleted List', openWith:'- ' },
-		{name:'Numeric List', openWith:function(markItUp) {
-			return markItUp.line+'. ';
-		}},
-		{separator:'---------------' },
-		{name:'Picture', key:'P', replaceWith:'![[![Alternative text]!]]([![Url:!:http://]!] "[![Title]!]")'},
-		{name:'Link', key:'L', openWith:'[', closeWith:']([![Url:!:http://]!] "[![Title]!]")', placeHolder:'Your text to link here...' },
-		{separator:'---------------'},	
-		{name:'Quotes', openWith:'> '},
-		{name:'Code Block / Code', openWith:'(!(\t|!|`)!)', closeWith:'(!(`)!)'},
-		{separator:'---------------'},
-		{name:'Preview', call:'preview', className:"preview"}
-	]
-}
-
-// mIu nameSpace to avoid conflict.
-miu = {
-	markdownTitle: function(markItUp, char) {
-		heading = '';
-		n = $.trim(markItUp.selection||markItUp.placeHolder).length;
-		// work around bug in python-markdown where header underlines must be at least 3 chars
-		if (n < 3) { n = 3; }
-		for(i = 0; i < n; i++) {
-			heading += char;
-		}
-		return '\n'+heading;
-	}
-}

markitup/media/markitup/sets/markdown/style.css

-/* -------------------------------------------------------------------
-// markItUp!
-// By Jay Salvat - http://markitup.jaysalvat.com/
-// ------------------------------------------------------------------*/
-.markItUp .markItUpButton1 a {
-	background-image:url(images/h1.png); 
-}
-.markItUp .markItUpButton2 a {
-	background-image:url(images/h2.png); 
-}
-.markItUp .markItUpButton3 a {
-	background-image:url(images/h3.png); 
-}
-.markItUp .markItUpButton4 a {
-	background-image:url(images/h4.png); 
-}
-.markItUp .markItUpButton5 a {
-	background-image:url(images/h5.png); 
-}
-.markItUp .markItUpButton6 a {
-	background-image:url(images/h6.png); 
-}
-
-.markItUp .markItUpButton7 a {
-	background-image:url(images/bold.png);
-}
-.markItUp .markItUpButton8 a {
-	background-image:url(images/italic.png);
-}
-
-.markItUp .markItUpButton9 a {
-	background-image:url(images/list-bullet.png);
-}
-.markItUp .markItUpButton10 a {
-	background-image:url(images/list-numeric.png);
-}
-
-.markItUp .markItUpButton11 a {
-	background-image:url(images/picture.png); 
-}
-.markItUp .markItUpButton12 a {
-	background-image:url(images/link.png);
-}
-
-.markItUp .markItUpButton13 a	{
-	background-image:url(images/quotes.png);
-}
-.markItUp .markItUpButton14 a	{
-	background-image:url(images/code.png);
-}
-
-.markItUp .preview a {
-	background-image:url(images/preview.png);
-}
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/bold.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/close.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/code.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/h1.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/h2.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/h3.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/h4.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/h5.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/h6.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/italic.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/link.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/list-bullet.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/list-numeric.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/picture.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/preview.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/restructuredtext/images/quotes.png

Removed
Old image

markitup/media/markitup/sets/restructuredtext/set.js

-// -------------------------------------------------------------------
-// markItUp!
-// -------------------------------------------------------------------
-// Copyright (C) 2008 Jay Salvat
-// http://markitup.jaysalvat.com/
-// -------------------------------------------------------------------
-// ReStructured Text
-// http://docutils.sourceforge.net/
-// http://docutils.sourceforge.net/rst.html
-// -------------------------------------------------------------------
-// Mark Renron <indexofire@gmail.com>
-// http://www.indexofire.com
-// -------------------------------------------------------------------
-// Jannis Leidel <jannis@leidel.info>
-// http://enn.io
-// -------------------------------------------------------------------
-mySettings = {
-	nameSpace: 'ReST',
-	previewParserPath:	'/markitup/preview/',
-	onShiftEnter: {keepDefault:false, openWith:'\n\n'},
-	onTab: {keepDefault:false, replaceWith:'    '},
-	markupSet: [
-		{name:'Level 1 Heading', key:'1', placeHolder:'Your title Here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '#'); } },
-		{name:'Level 2 Heading', key:'2', placeHolder:'Your title here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '*'); } },
-		{name:'Level 3 Heading', key:'3', placeHolder:'Your title here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '='); } },
-		{name:'Level 4 Heading', key:'4', placeHolder:'Your title here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '-'); } },
-		{name:'Level 5 Heading', key:'5', placeHolder:'Your title here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '^'); } },
-		{name:'Level 6 Heading', key:'6', placeHolder:'Your title here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '"'); } },
-		{separator:'---------------' },
-		{name:'Bold', key:'B', openWith:'**', closeWith:'**', placeHolder:'Input Your Bold Text Here...'},
-		{name:'Italic', key:'I', openWith:'`', closeWith:'`', placeHolder:'Input Your Italic Text Here...'},
-		{separator:'---------------' },
-		{name:'Bulleted List', openWith:'- ' },
-		{name:'Numeric List', openWith:function(markItUp) { return markItUp.line+'. '; } },
-		{separator:'---------------' },
-		{name:'Picture', key:'P', openWith:'.. image:: ', placeHolder:'Link Your Images Here...'},
-		{name:'Link', key:"L", openWith:'`', closeWith:'`_ \n\n.. _`Link Name`: [![Url:!:http://]!]', placeHolder:'Link Name' },
-		{name:'Quotes', openWith:'    '},
-		{name:'Code', openWith:'\n:: \n\n	 '},
-		{name:'Preview', className:'preview', call:'preview'}
-	]
-};
-
-// mIu nameSpace to avoid conflict.
-miu = {
-	markdownTitle: function(markItUp, character) {
-		heading = '';
-		n = $.trim(markItUp.selection||markItUp.placeHolder).length;
-		for(i = 0; i < n; i++) {
-			heading += character;
-		}
-		return '\n'+heading;
-	}
-};

markitup/media/markitup/sets/restructuredtext/style.css

-/* -------------------------------------------------------------------
-// ReST!
-// ------------------------------------------------------------------*/
-.ReST .markItUpButton1 a {
-	background-image:url(images/h1.png); 
-}
-.ReST .markItUpButton2 a {
-	background-image:url(images/h2.png); 
-}
-.ReST .markItUpButton3 a {
-	background-image:url(images/h3.png); 
-}
-.ReST .markItUpButton4 a {
-	background-image:url(images/h4.png); 
-}
-.ReST .markItUpButton5 a {
-	background-image:url(images/h5.png); 
-}
-.ReST .markItUpButton6 a {
-	background-image:url(images/h6.png); 
-}
-
-.ReST .markItUpButton7 a {
-	background-image:url(images/bold.png);
-}
-.ReST .markItUpButton8 a {
-	background-image:url(images/italic.png);
-}
-
-.ReST .markItUpButton9 a {
-	background-image:url(images/list-bullet.png);
-}
-.ReST .markItUpButton10 a {
-	background-image:url(images/list-numeric.png);
-}
-
-.ReST .markItUpButton11 a {
-	background-image:url(images/picture.png); 
-}
-.ReST .markItUpButton12 a {
-	background-image:url(images/link.png);
-}
-
-.ReST .markItUpButton13 a	{
-	background-image:url(images/quotes.png);
-}
-.ReST .markItUpButton14 a	{
-	background-image:url(images/code.png);
-}
-
-.ReST .preview a {
-	background-image:url(images/preview.png);
-}
Add a comment to this file

markitup/media/markitup/sets/textile/images/bold.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/code.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/h1.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/h2.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/h3.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/h4.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/h5.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/h6.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/italic.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/link.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/list-bullet.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/list-numeric.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/paragraph.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/picture.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/preview.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/quotes.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/sets/textile/images/stroke.png

Removed
Old image

markitup/media/markitup/sets/textile/readme.txt

-Markup language: 
-Textile
-
-Description:
-A basic Textile markup set with Headings, Bold, Italic, Stroke through, Picture, Link, List, Quotes, Code, Preview button.
-
-Install:
-- Download the zip file
-- Unzip it in your markItUp! sets folder
-- Modify your JS link to point at this set.js
-- Modify your CSS link to point at this style.css

markitup/media/markitup/sets/textile/set.js

-// -------------------------------------------------------------------
-// markItUp!
-// -------------------------------------------------------------------
-// Copyright (C) 2008 Jay Salvat
-// http://markitup.jaysalvat.com/
-// -------------------------------------------------------------------
-// Textile tags example
-// http://en.wikipedia.org/wiki/Textile_(markup_language)
-// http://www.textism.com/
-// -------------------------------------------------------------------
-// Feel free to add more tags
-// -------------------------------------------------------------------
-mySettings = {
-	previewParserPath:	'/markitup/preview/',
-	onShiftEnter:		{keepDefault:false, replaceWith:'\n\n'},
-	markupSet: [
-		{name:'Heading 1', key:'1', openWith:'h1(!(([![Class]!]))!). ', placeHolder:'Your title here...' },
-		{name:'Heading 2', key:'2', openWith:'h2(!(([![Class]!]))!). ', placeHolder:'Your title here...' },
-		{name:'Heading 3', key:'3', openWith:'h3(!(([![Class]!]))!). ', placeHolder:'Your title here...' },
-		{name:'Heading 4', key:'4', openWith:'h4(!(([![Class]!]))!). ', placeHolder:'Your title here...' },
-		{name:'Heading 5', key:'5', openWith:'h5(!(([![Class]!]))!). ', placeHolder:'Your title here...' },
-		{name:'Heading 6', key:'6', openWith:'h6(!(([![Class]!]))!). ', placeHolder:'Your title here...' },
-		{name:'Paragraph', key:'P', openWith:'p(!(([![Class]!]))!). '},
-		{separator:'---------------' },
-		{name:'Bold', key:'B', closeWith:'*', openWith:'*'},
-		{name:'Italic', key:'I', closeWith:'_', openWith:'_'},
-		{name:'Stroke through', key:'S', closeWith:'-', openWith:'-'},
-		{separator:'---------------' },
-		{name:'Bulleted list', openWith:'(!(* |!|*)!)'},
-		{name:'Numeric list', openWith:'(!(# |!|#)!)'}, 
-		{separator:'---------------' },
-		{name:'Picture', replaceWith:'![![Source:!:http://]!]([![Alternative text]!])!'}, 
-		{name:'Link', openWith:'"', closeWith:'([![Title]!])":[![Link:!:http://]!]', placeHolder:'Your text to link here...' },
-		{separator:'---------------' },
-		{name:'Quotes', openWith:'bq(!(([![Class]!])!)). '},
-		{name:'Code', openWith:'@', closeWith:'@'},
-		{separator:'---------------' },
-		{name:'Preview', call:'preview', className:'preview'}
-	]
-}

markitup/media/markitup/sets/textile/style.css

-/* -------------------------------------------------------------------
-// markItUp!
-// By Jay Salvat - http://markitup.jaysalvat.com/
-// ------------------------------------------------------------------*/
-.markItUp .markItUpButton1 a {
-	background-image:url(images/h1.png); 
-}
-.markItUp .markItUpButton2 a {
-	background-image:url(images/h2.png); 
-}
-.markItUp .markItUpButton3 a {
-	background-image:url(images/h3.png); 
-}
-.markItUp .markItUpButton4 a {
-	background-image:url(images/h4.png); 
-}
-.markItUp .markItUpButton5 a {
-	background-image:url(images/h5.png); 
-}
-.markItUp .markItUpButton6 a {
-	background-image:url(images/h6.png); 
-}
-.markItUp .markItUpButton7 a {
-	background-image:url(images/paragraph.png); 
-}
-
-.markItUp .markItUpButton8 a {
-	background-image:url(images/bold.png);
-}
-.markItUp .markItUpButton9 a {
-	background-image:url(images/italic.png);
-}
-.markItUp .markItUpButton10 a {
-	background-image:url(images/stroke.png);
-}
-
-.markItUp .markItUpButton11 a {
-	background-image:url(images/list-bullet.png);
-}
-.markItUp .markItUpButton12 a {
-	background-image:url(images/list-numeric.png);
-}
-
-.markItUp .markItUpButton13 a {
-	background-image:url(images/picture.png); 
-}
-.markItUp .markItUpButton14 a {
-	background-image:url(images/link.png);
-}
-
-.markItUp .markItUpButton15 a	{
-	background-image:url(images/quotes.png);
-}
-.markItUp .markItUpButton16 a	{
-	background-image:url(images/code.png);
-}
-
-.markItUp .preview a {
-	background-image:url(images/preview.png);
-}
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-container.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor-bbcode.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor-dotclear.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor-html.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor-json.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor-markdown.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor-textile.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor-wiki.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor-xml.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/bg-editor.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/handle.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/menu.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/markitup/images/submenu.png

Removed
Old image

markitup/media/markitup/skins/markitup/style.css

-/* -------------------------------------------------------------------
-// markItUp! Universal MarkUp Engine, JQuery plugin
-// By Jay Salvat - http://markitup.jaysalvat.com/
-// ------------------------------------------------------------------*/
-.markItUp * {
-	margin:0px; padding:0px;
-	outline:none;
-}
-.markItUp a:link,
-.markItUp a:visited {
-	color:#000;
-	text-decoration:none;
-}
-.markItUp  {
-	width:700px;
-	margin:5px 0 5px 0;
-	border:5px solid #F5F5F5;	
-}
-.markItUpContainer  {
-	border:1px solid #3C769D;	
-	background:#FFF url(images/bg-container.png) repeat-x top left;
-	padding:5px 5px 2px 5px;
-	font:11px Verdana, Arial, Helvetica, sans-serif;
-}
-.markItUpEditor {
-	font:12px 'Courier New', Courier, monospace;
-	padding:5px 5px 5px 35px;
-	border:3px solid #3C769D;
-	width:643px;
-	height:320px;
-	background-image:url(images/bg-editor.png);
-	background-repeat:no-repeat;
-	clear:both; display:block;
-	line-height:18px;
-	overflow:auto;
-}
-.markItUpPreviewFrame	{
-	overflow:auto;
-	background-color:#FFFFFF;
-	border:1px solid #3C769D;
-	width:99.9%;
-	height:300px;
-	margin:5px 0;
-}
-.markItUpFooter {
-	width:100%;
-	cursor:n-resize;
-}
-.markItUpResizeHandle {
-	overflow:hidden;
-	width:22px; height:5px;
-	margin-left:auto;
-	margin-right:auto;
-	background-image:url(images/handle.png);
-	cursor:n-resize;
-}
-/***************************************************************************************/
-/* first row of buttons */
-.markItUpHeader ul li	{
-	list-style:none;
-	float:left;
-	position:relative;
-}
-.markItUpHeader ul li ul{
-	display:none;
-}
-.markItUpHeader ul li:hover > ul{
-	display:block;
-}
-.markItUpHeader ul .markItUpDropMenu {
-	background:transparent url(images/menu.png) no-repeat 115% 50%;
-	margin-right:5px;
-}
-.markItUpHeader ul .markItUpDropMenu li {
-	margin-right:0px;
-}
-.markItUpHeader ul .markItUpSeparator {
-	margin:0 10px;
-	width:1px;
-	height:16px;
-	overflow:hidden;
-	background-color:#CCC;
-}
-.markItUpHeader ul ul .markItUpSeparator {
-	width:auto; height:1px;
-	margin:0px;
-}
-/* next rows of buttons */
-.markItUpHeader ul ul {
-	display:none;
-	position:absolute;
-	top:18px; left:0px;	
-	background:#F5F5F5;
-	border:1px solid #3C769D;
-	height:inherit;
-}
-.markItUpHeader ul ul li {
-	float:none;
-	border-bottom:1px solid #3C769D;
-}
-.markItUpHeader ul ul .markItUpDropMenu {
-	background:#F5F5F5 url(images/submenu.png) no-repeat 100% 50%;
-}
-/* next rows of buttons */
-.markItUpHeader ul ul ul {
-	position:absolute;
-	top:-1px; left:150px;
-}
-.markItUpHeader ul ul ul li {
-	float:none;
-}
-.markItUpHeader ul a {
-	display:block;
-	width:16px; height:16px;
-	text-indent:-10000px;
-	background-repeat:no-repeat;
-	padding:3px;
-	margin:0px;
-}
-.markItUpHeader ul ul a {
-	display:block;
-	padding-left:0px;
-	text-indent:0;
-	width:120px; 
-	padding:5px 5px 5px 25px;
-	background-position:2px 50%;
-}
-.markItUpHeader ul ul a:hover  {
-	color:#FFF;
-	background-color:#3C769D;
-}
-/***************************************************************************************/
-.html .markItUpEditor {
-	background-image:url(images/bg-editor-html.png);
-}
-.markdown .markItUpEditor {
-	background-image:url(images/bg-editor-markdown.png);
-}
-.textile .markItUpEditor {
-	background-image:url(images/bg-editor-textile.png);
-}
-.bbcode .markItUpEditor {
-	background-image:url(images/bg-editor-bbcode.png);
-}
-.wiki .markItUpEditor,
-.dotclear .markItUpEditor {
-	background-image:url(images/bg-editor-wiki.png);
-}
Add a comment to this file

markitup/media/markitup/skins/simple/images/handle.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/simple/images/menu.png

Removed
Old image
Add a comment to this file

markitup/media/markitup/skins/simple/images/submenu.png

Removed
Old image

markitup/media/markitup/skins/simple/style.css

-/* -------------------------------------------------------------------
-// markItUp! Universal MarkUp Engine, JQuery plugin
-// By Jay Salvat - http://markitup.jaysalvat.com/
-// ------------------------------------------------------------------*/
-.markItUp * {
-	margin:0px; padding:0px;
-	outline:none;
-}
-.markItUp a:link,
-.markItUp a:visited {
-	color:#000;
-	text-decoration:none;
-}
-.markItUp  {
-	width:700px;
-	margin:5px 0 5px 0;
-}
-.markItUpContainer  {
-	font:11px Verdana, Arial, Helvetica, sans-serif;
-}
-.markItUpEditor {
-	font:12px 'Courier New', Courier, monospace;
-	padding:5px;
-	width:690px;
-	height:320px;
-	clear:both; display:block;
-	line-height:18px;
-	overflow:auto;
-}
-.markItUpPreviewFrame	{
-	overflow:auto;
-	background-color:#FFF;
-	width:99.9%;
-	height:300px;
-	margin:5px 0;
-}
-.markItUpFooter {
-	width:100%;
-}
-.markItUpResizeHandle {
-	overflow:hidden;
-	width:22px; height:5px;
-	margin-left:auto;
-	margin-right:auto;
-	background-image:url(images/handle.png);
-	cursor:n-resize;
-}
-/***************************************************************************************/
-/* first row of buttons */
-.markItUpHeader ul li	{
-	list-style:none;
-	float:left;
-	position:relative;
-}
-.markItUpHeader ul li:hover > ul{
-	display:block;
-}
-.markItUpHeader ul .markItUpDropMenu {
-	background:transparent url(images/menu.png) no-repeat 115% 50%;
-	margin-right:5px;
-}
-.markItUpHeader ul .markItUpDropMenu li {
-	margin-right:0px;
-}
-/* next rows of buttons */
-.markItUpHeader ul ul {
-	display:none;
-	position:absolute;
-	top:18px; left:0px;	
-	background:#FFF;
-	border:1px solid #000;
-}
-.markItUpHeader ul ul li {
-	float:none;
-	border-bottom:1px solid #000;
-}
-.markItUpHeader ul ul .markItUpDropMenu {
-	background:#FFF url(images/submenu.png) no-repeat 100% 50%;
-}
-.markItUpHeader ul .markItUpSeparator {
-	margin:0 10px;
-	width:1px;
-	height:16px;
-	overflow:hidden;
-	background-color:#CCC;
-}
-.markItUpHeader ul ul .markItUpSeparator {
-	width:auto; height:1px;
-	margin:0px;
-}
-/* next rows of buttons */
-.markItUpHeader ul ul ul {
-	position:absolute;
-	top:-1px; left:150px; 
-}
-.markItUpHeader ul ul ul li {
-	float:none;
-}
-.markItUpHeader ul a {
-	display:block;
-	width:16px; height:16px;
-	text-indent:-10000px;
-	background-repeat:no-repeat;
-	padding:3px;
-	margin:0px;
-}
-.markItUpHeader ul ul a {
-	display:block;
-	padding-left:0px;
-	text-indent:0;
-	width:120px; 
-	padding:5px 5px 5px 25px;
-	background-position:2px 50%;
-}
-.markItUpHeader ul ul a:hover  {
-	color:#FFF;
-	background-color:#000;
-}

markitup/media/markitup/templates/preview.css

-/* preview style examples */
-body {
-	background-color:#EFEFEF;
-	font:70% Verdana, Arial, Helvetica, sans-serif;
-}

markitup/media/markitup/templates/preview.html

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>markItUp! preview template</title>
-<link rel="stylesheet" type="text/css" href="~/templates/preview.css" />
-</head>
-<body>
-<!-- content -->
-</body>
-</html>

markitup/settings.py

 MARKITUP_PREVIEW_FILTER = getattr(settings, 'MARKITUP_PREVIEW_FILTER',
                                   getattr(settings, 'MARKITUP_FILTER', None))
 MARKITUP_AUTO_PREVIEW = getattr(settings, 'MARKITUP_AUTO_PREVIEW', False)
-MARKITUP_MEDIA_URL = getattr(settings, 'MARKITUP_MEDIA_URL',
-                             getattr(settings, 'STATIC_URL',
-                             settings.MEDIA_URL)) # django < 1.3 fallback
 MARKITUP_SET = getattr(settings, 'MARKITUP_SET', 'markitup/sets/default')
 MARKITUP_SKIN = getattr(settings, 'MARKITUP_SKIN', 'markitup/skins/simple')
 JQUERY_URL = getattr(

markitup/templates/markitup/preview.html

 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>markItUp! preview</title>
-<link rel="stylesheet" type="text/css" href="{{ MARKITUP_MEDIA_URL }}markitup/preview.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}markitup/preview.css" />
 </head>
 <body>
 {{ preview|safe }}

markitup/templatetags/markitup_tags.py

 from django import template
 from markitup import settings
-from markitup.util import absolute_url, absolute_jquery_url
+from markitup.util import absolute_url
 from markitup.fields import render_func
 
 register = template.Library()
     return {
         'MARKITUP_SET': absolute_url(settings.MARKITUP_SET).rstrip('/'),
         'MARKITUP_SKIN': absolute_url(settings.MARKITUP_SKIN).rstrip('/'),
-        'JQUERY_URL': absolute_jquery_url(),
+        'JQUERY_URL': absolute_url(settings.JQUERY_URL),
         'MARKITUP_JS': absolute_url('markitup/jquery.markitup.js'),
         'AJAXCSRF_JS': absolute_url('markitup/ajax_csrf.js'),
         }
 
 def absolute_url(path, prefix=None):
     if prefix is None:
-        prefix = settings.MARKITUP_MEDIA_URL
+        prefix = django_settings.STATIC_URL
     if path.startswith(u'http://') or path.startswith(u'https://') or path.startswith(u'/'):
         return path
     return posixpath.join(prefix, path)
-
-def absolute_jquery_url():
-    # JQuery absolute URL should be relative to STATIC_URL (or MEDIA_URL for
-    # django < 1.3), not to MARKITUP_MEDIA_URL.
-    return absolute_url(settings.JQUERY_URL,
-                        getattr(django_settings, 'STATIC_URL',
-                        django_settings.MEDIA_URL))

markitup/views.py

 def apply_filter(request):
     markup = filter_func(request.POST.get('data', ''))
     return render_to_response( 'markitup/preview.html',
-                              {'preview': markup,
-                               'MARKITUP_MEDIA_URL': settings.MARKITUP_MEDIA_URL},
+                              {'preview': markup},
                               context_instance=RequestContext(request))

markitup/widgets.py

 from django.contrib.admin.widgets import AdminTextareaWidget
 
 from markitup import settings
-from markitup.util import absolute_url, absolute_jquery_url
+from markitup.util import absolute_url
 import posixpath
 
 class MarkupTextarea(forms.Textarea):
         return forms.Media(
             css= {'screen': (posixpath.join(self.miu_skin, 'style.css'),
                              posixpath.join(self.miu_set, 'style.css'))},
-            js=(absolute_jquery_url(),
+            js=(absolute_url(settings.JQUERY_URL),
                 absolute_url('markitup/ajax_csrf.js'),
                 absolute_url('markitup/jquery.markitup.js'),
                 posixpath.join(self.miu_set, 'set.js')))
 
 setup(
     name='django-markitup',
-    version='0.6.1.post%s' % hgrev,
+    version='1.0.0',
     description='Markup handling for Django using the MarkItUp! universal markup editor',
     long_description=long_description,
     author='Carl Meyer',
-    author_email='carl@dirtcircle.com',
+    author_email='carl@oddbird.net',
     url='http://bitbucket.org/carljm/django-markitup/',
     packages=['markitup', 'markitup.templatetags'],
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
     ],
     zip_safe=False,
     test_suite='runtests.runtests',
-    tests_require='Django>=1.1',
+    tests_require='Django>=1.3',
     package_data={'markitup': ['templates/markitup/*.html'] +
-                              _static_files('media') +
                               _static_files('static')}
 )

tests/test_settings.py

     "markitup",
     "tests"]
 
-from django import VERSION
-
-if VERSION < (1, 2):
-    DATABASE_ENGINE = "sqlite3"
-else:
-    DATABASES = {
-        "default": {
-            "ENGINE": "django.db.backends.sqlite3"
-            }
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3"
         }
-
-MEDIA_URL = "/media/"
-MEDIA_ROOT = join(dirname(MIU_TEST_ROOT), "markitup", "media")
+    }
 
 STATIC_URL = "/static/"
-STATIC_ROOT = MEDIA_ROOT
 
 ROOT_URLCONF = "tests.urls"
 
+from __future__ import with_statement
+
 import re
 
-from django import VERSION
-from django.conf import settings as django_settings
 from django.core import serializers
 from django.db.models.fields import FieldDoesNotExist
 from django.forms.models import modelform_factory
 from django.template import Template, Context, get_library
 from django.test import TestCase, Client
 from django.utils.safestring import mark_safe
+from django.utils.unittest import skipUnless
 
 from django.contrib import admin
 
                             status_code=200)
 
 
-    def test_preview_media_url(self):
-        _old_miu_media_url = settings.MARKITUP_MEDIA_URL
-        try:
-            settings.MARKITUP_MEDIA_URL = '/some/path/'
-            c = Client()
-            response = c.post('/markitup/preview/',
-                              {'data': 'replace this with something else'})
-            self.assertContains(response, '/some/path/markitup/preview.css',
-                                status_code=200)
-        finally:
-            settings.MARKITUP_MEDIA_URL = _old_miu_media_url
-
-
     def test_preview_template(self):
         c = Client()
         response = c.post('/markitup/preview/',
 
 
 
-# format of arg to get_library changed in 1.2
-if VERSION < (1,2):
-    markitup_tags = 'django.templatetags.markitup_tags'
-else:
-    markitup_tags = 'markitup_tags'
-
-
 class TemplatetagMediaUrlTests(MIUTestCase):
     prefix = '/static'
 
     # templatetag methods
     def _reset_context(self):
         # monkeypatch a forced recalculation of the template context
-        # format of get_library arg changed in 1.2
-
-        tags = get_library(markitup_tags)
+        tags = get_library("markitup_tags")