From bc067e9ad41804de26ec37fab90ec413b48b2270 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 22 Jul 2017 14:02:47 +0100 Subject: [PATCH 1/6] Updated dropdowns to hide after option click Fixes #429 --- resources/assets/js/controllers.js | 2 +- resources/assets/js/directives.js | 40 +++++++++++++++++------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js index ac1c3487c..9337ea889 100644 --- a/resources/assets/js/controllers.js +++ b/resources/assets/js/controllers.js @@ -379,7 +379,7 @@ module.exports = function (ngApp, events) { */ $scope.discardDraft = function () { let url = window.baseUrl('/ajax/page/' + pageId); - $http.get(url).then((responseData) => { + $http.get(url).then(responseData => { if (autoSave) $interval.cancel(autoSave); $scope.draftText = trans('entities.pages_editing_page'); $scope.isUpdateDraft = false; diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js index 51f1b7579..d783fd682 100644 --- a/resources/assets/js/directives.js +++ b/resources/assets/js/directives.js @@ -123,25 +123,31 @@ module.exports = function (ngApp, events) { restrict: 'A', link: function (scope, element, attrs) { const menu = element.find('ul'); - element.find('[dropdown-toggle]').on('click', function () { + + function hide() { + menu.hide(); + menu.removeClass('anim menuIn'); + } + + function show() { menu.show().addClass('anim menuIn'); + element.mouseleave(hide); + + // Focus on input if exist in dropdown and hide on enter press let inputs = menu.find('input'); - let hasInput = inputs.length > 0; - if (hasInput) { - inputs.first().focus(); - element.on('keypress', 'input', event => { - if (event.keyCode === 13) { - event.preventDefault(); - menu.hide(); - menu.removeClass('anim menuIn'); - return false; - } - }); - } - element.mouseleave(function () { - menu.hide(); - menu.removeClass('anim menuIn'); - }); + if (inputs.length > 0) inputs.first().focus(); + } + + // Hide menu on option click + element.on('click', '> ul a', hide); + // Show dropdown on toggle click. + element.find('[dropdown-toggle]').on('click', show); + // Hide menu on enter press in inputs + element.on('keypress', 'input', event => { + if (event.keyCode !== 13) return true; + event.preventDefault(); + hide(); + return false; }); } }; From b12e2ceada9b1b8a382b76c896fc392adcdf5b84 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 22 Jul 2017 14:21:56 +0100 Subject: [PATCH 2/6] Added included content into page's text view Allows rendered content to be shown in listings and used in searches. Also prevented angular tags in content being parsed in listings. Fixes #442 --- app/Repos/EntityRepo.php | 19 +++++++++++++++---- resources/views/books/show.blade.php | 4 ++-- resources/views/chapters/show.blade.php | 4 ++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php index 7bc5fc4fc..7865de772 100644 --- a/app/Repos/EntityRepo.php +++ b/app/Repos/EntityRepo.php @@ -571,7 +571,7 @@ class EntityRepo $draftPage->slug = $this->findSuitableSlug('page', $draftPage->name, false, $draftPage->book->id); $draftPage->html = $this->formatHtml($input['html']); - $draftPage->text = strip_tags($draftPage->html); + $draftPage->text = $this->pageToPlainText($draftPage->html); $draftPage->draft = false; $draftPage->revision_count = 1; @@ -713,6 +713,17 @@ class EntityRepo return $content; } + /** + * Get the plain text version of a page's content. + * @param Page $page + * @return string + */ + public function pageToPlainText(Page $page) + { + $html = $this->renderPage($page); + return strip_tags($html); + } + /** * Get a new draft page instance. * @param Book $book @@ -816,7 +827,7 @@ class EntityRepo $userId = user()->id; $page->fill($input); $page->html = $this->formatHtml($input['html']); - $page->text = strip_tags($page->html); + $page->text = $this->pageToPlainText($page); if (setting('app-editor') !== 'markdown') $page->markdown = ''; $page->updated_by = $userId; $page->revision_count++; @@ -933,7 +944,7 @@ class EntityRepo $revision = $page->revisions()->where('id', '=', $revisionId)->first(); $page->fill($revision->toArray()); $page->slug = $this->findSuitableSlug('page', $page->name, $page->id, $book->id); - $page->text = strip_tags($page->html); + $page->text = $this->pageToPlainText($page->html); $page->updated_by = user()->id; $page->save(); $this->searchService->indexEntity($page); @@ -953,7 +964,7 @@ class EntityRepo if ($page->draft) { $page->fill($data); if (isset($data['html'])) { - $page->text = strip_tags($data['html']); + $page->text = $this->pageToPlainText($data['html']); } $page->save(); return $page; diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index ddbe7a0a4..353018dbc 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -50,7 +50,7 @@ -
+
@@ -112,7 +112,7 @@ @endif
-
+ diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index d4126cbcc..85aa252d1 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -47,7 +47,7 @@
-
+

{{ $chapter->name }}

@@ -116,7 +116,7 @@ @endif
- + From 7f43372dd497f0e9b5f6eaf668ea1e2748ad9a0c Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 22 Jul 2017 14:34:17 +0100 Subject: [PATCH 3/6] Fixed broken code block rendering when using DOMPDF Fixes #427 --- resources/assets/sass/_text.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss index ccef2a70f..2ef4bd16d 100644 --- a/resources/assets/sass/_text.scss +++ b/resources/assets/sass/_text.scss @@ -152,6 +152,14 @@ pre { } } +@media print { + pre { + padding-left: 12px; + } + pre:after { + display: none; + } +} blockquote { display: block; From 433cb9b3b2b85c371818495b5e636daff5c49457 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 22 Jul 2017 15:20:36 +0100 Subject: [PATCH 4/6] Improved breadcrumb responsiveness Closes #426 --- resources/assets/sass/_header.scss | 22 +++++++++++++++++++++- resources/views/books/show.blade.php | 4 ++-- resources/views/chapters/show.blade.php | 4 ++-- resources/views/pages/show.blade.php | 4 ++-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss index 16ed75545..ae8dd3ff5 100644 --- a/resources/assets/sass/_header.scss +++ b/resources/assets/sass/_header.scss @@ -142,7 +142,6 @@ form.search-box { color: #aaa; padding: 0 $-xs; } - .faded { a, button, span, span > div { color: #666; @@ -178,6 +177,8 @@ form.search-box { padding-left: 0; } } + + .action-buttons .dropdown-container:last-child a { padding-right: 0; padding-left: $-s; @@ -196,6 +197,25 @@ form.search-box { } } +@include smaller-than($m) { + .breadcrumbs .text-button, .action-buttons .text-button { + padding: $-s $-xs; + } + .action-buttons .dropdown-container:last-child a { + padding-left: $-xs; + } + .breadcrumbs .text-button { + font-size: 0; + } + .breadcrumbs a i { + font-size: $fs-m; + padding-right: 0; + } + .breadcrumbs span.sep { + padding: 0 $-xxs; + } +} + .nav-tabs { text-align: center; a, .tab-item { diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index 353018dbc..0e3bd4e17 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -5,10 +5,10 @@
-
+
@include('books._breadcrumbs', ['book' => $book])
-
+
{{ trans('entities.export') }}
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index 85aa252d1..9ebd8d9c4 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -5,10 +5,10 @@
-
+
@include('chapters._breadcrumbs', ['chapter' => $chapter])
-
+
{{ trans('entities.export') }}
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 6b2dc3c23..221ed4476 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -5,10 +5,10 @@
-
+
@include('pages._breadcrumbs', ['page' => $page])
-
+
{{ trans('entities.export') }}
From 6bcd89acf76163ca09c95903f27ceed925718061 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 22 Jul 2017 15:54:17 +0100 Subject: [PATCH 5/6] Moved utf8mb4 migration to command instead of migration To prevent errors upon migration. Command generates out the SQL syntax to make the change instead so the upgrade can be done manually. In reference to #425 --- .../Commands/UpgradeDatabaseEncoding.php | 57 +++++++++++++++++++ app/Console/Kernel.php | 3 +- ...02_152834_update_db_encoding_to_ut8mb4.php | 26 ++------- 3 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 app/Console/Commands/UpgradeDatabaseEncoding.php diff --git a/app/Console/Commands/UpgradeDatabaseEncoding.php b/app/Console/Commands/UpgradeDatabaseEncoding.php new file mode 100644 index 000000000..dbdf778e8 --- /dev/null +++ b/app/Console/Commands/UpgradeDatabaseEncoding.php @@ -0,0 +1,57 @@ +option('database') !== null) { + DB::setDefaultConnection($this->option('database')); + } + + $database = DB::getDatabaseName(); + $tables = DB::select('SHOW TABLES'); + $this->line('ALTER DATABASE `'.$database.'` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); + $this->line('USE `'.$database.'`;'); + $key = 'Tables_in_' . $database; + foreach ($tables as $table) { + $tableName = $table->$key; + $this->line('ALTER TABLE `'.$tableName.'` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); + } + + DB::setDefaultConnection($connection); + } +} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 4fa0b3c80..af9f5fd46 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -15,7 +15,8 @@ class Kernel extends ConsoleKernel Commands\ClearActivity::class, Commands\ClearRevisions::class, Commands\RegeneratePermissions::class, - Commands\RegenerateSearch::class + Commands\RegenerateSearch::class, + Commands\UpgradeDatabaseEncoding::class ]; /** diff --git a/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php b/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php index 550c95826..259da0720 100644 --- a/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php +++ b/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php @@ -1,7 +1,5 @@ setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false); - $pdo->exec('ALTER DATABASE `'.$database.'` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci'); - $key = 'Tables_in_' . $database; - foreach ($tables as $table) { - $tableName = $table->$key; - $pdo->exec('ALTER TABLE `'.$tableName.'` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci'); - } + // Migration removed due to issues during live migration. + // Instead you can run the command `artisan bookstack:db-utf8mb4-syntax` + // which will generate out the SQL request to upgrade your DB to utf8mb4. } /** @@ -32,15 +23,6 @@ class UpdateDbEncodingToUt8mb4 extends Migration */ public function down() { - $database = DB::getDatabaseName(); - $tables = DB::select('SHOW TABLES'); - $pdo = DB::getPdo(); - $pdo->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false); - $pdo->exec('ALTER DATABASE `'.$database.'` CHARACTER SET utf8 COLLATE utf8_unicode_ci'); - $key = 'Tables_in_' . $database; - foreach ($tables as $table) { - $tableName = $table->$key; - $pdo->exec('ALTER TABLE `'.$tableName.'` CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci'); - } + // } } From 2704962277422818c850987142f5e2e0a7326670 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 22 Jul 2017 16:19:17 +0100 Subject: [PATCH 6/6] Updated utfmb4 upgrade command --- app/Console/Commands/UpgradeDatabaseEncoding.php | 2 +- .../2017_07_02_152834_update_db_encoding_to_ut8mb4.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/UpgradeDatabaseEncoding.php b/app/Console/Commands/UpgradeDatabaseEncoding.php index dbdf778e8..a17fc9523 100644 --- a/app/Console/Commands/UpgradeDatabaseEncoding.php +++ b/app/Console/Commands/UpgradeDatabaseEncoding.php @@ -12,7 +12,7 @@ class UpgradeDatabaseEncoding extends Command * * @var string */ - protected $signature = 'bookstack:db-utf8mb4-syntax {--database= : The database connection to use.}'; + protected $signature = 'bookstack:db-utf8mb4 {--database= : The database connection to use.}'; /** * The console command description. diff --git a/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php b/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php index 259da0720..5681013ad 100644 --- a/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php +++ b/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php @@ -12,7 +12,7 @@ class UpdateDbEncodingToUt8mb4 extends Migration public function up() { // Migration removed due to issues during live migration. - // Instead you can run the command `artisan bookstack:db-utf8mb4-syntax` + // Instead you can run the command `artisan bookstack:db-utf8mb4` // which will generate out the SQL request to upgrade your DB to utf8mb4. }