From f755a99ab8178071377faf70fc712c2b8fe8602c Mon Sep 17 00:00:00 2001 From: rugk Date: Mon, 12 Dec 2016 17:37:51 +0100 Subject: [PATCH 1/2] Add table class to parsed Markdown Fixes https://github.com/PrivateBin/PrivateBin/issues/140 --- js/privatebin.js | 5 ++++- tpl/bootstrap-compact.php | 2 +- tpl/bootstrap-dark-page.php | 2 +- tpl/bootstrap-dark.php | 2 +- tpl/bootstrap-page.php | 2 +- tpl/bootstrap.php | 2 +- tpl/page.php | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/js/privatebin.js b/js/privatebin.js index 8bfd7f7..c6da759 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -655,9 +655,12 @@ $(function() { this.clearText.html( converter.makeHtml(text) ); + // add table class from bootstrap css + this.clearText.find('table').addClass('table'); + this.clearText.removeClass('hidden'); + this.prettyMessage.addClass('hidden'); } - this.prettyMessage.addClass('hidden'); break; case 'syntaxhighlighting': if (typeof prettyPrintOne === 'function') diff --git a/tpl/bootstrap-compact.php b/tpl/bootstrap-compact.php index fa937b5..4fb0e82 100644 --- a/tpl/bootstrap-compact.php +++ b/tpl/bootstrap-compact.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/bootstrap-dark-page.php b/tpl/bootstrap-dark-page.php index b1b92f8..7a22251 100644 --- a/tpl/bootstrap-dark-page.php +++ b/tpl/bootstrap-dark-page.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/bootstrap-dark.php b/tpl/bootstrap-dark.php index 1801fbd..d031c5d 100644 --- a/tpl/bootstrap-dark.php +++ b/tpl/bootstrap-dark.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/bootstrap-page.php b/tpl/bootstrap-page.php index 591cf68..5209d86 100644 --- a/tpl/bootstrap-page.php +++ b/tpl/bootstrap-page.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index feffff8..2a1fd92 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/page.php b/tpl/page.php index fabd17c..cc4c07c 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -47,7 +47,7 @@ if ($MARKDOWN): - + From 58bd603c7cc303b9422e7f08f304b69bdfcc8900 Mon Sep 17 00:00:00 2001 From: rugk Date: Tue, 13 Dec 2016 23:30:28 +0100 Subject: [PATCH 2/2] Use nice condensed table with border and alos clean the prettyMessage even without showdown --- js/privatebin.js | 6 +++--- tpl/bootstrap-compact.php | 2 +- tpl/bootstrap-dark-page.php | 2 +- tpl/bootstrap-dark.php | 2 +- tpl/bootstrap-page.php | 2 +- tpl/bootstrap.php | 2 +- tpl/page.php | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/js/privatebin.js b/js/privatebin.js index c6da759..2cd135c 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -655,12 +655,12 @@ $(function() { this.clearText.html( converter.makeHtml(text) ); - // add table class from bootstrap css - this.clearText.find('table').addClass('table'); + // add table classes from bootstrap css + this.clearText.find('table').addClass('table-condensed table-bordered'); this.clearText.removeClass('hidden'); - this.prettyMessage.addClass('hidden'); } + this.prettyMessage.addClass('hidden'); break; case 'syntaxhighlighting': if (typeof prettyPrintOne === 'function') diff --git a/tpl/bootstrap-compact.php b/tpl/bootstrap-compact.php index 4fb0e82..3315c02 100644 --- a/tpl/bootstrap-compact.php +++ b/tpl/bootstrap-compact.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/bootstrap-dark-page.php b/tpl/bootstrap-dark-page.php index 7a22251..f512e0f 100644 --- a/tpl/bootstrap-dark-page.php +++ b/tpl/bootstrap-dark-page.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/bootstrap-dark.php b/tpl/bootstrap-dark.php index d031c5d..7c638aa 100644 --- a/tpl/bootstrap-dark.php +++ b/tpl/bootstrap-dark.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/bootstrap-page.php b/tpl/bootstrap-page.php index 5209d86..a9a5125 100644 --- a/tpl/bootstrap-page.php +++ b/tpl/bootstrap-page.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 2a1fd92..bf92176 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -52,7 +52,7 @@ if ($MARKDOWN): - + diff --git a/tpl/page.php b/tpl/page.php index cc4c07c..2227085 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -47,7 +47,7 @@ if ($MARKDOWN): - +