From: Go MAEDA <maeda@farend.jp>
Date: Wed, 4 Mar 2020 14:02:10 +0000 (+0000)
Subject: Toolbar button to insert a table (#1575).
X-Git-Tag: 4.2.0~1169
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a748b9ba58cdcf808aa80261e47d283cb71f0e2c;p=redmine.git

Toolbar button to insert a table (#1575).

Patch by Mizuki ISHIKAWA and Hiroyuki ENDO.


git-svn-id: http://svn.redmine.org/redmine/trunk@19561 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/public/images/jstoolbar/bt_table.png b/public/images/jstoolbar/bt_table.png
new file mode 100644
index 000000000..7d4c0d74f
Binary files /dev/null and b/public/images/jstoolbar/bt_table.png differ
diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
index 4f5ab7306..064dfec1f 100644
--- a/public/javascripts/jstoolbar/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -471,3 +471,38 @@ jsToolBar.prototype.precodeMenu = function(fn){
   });
   return false;
 };
+
+/* Table generator */
+jsToolBar.prototype.tableMenu = function(fn){
+  var alphabets = "ABCDEFGHIJ".split('');
+  var menu = $("<table class='table-generator'></table>");
+
+  for (var r = 1;  r <= 5;  r++) {
+    var row = $("<tr></tr>").appendTo(menu);
+    for (var c = 1;  c <= 10;  c++) {
+      $("<td data-row="+r+" data-col="+c+" title="+(c)+'&times;'+(r)+"></td>").mousedown(function(){
+        fn(alphabets.slice(0, $(this).data('col')), $(this).data('row'));
+      }).hover(function(){
+        var hoverRow = $(this).data('row');
+        var hoverCol = $(this).data('col');
+        $(this).closest('table').find('td').each(function(_index, element){
+          if ($(element).data('row') <= hoverRow && $(element).data('col') <= hoverCol){
+            $(element).addClass('selected-cell');
+          } else {
+            $(element).removeClass('selected-cell');
+          }
+        });
+      }).appendTo(row);
+    }
+  }
+  $("body").append(menu);
+  menu.position({
+    my: "left top",
+    at: "left bottom",
+    of: this.toolNodes['table']
+  });
+  $(document).on("mousedown", function() {
+    menu.remove();
+  });
+  return false;
+};
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ar.js b/public/javascripts/jstoolbar/lang/jstoolbar-ar.js
index 178f8455d..4a88b6b3e 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ar.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ar.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'قائمة غير مرتبة';
 jsToolBar.strings['Ordered list'] = 'قائمة مرتبة';
 jsToolBar.strings['Quote'] = 'اقتباس';
 jsToolBar.strings['Unquote'] = 'إزالة الاقتباس';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'نص مسبق التنسيق';
 jsToolBar.strings['Wiki link'] = 'رابط الى صفحة ويكي';
 jsToolBar.strings['Image'] = 'صورة';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-az.js b/public/javascripts/jstoolbar/lang/jstoolbar-az.js
index 3312b76d7..a100460ab 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-az.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-az.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
index d32f3d991..913295286 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Неподреден списък';
 jsToolBar.strings['Ordered list'] = 'Подреден списък';
 jsToolBar.strings['Quote'] = 'Цитат';
 jsToolBar.strings['Unquote'] = 'Премахване на цитат';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Форматиран текст';
 jsToolBar.strings['Wiki link'] = 'Връзка до Wiki страница';
 jsToolBar.strings['Image'] = 'Изображение';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bs.js b/public/javascripts/jstoolbar/lang/jstoolbar-bs.js
index 148ff88dc..08f4fef9a 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-bs.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-bs.js
@@ -10,6 +10,7 @@ jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link na Wiki stranicu';
 jsToolBar.strings['Image'] = 'Slika';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ca.js b/public/javascripts/jstoolbar/lang/jstoolbar-ca.js
index 5639a5b59..abd543b10 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ca.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ca.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Llista sense ordre';
 jsToolBar.strings['Ordered list'] = 'Llista ordenada';
 jsToolBar.strings['Quote'] = 'Cometes';
 jsToolBar.strings['Unquote'] = 'Sense cometes';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Text formatat';
 jsToolBar.strings['Wiki link'] = 'Enllaça a una pàgina Wiki';
 jsToolBar.strings['Image'] = 'Imatge';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
index 48b6d75ad..2e9065987 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Seznam';
 jsToolBar.strings['Ordered list'] = 'Uspořádaný seznam';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Předformátovaný text';
 jsToolBar.strings['Wiki link'] = 'Vložit odkaz na Wiki stránku';
 jsToolBar.strings['Image'] = 'Vložit obrázek';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-da.js b/public/javascripts/jstoolbar/lang/jstoolbar-da.js
index 974d264eb..f4a848d44 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-da.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-da.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Unummereret liste';
 jsToolBar.strings['Ordered list'] = 'Nummereret liste';
 jsToolBar.strings['Quote'] = 'Citér';
 jsToolBar.strings['Unquote'] = 'Fjern citér';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Præformateret tekst';
 jsToolBar.strings['Wiki link'] = 'Link til en wiki-side';
 jsToolBar.strings['Image'] = 'Billede';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-de.js b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
index 3d5964fab..dc82aac93 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-de.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Aufzählungsliste';
 jsToolBar.strings['Ordered list'] = 'Nummerierte Liste';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Präformatierter Text';
 jsToolBar.strings['Wiki link'] = 'Verweis (Link) zu einer Wiki-Seite';
 jsToolBar.strings['Image'] = 'Grafik';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js b/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
index 3d5586395..e4b456a45 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en.js b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
index 3d5586395..e4b456a45 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-en.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-es-pa.js b/public/javascripts/jstoolbar/lang/jstoolbar-es-pa.js
index f0658b8c7..50c55c98c 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-es-pa.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-es-pa.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Lista sin ordenar';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Citar';
 jsToolBar.strings['Unquote'] = 'Quitar cita';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Texto con formato';
 jsToolBar.strings['Wiki link'] = 'Enlace a página Wiki';
 jsToolBar.strings['Image'] = 'Imagen';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-es.js b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
index f0658b8c7..50c55c98c 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-es.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Lista sin ordenar';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Citar';
 jsToolBar.strings['Unquote'] = 'Quitar cita';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Texto con formato';
 jsToolBar.strings['Wiki link'] = 'Enlace a página Wiki';
 jsToolBar.strings['Image'] = 'Imagen';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-et.js b/public/javascripts/jstoolbar/lang/jstoolbar-et.js
index 4875a8c61..b71c4c06b 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-et.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-et.js
@@ -29,6 +29,7 @@ jsToolBar.strings['Unordered list'] = 'Täpitud nimekiri';
 jsToolBar.strings['Ordered list'] = 'Nummerdatud nimekiri';
 jsToolBar.strings['Quote'] = 'Tsitaat: aste juurde';
 jsToolBar.strings['Unquote'] = 'Tsitaat: aste madalamaks';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Eelvormindatud tekst';
 jsToolBar.strings['Wiki link'] = 'Vikilehe link';
 jsToolBar.strings['Image'] = 'Pilt';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-eu.js b/public/javascripts/jstoolbar/lang/jstoolbar-eu.js
index a5ec1f3e3..52e7877b9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-eu.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-eu.js
@@ -16,6 +16,7 @@ jsToolBar.strings['Unordered list'] = 'Ordenatu gabeko zerrenda';
 jsToolBar.strings['Ordered list'] = 'Ordenatutako zerrenda';
 jsToolBar.strings['Quote'] = 'Aipamena';
 jsToolBar.strings['Unquote'] = 'Aipamena kendu';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Aurrez formateatutako testua';
 jsToolBar.strings['Wiki link'] = 'Wiki orri baterako esteka';
 jsToolBar.strings['Image'] = 'Irudia';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fa.js b/public/javascripts/jstoolbar/lang/jstoolbar-fa.js
index fdf4bd082..92fb7d105 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fa.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fa.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'فهرست بدون شماره';
 jsToolBar.strings['Ordered list'] = 'فهرست با شماره';
 jsToolBar.strings['Quote'] = 'تو بردن';
 jsToolBar.strings['Unquote'] = 'بیرون آوردن';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'نوشته قالب بندی شده';
 jsToolBar.strings['Wiki link'] = 'پیوند به برگ ویکی';
 jsToolBar.strings['Image'] = 'عکس';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
index 0c017658d..ed421a287 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Järjestämätön lista';
 jsToolBar.strings['Ordered list'] = 'Järjestetty lista';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Ennaltamuotoiltu teksti';
 jsToolBar.strings['Wiki link'] = 'Linkki Wiki sivulle';
 jsToolBar.strings['Image'] = 'Kuva';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
index 14c76c654..996f55cd6 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Liste à puces';
 jsToolBar.strings['Ordered list'] = 'Liste numérotée';
 jsToolBar.strings['Quote'] = 'Indenté';
 jsToolBar.strings['Unquote'] = 'Supprimer indentation';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Texte préformaté';
 jsToolBar.strings['Wiki link'] = 'Lien vers une page Wiki';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-gl.js b/public/javascripts/jstoolbar/lang/jstoolbar-gl.js
index 113e98e1d..a363cdf79 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-gl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-gl.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Lista sen ordenar';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Citar';
 jsToolBar.strings['Unquote'] = 'Quitar cita';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Texto con formato';
 jsToolBar.strings['Wiki link'] = 'Ligazón a páxina Wiki';
 jsToolBar.strings['Image'] = 'Imaxe';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-he.js b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
index 0ec5273e6..72d4b8db6 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-he.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hr.js b/public/javascripts/jstoolbar/lang/jstoolbar-hr.js
index e8194f9a5..8a864f4aa 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-hr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-hr.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Graficke oznake';
 jsToolBar.strings['Ordered list'] = 'Numeriranje';
 jsToolBar.strings['Quote'] = 'Citat';
 jsToolBar.strings['Unquote'] = 'Ukloni citat';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Izveden tekst';
 jsToolBar.strings['Wiki link'] = 'Link na Wiki stranicu';
 jsToolBar.strings['Image'] = 'Slika';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
index 922042c06..d8893f307 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Felsorolás';
 jsToolBar.strings['Ordered list'] = 'Számozott lista';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Előreformázott szöveg';
 jsToolBar.strings['Wiki link'] = 'Link egy Wiki oldalra';
 jsToolBar.strings['Image'] = 'Kép';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-id.js b/public/javascripts/jstoolbar/lang/jstoolbar-id.js
index 26e2534e0..ca5c71167 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-id.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-id.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Daftar tak terurut';
 jsToolBar.strings['Ordered list'] = 'Daftar terurut';
 jsToolBar.strings['Quote'] = 'Kutipan';
 jsToolBar.strings['Unquote'] = 'Hapus kutipan';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Teks terformat';
 jsToolBar.strings['Wiki link'] = 'Tautkan ke halaman wiki';
 jsToolBar.strings['Image'] = 'Gambar';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-it.js b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
index 75b959e5f..13ade13b2 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-it.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
@@ -15,6 +15,7 @@ jsToolBar.strings['Unordered list'] = 'Elenco puntato';
 jsToolBar.strings['Ordered list'] = 'Elenco numerato';
 jsToolBar.strings['Quote'] = 'Aumenta rientro';
 jsToolBar.strings['Unquote'] = 'Riduci rientro';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Testo preformattato';
 jsToolBar.strings['Wiki link'] = 'Collegamento a pagina Wiki';
 jsToolBar.strings['Image'] = 'Immagine';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
index c63676706..71a9c4313 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = '順不同リスト';
 jsToolBar.strings['Ordered list'] = '番号つきリスト';
 jsToolBar.strings['Quote'] = '引用';
 jsToolBar.strings['Unquote'] = '引用解除';
+jsToolBar.strings['Table'] = 'テーブル';
 jsToolBar.strings['Preformatted text'] = '整形済みテキスト';
 jsToolBar.strings['Wiki link'] = 'Wikiページへのリンク';
 jsToolBar.strings['Image'] = '画像';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
index 9e93e8508..601a83a84 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = '글머리 기호';
 jsToolBar.strings['Ordered list'] = '번호 매기기';
 jsToolBar.strings['Quote'] = '인용';
 jsToolBar.strings['Unquote'] = '인용 취소';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = '있는 그대로 표현 (Preformatted text)';
 jsToolBar.strings['Wiki link'] = 'Wiki 페이지에 연결';
 jsToolBar.strings['Image'] = '그림';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
index 3af8153e4..00fdf0ec6 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Nenumeruotas sąrašas';
 jsToolBar.strings['Ordered list'] = 'Numeruotas sąrašas';
 jsToolBar.strings['Quote'] = 'Cituoti';
 jsToolBar.strings['Unquote'] = 'Pašalinti citavimą';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatuotas tekstas';
 jsToolBar.strings['Wiki link'] = 'Nuoroda į Wiki puslapį';
 jsToolBar.strings['Image'] = 'Paveikslas';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lv.js b/public/javascripts/jstoolbar/lang/jstoolbar-lv.js
index 4bca133ae..5e43d128a 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-lv.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-lv.js
@@ -13,6 +13,7 @@ jsToolBar.strings['Unordered list'] = 'Nesakārtots saraksts';
 jsToolBar.strings['Ordered list'] = 'Sakārtots saraksts';
 jsToolBar.strings['Quote'] = 'Citēt';
 jsToolBar.strings['Unquote'] = 'Noņemt citātu';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Iepriekš formatēts teksts';
 jsToolBar.strings['Wiki link'] = 'Saite uz Wiki lapu';
 jsToolBar.strings['Image'] = 'Attēls';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-mk.js b/public/javascripts/jstoolbar/lang/jstoolbar-mk.js
index 71621f776..01e8b7a51 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-mk.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-mk.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Неподредена листа';
 jsToolBar.strings['Ordered list'] = 'Подредена листа';
 jsToolBar.strings['Quote'] = 'Цитат';
 jsToolBar.strings['Unquote'] = 'Отстрани цитат';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Форматиран текст';
 jsToolBar.strings['Wiki link'] = 'Врска до вики страна';
 jsToolBar.strings['Image'] = 'Слика';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-mn.js b/public/javascripts/jstoolbar/lang/jstoolbar-mn.js
index 548408603..82e80439b 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-mn.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-mn.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Эрэмбэгүй жагсаалт';
 jsToolBar.strings['Ordered list'] = 'Эрэмбэтэй жагсаалт';
 jsToolBar.strings['Quote'] = 'Ишлэл';
 jsToolBar.strings['Unquote'] = 'Ишлэлийг устгах';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Өмнө нь хэлбэржсэн текст';
 jsToolBar.strings['Wiki link'] = 'Вики хуудас руу холбох';
 jsToolBar.strings['Image'] = 'Зураг';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
index 8501bcd36..e28e8a144 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Ongeordende lijst';
 jsToolBar.strings['Ordered list'] = 'Geordende lijst';
 jsToolBar.strings['Quote'] = 'Citaat';
 jsToolBar.strings['Unquote'] = 'Citaat verwijderen';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Vooropgemaakte tekst';
 jsToolBar.strings['Wiki link'] = 'Link naar een Wikipagina';
 jsToolBar.strings['Image'] = 'Afbeelding';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
index 2d6a96fc4..14f587922 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-no.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Punktliste';
 jsToolBar.strings['Ordered list'] = 'Nummerert liste';
 jsToolBar.strings['Quote'] = 'Sitat';
 jsToolBar.strings['Unquote'] = 'Avslutt sitat';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatert tekst';
 jsToolBar.strings['Wiki link'] = 'Lenke til Wiki-side';
 jsToolBar.strings['Image'] = 'Bilde';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
index 5e1b9f88f..d343666cc 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
@@ -13,6 +13,7 @@ jsToolBar.strings['Unordered list'] = 'Nieposortowana lista';
 jsToolBar.strings['Ordered list'] = 'Posortowana lista';
 jsToolBar.strings['Quote'] = 'Cytat';
 jsToolBar.strings['Unquote'] = 'Usuń cytat';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Sformatowany tekst';
 jsToolBar.strings['Wiki link'] = 'Odnośnik do strony Wiki';
 jsToolBar.strings['Image'] = 'Obraz';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
index 013b1fa7e..8320f1de7 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
@@ -14,6 +14,7 @@ jsToolBar.strings['Unordered list'] = 'Lista não ordenada';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Identar';
 jsToolBar.strings['Unquote'] = 'Remover identação';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Texto pré-formatado';
 jsToolBar.strings['Wiki link'] = 'Link para uma página Wiki';
 jsToolBar.strings['Image'] = 'Imagem';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
index b920829ba..e296c8367 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
@@ -13,6 +13,7 @@ jsToolBar.strings['Unordered list'] = 'Lista não ordenada';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Citação';
 jsToolBar.strings['Unquote'] = 'Remover citação';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Texto pré-formatado';
 jsToolBar.strings['Wiki link'] = 'Link para uma página da Wiki';
 jsToolBar.strings['Image'] = 'Imagem';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
index 78069f95d..8cdcad11d 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Listă pe puncte';
 jsToolBar.strings['Ordered list'] = 'Listă ordonată';
 jsToolBar.strings['Quote'] = 'Citează';
 jsToolBar.strings['Unquote'] = 'Fără citat';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Text preformatat';
 jsToolBar.strings['Wiki link'] = 'Trimitere către o pagină wiki';
 jsToolBar.strings['Image'] = 'Imagine';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
index 6b532e45c..61e703c49 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Маркированный список';
 jsToolBar.strings['Ordered list'] = 'Нумерованный список';
 jsToolBar.strings['Quote'] = 'Цитата';
 jsToolBar.strings['Unquote'] = 'Удалить цитату';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Заранее форматированный текст';
 jsToolBar.strings['Wiki link'] = 'Ссылка на страницу в Wiki';
 jsToolBar.strings['Image'] = 'Вставка изображения';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sk.js b/public/javascripts/jstoolbar/lang/jstoolbar-sk.js
index 86936ed88..25b1c1e2a 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sk.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sk.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Odrážkový zoznam';
 jsToolBar.strings['Ordered list'] = 'Číslovaný zoznam';
 jsToolBar.strings['Quote'] = 'Odsadenie';
 jsToolBar.strings['Unquote'] = 'Zrušiť odsadenie';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Predformátovaný text';
 jsToolBar.strings['Wiki link'] = 'Odkaz na wikistránku';
 jsToolBar.strings['Image'] = 'Obrázok';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sl.js b/public/javascripts/jstoolbar/lang/jstoolbar-sl.js
index e7199dd3b..090a55a9f 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sl.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Neurejen seznam';
 jsToolBar.strings['Ordered list'] = 'Urejen seznam';
 jsToolBar.strings['Quote'] = 'Citat';
 jsToolBar.strings['Unquote'] = 'Odstrani citat';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Predoblikovano besedilo';
 jsToolBar.strings['Wiki link'] = 'Povezava na Wiki stran';
 jsToolBar.strings['Image'] = 'Slika';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sq.js b/public/javascripts/jstoolbar/lang/jstoolbar-sq.js
index 3d5586395..e4b456a45 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sq.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sq.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
index 68ed5a564..94d993d5a 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Lista nabrajanja';
 jsToolBar.strings['Ordered list'] = 'Uređena lista';
 jsToolBar.strings['Quote'] = 'Pod navodnicima';
 jsToolBar.strings['Unquote'] = 'Ukloni navodnike';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Prethodno formatiran tekst';
 jsToolBar.strings['Wiki link'] = 'Veza prema Wiki strani';
 jsToolBar.strings['Image'] = 'Slika';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
index 9957dd414..ab4ae0245 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Листа набрајања';
 jsToolBar.strings['Ordered list'] = 'Уређена листа';
 jsToolBar.strings['Quote'] = 'Под наводницима';
 jsToolBar.strings['Unquote'] = 'Уклони наводнике';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Претходно форматиран текст';
 jsToolBar.strings['Wiki link'] = 'Веза према Wiki страни';
 jsToolBar.strings['Image'] = 'Слика';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
index 9c0e8d149..7ef6c75cd 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Osorterad lista';
 jsToolBar.strings['Ordered list'] = 'Sorterad lista';
 jsToolBar.strings['Quote'] = 'Citat';
 jsToolBar.strings['Unquote'] = 'Ta bort citat';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Förformaterad text';
 jsToolBar.strings['Wiki link'] = 'Länk till en wikisida';
 jsToolBar.strings['Image'] = 'Bild';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-th.js b/public/javascripts/jstoolbar/lang/jstoolbar-th.js
index f82498477..1969ce0c4 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-th.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-th.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'รายการ';
 jsToolBar.strings['Ordered list'] = 'ลำดับเลข';
 jsToolBar.strings['Quote'] = 'Quote';
 jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'รูปแบบข้อความคงที่';
 jsToolBar.strings['Wiki link'] = 'เชื่อมโยงไปหน้า Wiki อื่น';
 jsToolBar.strings['Image'] = 'รูปภาพ';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-tr.js b/public/javascripts/jstoolbar/lang/jstoolbar-tr.js
index f95aae123..6d15a9c3e 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-tr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-tr.js
@@ -10,6 +10,7 @@ jsToolBar.strings['Heading 3'] = 'Başlık 3';
 jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Sırasız liste';
 jsToolBar.strings['Ordered list'] = 'Sıralı liste';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Wiki sayfasına bağlantı';
 jsToolBar.strings['Image'] = 'Resim';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-uk.js b/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
index 863dac843..55ca7c568 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Ненумерованний список
 jsToolBar.strings['Ordered list'] = 'Нумерований список';
 jsToolBar.strings['Quote'] = 'Цитування';
 jsToolBar.strings['Unquote'] = 'Видалити цитування';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Попередньо відформатований текст';
 jsToolBar.strings['Wiki link'] = 'Посилання на сторінку Wiki';
 jsToolBar.strings['Image'] = 'Зображення';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-vi.js b/public/javascripts/jstoolbar/lang/jstoolbar-vi.js
index 4e841be50..30f74b69d 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-vi.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-vi.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = 'Danh sách không thứ tự';
 jsToolBar.strings['Ordered list'] = 'Danh sách có thứ tự';
 jsToolBar.strings['Quote'] = 'Trích dẫn';
 jsToolBar.strings['Unquote'] = 'Bỏ trích dẫn';
+jsToolBar.strings['Table'] = 'Table';
 jsToolBar.strings['Preformatted text'] = 'Mã nguồn';
 jsToolBar.strings['Wiki link'] = 'Liên kết đến trang wiki';
 jsToolBar.strings['Image'] = 'Ảnh';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
index 4375100c9..98bde9219 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = '項目清單';
 jsToolBar.strings['Ordered list'] = '編號清單';
 jsToolBar.strings['Quote'] = '引文';
 jsToolBar.strings['Unquote'] = '取消引文';
+jsToolBar.strings['Table'] = '表格';
 jsToolBar.strings['Preformatted text'] = '已格式文字';
 jsToolBar.strings['Wiki link'] = '連結至 Wiki 頁面';
 jsToolBar.strings['Image'] = '圖片';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
index cc27d28bc..335270480 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
@@ -12,6 +12,7 @@ jsToolBar.strings['Unordered list'] = '无序列表';
 jsToolBar.strings['Ordered list'] = '排序列表';
 jsToolBar.strings['Quote'] = '引用';
 jsToolBar.strings['Unquote'] = '删除引用';
+jsToolBar.strings['Table'] = '表格';
 jsToolBar.strings['Preformatted text'] = '格式化文本';
 jsToolBar.strings['Wiki link'] = '连接到 Wiki 页面';
 jsToolBar.strings['Image'] = '图片';
diff --git a/public/javascripts/jstoolbar/markdown.js b/public/javascripts/jstoolbar/markdown.js
index d087276d6..c30de3096 100644
--- a/public/javascripts/jstoolbar/markdown.js
+++ b/public/javascripts/jstoolbar/markdown.js
@@ -170,6 +170,24 @@ jsToolBar.prototype.elements.unbq = {
   }
 }
 
+// table
+jsToolBar.prototype.elements.table = {
+  type: 'button',
+  title: 'Table',
+  fn: {
+    wiki: function() {
+      var This = this;
+      this.tableMenu(function(cols, rowCount){
+        This.encloseLineSelection(
+          '|'+cols.join(' |')+' |\n' +                                   // header
+          Array(cols.length+1).join('|--')+'|\n' +                       // second line
+          Array(rowCount+1).join(Array(cols.length+1).join('|  ')+'|\n') // cells
+        );
+      });
+    }
+  }
+}
+
 // pre
 jsToolBar.prototype.elements.pre = {
   type: 'button',
diff --git a/public/javascripts/jstoolbar/textile.js b/public/javascripts/jstoolbar/textile.js
index 40bc04094..9adc77add 100644
--- a/public/javascripts/jstoolbar/textile.js
+++ b/public/javascripts/jstoolbar/textile.js
@@ -170,6 +170,23 @@ jsToolBar.prototype.elements.unbq = {
   }
 }
 
+// table
+jsToolBar.prototype.elements.table = {
+  type: 'button',
+  title: 'Table',
+  fn: {
+    wiki: function() {
+      var This = this;
+      this.tableMenu(function(cols, rowCount){
+        This.encloseLineSelection(
+          '|_.'+cols.join('|_.')+'|\n' +                                 // header
+          Array(rowCount+1).join(Array(cols.length+1).join('|  ')+'|\n') // cells
+        );
+      });
+    }
+  }
+}
+
 // pre
 jsToolBar.prototype.elements.pre = {
   type: 'button',
diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index bd490b89f..5672e694c 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -80,6 +80,22 @@
 .jstElements .help { float: right; margin-right: 0.5em; padding-top: 8px; font-size: 0.9em; }
 .jstElements .help a {padding: 2px 0 2px 20px; background: url(../images/help.png) no-repeat 0 50%;}
 
+.table-generator td {
+    border: 2px solid #ccc;
+    background-color: white;
+    padding: 10px;
+    cursor: pointer;
+}
+
+.table-generator td.selected-cell, .table-generator td:hover {
+    background-color: #759FCF;
+}
+
+.table-generator {
+    position: absolute;
+    border-collapse: collapse;
+}
+
 /* Buttons
 -------------------------------------------------------- */
 .jstb_strong {
@@ -130,6 +146,9 @@
 .jstb_img {
     background-image: url(../images/jstoolbar/bt_img.png);
 }
+.jstb_table {
+    background-image: url(../images/jstoolbar/bt_table.png);
+}
 .jstb_help {
     background-image: url(../images/help.png);
 }