jro_apps/redmine Commit - r324:a54a15523b1f

wiki:...

Jean-Philippe Lang -

r324:a54a15523b1f

parent child

Context file:

r324:a54a15523b1f

Collapse all files

public/images/jstoolbar/bt_heading.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/manual/en/wiki_syntax.html created 644 +32 0

@@ -0,0 +1,32
	1	<html>
	2	<head>
	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
	4	<title>Wiki formatting</title>
	5	<link rel="stylesheet" href="html.css" type="text/css">
	6	<style>
	7	table td { vertical-align: top; background-color: #eee; }
	8	table td code { font-size: 1.2em; }
	9	</style>
	10	</head>
	11	<body>
	12
	13	<table width="100%">
	14	<tr><th colspan="3"><p><strong>Font Styles</strong></p></th></tr>
	15	<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" /></th><td>Strong</td><td><strong>Strong</strong></td></tr>
	16	<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
	17	<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
	18	<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
	19	<tr><th><img src="../../images/jstoolbar/bt_quote.png" style="border: 1px solid #bbb;" /></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
	20	<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" /></th><td>@Code@</td><td><code>Code</code></td></tr>
	21	<tr><th colspan="3"><p><strong>Lists</strong></p></th></tr>
	22	<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
	23	<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
	24	<tr><th colspan="3"><p><strong>Titles</strong></p></th></tr>
	25	<tr><th><img src="../../images/jstoolbar/bt_heading.png" style="border: 1px solid #bbb;" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
	26	<tr><th colspan="3"><p><strong>Links</strong></p></th></tr>
	27	<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
	28	<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
	29	<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr></table>
	30
	31	</body>
	32	</html> No newline at end of file

public/manual/fr/wiki_syntax.html created 644 +32 0

@@ -0,0 +1,32
	1	<html>
	2	<head>
	3	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
	4	<title>Formatage Wiki</title>
	5	<link rel="stylesheet" href="html.css" type="text/css">
	6	<style>
	7	table td { vertical-align: top; background-color: #eee; }
	8	table td code { font-size: 1.2em; }
	9	</style>
	10	</head>
	11	<body>
	12
	13	<table width="100%">
	14	<tr><th colspan="3"><p><strong>Mise en forme</strong></p></th></tr>
	15	<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" /></th><td>Gras</td><td><strong>Gras</strong></td></tr>
	16	<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" /></th><td>_Italique_</td><td><em>Italique</em></td></tr>
	17	<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" /></th><td>+Souligné+</td><td><ins>Souligné</ins></td></tr>
	18	<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" /></th><td>-Rayé-</td><td><del>Rayé</del></td></tr>
	19	<tr><th><img src="../../images/jstoolbar/bt_quote.png" style="border: 1px solid #bbb;" /></th><td>??Citation??</td><td><cite>Citation</cite></td></tr>
	20	<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" /></th><td>@Code@</td><td><code>Code</code></td></tr>
	21	<tr><th colspan="3"><p><strong>Listes</strong></p></th></tr>
	22	<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
	23	<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
	24	<tr><th colspan="3"><p><strong>Titres</strong></p></th></tr>
	25	<tr><th><img src="../../images/jstoolbar/bt_heading.png" style="border: 1px solid #bbb;" /></th><td>h2. Titre 2</td><td><h2>Titre 2</h2></td></tr>
	26	<tr><th colspan="3"><p><strong>Liens</strong></p></th></tr>
	27	<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" /></th><td>[[Page wiki]]</td><td><a href="#">Page wiki</a></td></tr>
	28	<tr><th></th><td>Demande #12</td><td>Demande <a href="#">#12</a></td></tr>
	29	<tr><th></th><td>Révision r43</td><td>Révision <a href="#">r43</a></td></tr></table>
	30
	31	</body>
	32	</html> No newline at end of file

app/views/wiki/edit.rhtml +6 -1

             <div class="contextual">
             <%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
             </div>
             <h2><%= @page.pretty_title %></h2>
             <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
             <%= error_messages_for 'content' %>
-            <p><%= f.text_area :text, :cols => 100, :rows => 25, :style => "width:99%;" %></p>
+            <div class="contextual">
+            <%= l(:setting_text_formatting) %>:
+            <%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' },
+                                        :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %>
+            </div>
+            <p><%= f.text_area :text, :cols => 100, :rows => 25, :style => "width:99.5%;" %></p>
             <p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
             <p><%= submit_tag l(:button_save) %>
                <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'wiki', :action => 'preview', :id => @project },
                                      :method => 'get',
                                      :update => 'preview',
                                      :with => "Form.serialize('wiki_form')",
                                      :loading => "Element.show('indicator')",
                                      :loaded => "Element.hide('indicator')"
                                    } %>
                <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
             </p>
             <% end %>
             <% if Setting.text_formatting == 'textile' %>
             <%= javascript_include_tag 'jstoolbar' %>
             <script type="text/javascript">
             //<![CDATA[
             if (document.getElementById) {
             	if (document.getElementById('content_text')) {
             		var commentTb = new jsToolBar(document.getElementById('content_text'));
             		commentTb.draw();
             	}
             }
             //]]>
             </script>
             <% end %>
             <div id="preview" class="wiki"></div>

config/help.yml +3 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             # available languages for help pages
             langs:
               - en
               - fr
             # mapping between controller/action and help pages
             # if action is not defined here, 'index' page will be displayed
             pages:
               # administration
               admin:
                 index:          ch01.html
                 mail_options:   ch01s09.html
                 info:           ch01s12.html
               users:
                 index:          ch01s02.html
               roles:
                 index:          ch01s03.html
                 workflow:       ch01s07.html
               trackers:
                 index:          ch01s04.html
               issue_statuses:
                 index:          ch01s06.html
               settings:
                 index:          ch01s11.html
               # projects
               projects:
                 index:          ch02.html
                 add:            ch01s01.html
                 show:           ch02s01.html
                 gantt:          ch02s02.html
                 calendar:       ch02s02.html
                 add_document:   ch02s07.html
                 list_documents: ch02s07.html
                 add_issue:      ch02s03.html
                 list_issues:    ch02s03.html
                 add_news:       ch02s06.html
                 list_news:      ch02s06.html
                 add_file:       ch02s08.html
                 list_files:     ch02s08.html
                 changelog:      ch02s05.html
               issues:
                 index:          ch02s03.html
               documents:
                 index:          ch02s07.html
               news:
                 index:          ch02s06.html
               versions:
                 index:          ch02s09.html
               reports:
                 index:          ch02s04.html
               # accounts
               my:
                 index:          ch03.html
                 account:        ch03s01.html
                 page:           ch03s02.html
               account:
                 index:          ch03.html
                 lost_password:  ch03s03.html
-                register:       ch03s04.html
  No newline at end of file
+                register:       ch03s04.html
+              wiki:
+                syntax:         wiki_syntax.html
  No newline at end of file

public/javascripts/jstoolbar.js +32 -8

             /* ***** BEGIN LICENSE BLOCK *****
              * This file is part of DotClear.
              * Copyright (c) 2005 Nicolas Martin & Olivier Meunier and contributors. All
              * rights reserved.
              *
              * DotClear is free software; you can redistribute it and/or modify
              * it under the terms of the GNU General Public License as published by
              * the Free Software Foundation; either version 2 of the License, or
              * (at your option) any later version.
              *
              * DotClear is distributed in the hope that it will be useful,
              * but WITHOUT ANY WARRANTY; without even the implied warranty of
              * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              * GNU General Public License for more details.
              *
              * You should have received a copy of the GNU General Public License
              * along with DotClear; if not, write to the Free Software
              * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
              *
              * ***** END LICENSE BLOCK *****
             */
             /* Modified by JP LANG for textile formatting */
             function jsToolBar(textarea) {
             	if (!document.createElement) { return; }
             	if (!textarea) { return; }
             	if ((typeof(document["selection"]) == "undefined")
             	&& (typeof(textarea["setSelectionRange"]) == "undefined")) {
             		return;
             	}
             	this.textarea = textarea;
             	this.editor = document.createElement('div');
             	this.editor.className = 'jstEditor';
             	this.textarea.parentNode.insertBefore(this.editor,this.textarea);
             	this.editor.appendChild(this.textarea);
             	this.toolbar = document.createElement("div");
             	this.toolbar.className = 'jstElements';
             	this.editor.parentNode.insertBefore(this.toolbar,this.editor);
             	// Dragable resizing (only for gecko)
             	if (this.editor.addEventListener)
             	{
             		this.handle = document.createElement('div');
             		this.handle.className = 'jstHandle';
             		var dragStart = this.resizeDragStart;
             		var This = this;
             		this.handle.addEventListener('mousedown',function(event) { dragStart.call(This,event); },false);
             		// fix memory leak in Firefox (bug #241518)
             		window.addEventListener('unload',function() {
             				var del = This.handle.parentNode.removeChild(This.handle);
             				delete(This.handle);
             		},false);
             		this.editor.parentNode.insertBefore(this.handle,this.editor.nextSibling);
             	}
             	this.context = null;
             	this.toolNodes = {}; // lorsque la toolbar est dessinée , cet objet est garni
             					// de raccourcis vers les éléments DOM correspondants aux outils.
             }
             function jsButton(title, fn, scope, className) {
             	this.title = title || null;
             	this.fn = fn || function(){};
             	this.scope = scope || null;
             	this.className = className || null;
             }
             jsButton.prototype.draw = function() {
             	if (!this.scope) return null;
             	var button = document.createElement('button');
             	button.setAttribute('type','button');
             	if (this.className) button.className = this.className;
             	button.title = this.title;
             	var span = document.createElement('span');
             	span.appendChild(document.createTextNode(this.title));
             	button.appendChild(span);
             	if (this.icon != undefined) {
             		button.style.backgroundImage = 'url('+this.icon+')';
             	}
             	if (typeof(this.fn) == 'function') {
             		var This = this;
             		button.onclick = function() { try { This.fn.apply(This.scope, arguments) } catch (e) {} return false; };
             	}
             	return button;
             }
             function jsSpace(id) {
             	this.id = id || null;
             	this.width = null;
             }
             jsSpace.prototype.draw = function() {
             	var span = document.createElement('span');
             	if (this.id) span.id = this.id;
             	span.appendChild(document.createTextNode(String.fromCharCode(160)));
             	span.className = 'jstSpacer';
             	if (this.width) span.style.marginRight = this.width+'px';
             	return span;
             }
             function jsCombo(title, options, scope, fn, className) {
             	this.title = title || null;
             	this.options = options || null;
             	this.scope = scope || null;
             	this.fn = fn || function(){};
             	this.className = className || null;
             }
             jsCombo.prototype.draw = function() {
             	if (!this.scope || !this.options) return null;
             	var select = document.createElement('select');
             	if (this.className) select.className = className;
             	select.title = this.title;
             	for (var o in this.options) {
             		//var opt = this.options[o];
             		var option = document.createElement('option');
             		option.value = o;
             		option.appendChild(document.createTextNode(this.options[o]));
             		select.appendChild(option);
             	}
             	var This = this;
             	select.onchange = function() {
             		try {
             			This.fn.call(This.scope, this.value);
             		} catch (e) { alert(e); }
             		return false;
             	}
             	return select;
             }
             jsToolBar.prototype = {
             	base_url: '',
             	mode: 'wiki',
             	elements: {},
             	getMode: function() {
             		return this.mode;
             	},
             	setMode: function(mode) {
             		this.mode = mode || 'wiki';
             	},
             	switchMode: function(mode) {
             		mode = mode || 'wiki';
             		this.draw(mode);
             	},
             	button: function(toolName) {
             		var tool = this.elements[toolName];
             		if (typeof tool.fn[this.mode] != 'function') return null;
             		var b = new jsButton(tool.title, tool.fn[this.mode], this, 'jstb_'+toolName);
             		if (tool.icon != undefined) b.icon = tool.icon;
             		return b;
             	},
             	space: function(toolName) {
             		var tool = new jsSpace(toolName)
             		if (this.elements[toolName].width !== undefined)
             			tool.width = this.elements[toolName].width;
             		return tool;
             	},
             	combo: function(toolName) {
             		var tool = this.elements[toolName];
             		var length = tool[this.mode].list.length;
             		if (typeof tool[this.mode].fn != 'function' || length == 0) {
             			return null;
             		} else {
             			var options = {};
             			for (var i=0; i < length; i++) {
             				var opt = tool[this.mode].list[i];
             				options[opt] = tool.options[opt];
             			}
             			return new jsCombo(tool.title, options, this, tool[this.mode].fn);
             		}
             	},
             	draw: function(mode) {
             		this.setMode(mode);
             		// Empty toolbar
             		while (this.toolbar.hasChildNodes()) {
             			this.toolbar.removeChild(this.toolbar.firstChild)
             		}
             		this.toolNodes = {}; // vide les raccourcis DOM/**/
             		// Draw toolbar elements
             		var b, tool, newTool;
             		for (var i in this.elements) {
             			b = this.elements[i];
             			var disabled =
             			b.type == undefined || b.type == ''
             			|| (b.disabled != undefined && b.disabled)
             			|| (b.context != undefined && b.context != null && b.context != this.context);
             			if (!disabled && typeof this[b.type] == 'function') {
             				tool = this[b.type](i);
             				if (tool) newTool = tool.draw();
             				if (newTool) {
             					this.toolNodes[i] = newTool; //mémorise l'accès DOM pour usage éventuel ultérieur
             					this.toolbar.appendChild(newTool);
             				}
             			}
             		}
             	},
             	singleTag: function(stag,etag) {
             		stag = stag || null;
             		etag = etag || stag;
             		if (!stag || !etag) { return; }
             		this.encloseSelection(stag,etag);
             	},
             	encloseSelection: function(prefix, suffix, fn) {
             		this.textarea.focus();
             		prefix = prefix || '';
             		suffix = suffix || '';
             		var start, end, sel, scrollPos, subst, res;
             		if (typeof(document["selection"]) != "undefined") {
             			sel = document.selection.createRange().text;
             		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
             			start = this.textarea.selectionStart;
             			end = this.textarea.selectionEnd;
             			scrollPos = this.textarea.scrollTop;
             			sel = this.textarea.value.substring(start, end);
             		}
             		if (sel.match(/ $/)) { // exclude ending space char, if any
             			sel = sel.substring(0, sel.length - 1);
             			suffix = suffix + " ";
             		}
             		if (typeof(fn) == 'function') {
             			res = (sel) ? fn.call(this,sel) : fn('');
             		} else {
             			res = (sel) ? sel : '';
             		}
             		subst = prefix + res + suffix;
             		if (typeof(document["selection"]) != "undefined") {
             			var range = document.selection.createRange().text = subst;
             			this.textarea.caretPos -= suffix.length;
             		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
             			this.textarea.value = this.textarea.value.substring(0, start) + subst +
             			this.textarea.value.substring(end);
             			if (sel) {
             				this.textarea.setSelectionRange(start + subst.length, start + subst.length);
             			} else {
             				this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
             			}
             			this.textarea.scrollTop = scrollPos;
             		}
             	},
             	stripBaseURL: function(url) {
             		if (this.base_url != '') {
             			var pos = url.indexOf(this.base_url);
             			if (pos == 0) {
             				url = url.substr(this.base_url.length);
             			}
             		}
             		return url;
             	}
             };
             /** Resizer
             -------------------------------------------------------- */
             jsToolBar.prototype.resizeSetStartH = function() {
             	this.dragStartH = this.textarea.offsetHeight + 0;
             };
             jsToolBar.prototype.resizeDragStart = function(event) {
             	var This = this;
             	this.dragStartY = event.clientY;
             	this.resizeSetStartH();
             	document.addEventListener('mousemove', this.dragMoveHdlr=function(event){This.resizeDragMove(event);}, false);
             	document.addEventListener('mouseup', this.dragStopHdlr=function(event){This.resizeDragStop(event);}, false);
             };
             jsToolBar.prototype.resizeDragMove = function(event) {
             	this.textarea.style.height = (this.dragStartH+event.clientY-this.dragStartY)+'px';
             };
             jsToolBar.prototype.resizeDragStop = function(event) {
             	document.removeEventListener('mousemove', this.dragMoveHdlr, false);
             	document.removeEventListener('mouseup', this.dragStopHdlr, false);
             };
             // Elements definition ------------------------------------
             // strong
             jsToolBar.prototype.elements.strong = {
             	type: 'button',
             	title: 'Strong emphasis',
             	fn: {
             		wiki: function() { this.singleTag('*') }
             	}
             }
             // em
             jsToolBar.prototype.elements.em = {
             	type: 'button',
             	title: 'Emphasis',
             	fn: {
             		wiki: function() { this.singleTag("_") }
             	}
             }
             // ins
             jsToolBar.prototype.elements.ins = {
             	type: 'button',
             	title: 'Inserted',
             	fn: {
             		wiki: function() { this.singleTag('+') }
             	}
             }
             // del
             jsToolBar.prototype.elements.del = {
             	type: 'button',
             	title: 'Deleted',
             	fn: {
             		wiki: function() { this.singleTag('-') }
             	}
             }
             // quote
-            //jsToolBar.prototype.elements.quote = {
+            jsToolBar.prototype.elements.quote = {
-            //	type: 'button',
+            	type: 'button',
-            //	title: 'Inline quote',
+            	title: 'Inline quote',
-            //	fn: {
+            	fn: {
-            //		wiki: function() { this.singleTag('{{','}}') }
+            		wiki: function() { this.singleTag('??') }
-            //	}
-            //}
             // code
             jsToolBar.prototype.elements.code = {
             	type: 'button',
             	title: 'Code',
             	fn: {
             		wiki: function() { this.singleTag('@') }
             	}
             }
             // spacer
-            //jsToolBar.prototype.elements.space1 = {type: 'space'}
+            jsToolBar.prototype.elements.space1 = {type: 'space'}
+            // heading
+            jsToolBar.prototype.elements.heading = {
+            	type: 'button',
+            	title: 'Heading',
+            	fn: {
+            		wiki: function() {
+            			this.encloseSelection('','',function(str) {
+            				str = str.replace(/\r/g,'');
+            				return 'h2. '+str.replace(/\n/g,"\n* ");
+            			});
+            		}
+            	}
+            }
             // br
             //jsToolBar.prototype.elements.br = {
             //	type: 'button',
             //	title: 'Line break',
             //	fn: {
             //		wiki: function() { this.encloseSelection("%%%\n",'') }
             //	}
             //}
             // spacer
             jsToolBar.prototype.elements.space2 = {type: 'space'}
             // ul
             jsToolBar.prototype.elements.ul = {
             	type: 'button',
             	title: 'Unordered list',
             	fn: {
             		wiki: function() {
             			this.encloseSelection('','',function(str) {
             				str = str.replace(/\r/g,'');
             				return '* '+str.replace(/\n/g,"\n* ");
             			});
             		}
             	}
             }
             // ol
             jsToolBar.prototype.elements.ol = {
             	type: 'button',
             	title: 'Ordered list',
             	fn: {
             		wiki: function() {
             			this.encloseSelection('','',function(str) {
             				str = str.replace(/\r/g,'');
             				return '# '+str.replace(/\n/g,"\n# ");
             			});
             		}
             	}
             }
             // spacer
             jsToolBar.prototype.elements.space3 = {type: 'space'}
             // link
+            /*
             jsToolBar.prototype.elements.link = {
             	type: 'button',
             	title: 'Link',
             	fn: {},
             	href_prompt: 'Please give page URL:',
             	hreflang_prompt: 'Language of this page:',
             	default_hreflang: '',
             	prompt: function(href,hreflang) {
             		href = href || '';
             		hreflang = hreflang || this.elements.link.default_hreflang;
             		href = window.prompt(this.elements.link.href_prompt,href);
             		if (!href) { return false; }
             		hreflang = ""
             		return { href: this.stripBaseURL(href), hreflang: hreflang };
             	}
             }
             jsToolBar.prototype.elements.link.fn.wiki = function() {
             	var link = this.elements.link.prompt.call(this);
             	if (link) {
             		var stag = '"';
             		var etag = '":'+link.href;
             		this.encloseSelection(stag,etag);
             	}
             };
+            */
+            // link or wiki page
+            jsToolBar.prototype.elements.link = {
+            	type: 'button',
+            	title: 'Link',
+            	fn: {
+            		wiki: function() { this.encloseSelection("[[", "]]") }
+            	}
+            }

public/stylesheets/application.css +4 0

             /* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
             /* Edited by Jean-Philippe Lang *>
             /**************** Body and tag styles ****************/
             #header * {margin:0; padding:0;}
             p, ul, ol, li {margin:0; padding:0;}
             body{
             font:76% Verdana,Tahoma,Arial,sans-serif;
             line-height:1.4em;
             text-align:center;
             color:#303030;
             background:#e8eaec;
             margin:0;
             }
             a{color:#467aa7;font-weight:bold;text-decoration:none;background-color:inherit;}
             a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
             a img{border:none;}
             p{margin:0 0 1em 0;}
             p form{margin-top:0; margin-bottom:20px;}
             img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
             img.left{float:left; margin:0 12px 5px 0;}
             img.center{display:block; margin:0 auto 5px auto;}
             img.right{float:right; margin:0 0 5px 12px;}
             /**************** Header and navigation styles ****************/
             #container{
             width:100%;
             min-width: 800px;
             margin:0;
             padding:0;
             text-align:left;
             background:#ffffff;
             color:#303030;
             }
             #header{
             height:4.5em;
             margin:0;
             background:#467aa7;
             color:#ffffff;
             margin-bottom:1px;
             }
             #header h1{
             padding:10px 0 0 20px;
             font-size:2em;
             background-color:inherit;
             color:#fff;
             letter-spacing:-1px;
             font-weight:bold;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #header h2{
             margin:3px 0 0 40px;
             font-size:1.5em;
             background-color:inherit;
             color:#f0f2f4;
             letter-spacing:-1px;
             font-weight:normal;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #navigation{
             height:2.2em;
             line-height:2.2em;
             margin:0;
             background:#578bb8;
             color:#ffffff;
             }
             #navigation li{
             float:left;
             list-style-type:none;
             border-right:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li.right {
              float:right;
             list-style-type:none;
             border-right:0;
             border-left:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li a{
             display:block;
             padding:0px 10px 0px 22px;
             font-size:0.8em;
             font-weight:normal;
             text-decoration:none;
             background-color:inherit;
             color: #ffffff;
             }
             #navigation li.submenu {background:url(../images/arrow_down.png) 96% 80% no-repeat;}
             #navigation li.submenu a {padding:0px 16px 0px 22px;}
             * html #navigation a {width:1%;}
             #navigation .selected,#navigation a:hover{
             color:#ffffff;
             text-decoration:none;
             background-color: #80b0da;
             }
             /**************** Icons *******************/
             .icon {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             vertical-align: middle;
             }
             #navigation .icon {
             background-position: 4px 50%;
             }
             .icon22 {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 26px;
             line-height: 22px;
             vertical-align: middle;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-pdf { background-image: url(../images/pdf.png); }
             .icon-csv { background-image: url(../images/csv.png); }
             .icon-html { background-image: url(../images/html.png); }
             .icon-txt { background-image: url(../images/txt.png); }
             .icon-file { background-image: url(../images/file.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-home { background-image: url(../images/home.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-mypage { background-image: url(../images/user_page.png); }
             .icon-admin { background-image: url(../images/admin.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-logout { background-image: url(../images/logout.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-index  { background-image: url(../images/index.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }
             .icon22-options { background-image: url(../images/22x22/options.png); }
             .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
             .icon22-authent { background-image: url(../images/22x22/authent.png); }
             .icon22-info { background-image: url(../images/22x22/info.png); }
             .icon22-comment { background-image: url(../images/22x22/comment.png); }
             .icon22-package { background-image: url(../images/22x22/package.png); }
             .icon22-settings { background-image: url(../images/22x22/settings.png); }
             /**************** Content styles ****************/
             html>body #content {
             height: auto;
             min-height: 500px;
             }
             #content{
             width: auto;
             height:500px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             margin-left: 120px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2, #content div.wiki h1 {
             display:block;
             margin:0 0 16px 0;
             font-size:1.7em;
             font-weight:normal;
             letter-spacing:-1px;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #content h2 a{font-weight:normal;}
             #content h3{margin:0 0 12px 0; font-size:1.4em;color:#707070;font-family: Trebuchet MS,Georgia,"Times New Roman",serif;}
             #content h4{font-size: 1em; margin-bottom: 12px; margin-top: 20px; font-weight: normal; border-bottom: dotted 1px #c0c0c0;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             #content dt{font-weight:bold; margin-bottom:5px;}
             #content dd{margin:0 0 10px 15px;}
             #content .tabs{height: 2.6em;}
             #content .tabs ul{margin:0;}
             #content .tabs ul li{
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1em;
             padding:4px;
             border: 1px solid #c0c0c0;
             }
             #content .tabs ul li a.selected, #content .tabs ul li a:hover{
             background-color: #80b0da;
             border: 1px solid #80b0da;
             color: #fff;
             text-decoration:none;
             }
             /***********************************************/
             form {display: inline;}
             blockquote {padding-left: 6px; border-left: 2px solid #ccc;}
             input, select {vertical-align: middle; margin-bottom: 4px;}
             input.button-small {font-size: 0.8em;}
             .select-small {font-size: 0.8em;}
             label {font-weight: bold; font-size: 1em; color: #505050;}
             fieldset {border:1px solid #c0c0c0; padding: 6px;}
             legend {color: #505050;}
             .required {color: #bb0000;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             hr { border:0; border-top: dotted 1px #fff; border-bottom: dotted 1px #c0c0c0; }
             table p {margin:0; padding:0;}
             .highlight { background-color: #FCFD8D;}
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .4em .5em 0 0;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             ul.documents {
             list-style-type: none;
             padding: 0;
             margin: 0;
             }
             ul.documents li {
             background-image: url(../images/32x32/file.png);
             background-repeat: no-repeat;
             background-position: 0 1px;
             padding-left: 36px;
             margin-bottom: 10px;
             margin-left: -37px;
             }
             /********** Table used to display lists of things ***********/
             table.list {
                 width:100%;
                 border-collapse: collapse;
                 border: 1px dotted #d0d0d0;
                 margin-bottom: 6px;
             }
             table.with-cells td {
                 border: 1px solid #d7d7d7;
             }
             table.list td {
                 padding:2px;
             }
             table.list thead th {
                 text-align: center;
                 background: #eee;
                 border: 1px solid #d7d7d7;
                 color: #777;
             }
             table.list tbody th {
             	font-weight: normal;
                 background: #eed;
                 border: 1px solid #d7d7d7;
             }
             /********** Validation error messages *************/
             #errorExplanation {
               width: 400px;
               border: 0;
               padding: 7px;
               padding-bottom: 3px;
               margin-bottom: 0px;
             }
             #errorExplanation h2 {
               text-align: left;
               font-weight: bold;
               padding: 5px 5px 10px 26px;
               font-size: 1em;
               margin: -7px;
               background: url(../images/alert.png) no-repeat 6px 6px;
             }
             #errorExplanation p {
               color: #333;
               margin-bottom: 0;
               padding: 5px;
             }
             #errorExplanation ul li {
               font-size: 1em;
               list-style: none;
               margin-left: -16px;
             }
             /*==========  Drop down menu  ==============*/
             div.menu {
               background-color: #FFFFFF;
               border-style: solid;
               border-width: 1px;
               border-color: #7F9DB9;
               position: absolute;
               top: 0px;
               left: 0px;
               padding: 0;
               visibility: hidden;
               z-index: 101;
             }
             div.menu a.menuItem {
               font-size: 10px;
               font-weight: normal;
               line-height: 2em;
               color: #000000;
               background-color: #FFFFFF;
               cursor: default;
               display: block;
               padding: 0 1em;
               margin: 0;
               border: 0;
               text-decoration: none;
               white-space: nowrap;
             }
             div.menu a.menuItem:hover, div.menu a.menuItemHighlight {
               background-color: #80b0da;
               color: #ffffff;
             }
             div.menu a.menuItem span.menuItemText {}
             div.menu a.menuItem span.menuItemArrow {
               margin-right: -.75em;
             }
             /**************** Sidebar styles ****************/
             #subcontent{
             position: absolute;
             left: 0px;
             width:110px;
             padding:20px 20px 10px 5px;
             }
             #subcontent h2{
             display:block;
             margin:0 0 5px 0;
             font-size:1.0em;
             font-weight:bold;
             text-align:left;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #subcontent p{margin:0 0 16px 0; font-size:0.9em;}
             /**************** Menublock styles ****************/
             .menublock{margin:0 0 20px 8px; font-size:0.8em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
             .menublock li ul{margin:0; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             /**************** Footer styles ****************/
             #footer{
             clear:both;
             padding:5px 0;
             margin:0;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             }
             #footer p{padding:0; margin:0; text-align:center;}
             #footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
             #footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
             /**************** Misc classes and styles ****************/
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             .clear{clear:both;}
             .small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
             .hide{display:none;}
             .textcenter{text-align:center;}
             .textright{text-align:right;}
             .important{color:#f02025; background-color:inherit; font-weight:bold;}
             .box{
             margin:0 0 20px 0;
             padding:10px;
             border:1px solid #c0c0c0;
             background-color:#fafbfc;
             color:#505050;
             line-height:1.5em;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             .rightbox{
             background: #fafbfc;
             border: 1px solid #c0c0c0;
             float: right;
             padding: 8px;
             position: relative;
             margin: 0 5px 5px;
             }
             .layout-active {
             background: #ECF3E1;
             }
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             .login {
             width: 50%;
             text-align: left;
             }
             img.calendar-trigger {
                 cursor: pointer;
                 vertical-align: middle;
                 margin-left: 4px;
             }
             #history p {
                 margin-left: 34px;
             }
             /***** Contextual links div *****/
             .contextual {
             float: right;
             font-size: 0.8em;
             line-height: 16px;
             padding: 2px;
             }
             .contextual select, .contextual input {
             font-size: 1em;
             }
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:0.8em;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             /***** CSS FORM ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             }
             .tabular label{
             font-weight: bold;
             float: left;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .error {
             color: #cc0000;
             }
             /*.threepxfix class below:
             Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.
             to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepxtest.html
             */
             * html .threepxfix{
             margin-left: 3px;
             }
             /***** Wiki sections ****/
             #content div.wiki { font-size: 110%}
             #content div.wiki h2, div.wiki h3 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; color:#606060; }
             #content div.wiki h2 { font-size: 1.4em;}
             #content div.wiki h3 { font-size: 1.2em;}
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
             }
             div.wiki table, div.wiki td {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
+            div.wiki code {
+                font-size: 1.2em;
+            }
             #preview .preview { background: #fafbfc url(../images/draft.png); }

public/stylesheets/jstoolbar.css +3 0

             .jstEditor {
             	padding-left: 0px;
             }
             .jstEditor textarea, .jstEditor iframe {
               margin: 0;
             }
             .jstHandle {
             	height: 16px;
             	font-size: 0.1em;
             	cursor: s-resize;
             	/*background: transparent url(img/resizer.png) no-repeat 45% 50%;*/
             }
             .jstElements {
             	padding: 3px 3px;
             }
             .jstElements button {
             	margin-right : 6px;
             	width : 24px;
             	height: 24px;
             	padding: 4px;
             	border-style: solid;
             	border-width: 1px;
             	border-color: #ddd;
             	background-color : #f7f7f7;
             	background-position : 50% 50%;
             	background-repeat: no-repeat;
             }
             .jstElements button:hover {
             	border-color : #000;
             }
             .jstElements button span {
             	display : none;
             }
             .jstElements span {
             	display : inline;
             }
             .jstSpacer {
             	width : 0px;
             	font-size: 1px;
             	margin-right: 4px;
             }
             /* Buttons
             -------------------------------------------------------- */
             .jstb_strong {
             	background-image: url(../images/jstoolbar/bt_strong.png);
             }
             .jstb_em {
             	background-image: url(../images/jstoolbar/bt_em.png);
             }
             .jstb_ins {
             	background-image: url(../images/jstoolbar/bt_ins.png);
             }
             .jstb_del {
             	background-image: url(../images/jstoolbar/bt_del.png);
             }
             .jstb_quote {
             	background-image: url(../images/jstoolbar/bt_quote.png);
             }
             .jstb_code {
             	background-image: url(../images/jstoolbar/bt_code.png);
             }
             .jstb_br {
             	background-image: url(../images/jstoolbar/bt_br.png);
             }
+            .jstb_heading {
+            	background-image: url(../images/jstoolbar/bt_heading.png);
+            }
             .jstb_ul {
             	background-image: url(../images/jstoolbar/bt_ul.png);
             }
             .jstb_ol {
             	background-image: url(../images/jstoolbar/bt_ol.png);
             }
             .jstb_link {
             	background-image: url(../images/jstoolbar/bt_link.png);
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages