From 6bc72e157a346e708cee17d7c51560a0fdd084ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Youn=C3=A8s=20EL=20BIACHE?= Date: Thu, 7 Jul 2016 20:53:43 +0200 Subject: [PATCH 01/24] edit summary --- app/PageRevision.php | 2 +- app/Repos/PageRepo.php | 5 +-- ...7_181521_add_summary_to_page_revisions.php | 31 +++++++++++++++++++ resources/assets/sass/_grid.scss | 3 ++ resources/assets/sass/_pages.scss | 3 ++ resources/views/pages/form.blade.php | 2 +- resources/views/pages/revisions.blade.php | 12 ++++--- 7 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 database/migrations/2016_07_07_181521_add_summary_to_page_revisions.php diff --git a/app/PageRevision.php b/app/PageRevision.php index dae74cd0f..1ffd63dbd 100644 --- a/app/PageRevision.php +++ b/app/PageRevision.php @@ -3,7 +3,7 @@ class PageRevision extends Model { - protected $fillable = ['name', 'html', 'text', 'markdown']; + protected $fillable = ['name', 'html', 'text', 'markdown', 'summary']; /** * Get the user that created the page revision diff --git a/app/Repos/PageRepo.php b/app/Repos/PageRepo.php index de050e1c7..515d18bd9 100644 --- a/app/Repos/PageRepo.php +++ b/app/Repos/PageRepo.php @@ -310,7 +310,7 @@ class PageRepo extends EntityRepo { // Save a revision before updating if ($page->html !== $input['html'] || $page->name !== $input['name']) { - $this->saveRevision($page); + $this->saveRevision($page, $input['summary']); } // Prevent slug being updated if no name change @@ -362,7 +362,7 @@ class PageRepo extends EntityRepo * @param Page $page * @return $this */ - public function saveRevision(Page $page) + public function saveRevision(Page $page, $summary = null) { $revision = $this->pageRevision->fill($page->toArray()); if (setting('app-editor') !== 'markdown') $revision->markdown = ''; @@ -372,6 +372,7 @@ class PageRepo extends EntityRepo $revision->created_by = auth()->user()->id; $revision->created_at = $page->updated_at; $revision->type = 'version'; + $revision->summary = $summary; $revision->save(); // Clear old revisions if ($this->pageRevision->where('page_id', '=', $page->id)->count() > 50) { diff --git a/database/migrations/2016_07_07_181521_add_summary_to_page_revisions.php b/database/migrations/2016_07_07_181521_add_summary_to_page_revisions.php new file mode 100644 index 000000000..c618877ef --- /dev/null +++ b/database/migrations/2016_07_07_181521_add_summary_to_page_revisions.php @@ -0,0 +1,31 @@ +string('summary')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('page_revisions', function ($table) { + $table->dropColumn('summary'); + }); + } +} diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss index 2fe1ad113..1a1321e58 100644 --- a/resources/assets/sass/_grid.scss +++ b/resources/assets/sass/_grid.scss @@ -39,6 +39,9 @@ div[class^="col-"] img { &.fluid { max-width: 100%; } + &.medium { + max-width: 992px; + } &.small { max-width: 840px; } diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss index 49b701dda..1d203ef78 100644 --- a/resources/assets/sass/_pages.scss +++ b/resources/assets/sass/_pages.scss @@ -18,6 +18,9 @@ flex: 1; flex-direction: column; } + #summary-input { + width: 140px; + } } .page-style.editor { diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php index 4196e946f..c2bdc6692 100644 --- a/resources/views/pages/form.blade.php +++ b/resources/views/pages/form.blade.php @@ -27,8 +27,8 @@
- +
diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php index a73f16a4f..24e91b366 100644 --- a/resources/views/pages/revisions.blade.php +++ b/resources/views/pages/revisions.blade.php @@ -17,17 +17,18 @@ -
+

Page Revisions For "{{ $page->name }}"

@if(count($page->revisions) > 0) - - - - + + + + + @foreach($page->revisions as $revision) @@ -39,6 +40,7 @@ +
NameCreated ByRevision DateActionsNameCreated ByRevision DateSummaryActions
@if($revision->createdBy) {{$revision->createdBy->name}} @else Deleted User @endif {{$revision->created_at->format('jS F, Y H:i:s')}}
({{$revision->created_at->diffForHumans()}})		{{$revision->summary}} Preview  |  From ec30864ce5ecef84b5ffd284734b6362aac564c8 Mon Sep 17 00:00:00 2001 From: Younes El Biache Date: Sat, 9 Jul 2016 14:33:37 +0200 Subject: [PATCH 02/24] shorter amazon S3 url --- app/Services/ImageService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php index dd965c90f..331a407c3 100644 --- a/app/Services/ImageService.php +++ b/app/Services/ImageService.php @@ -259,7 +259,7 @@ class ImageService // Get the standard public s3 url if s3 is set as storage type if ($storageUrl == false && config('filesystems.default') === 's3') { $storageDetails = config('filesystems.disks.s3'); - $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket']; + $storageUrl = 'https://' . $storageDetails['bucket'] . '.s3.amazonaws.com'; } $this->storageUrl = $storageUrl; @@ -269,4 +269,4 @@ class ImageService } -} \ No newline at end of file +} From 32a06f119b1c620863acc588b7e90810286737ef Mon Sep 17 00:00:00 2001 From: Younes El Biache Date: Sat, 9 Jul 2016 15:26:53 +0200 Subject: [PATCH 03/24] set uploaded files public visibliity (relevant for S3 storage) --- app/Services/ImageService.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php index dd965c90f..274172f0f 100644 --- a/app/Services/ImageService.php +++ b/app/Services/ImageService.php @@ -95,6 +95,7 @@ class ImageService try { $storage->put($fullPath, $imageData); + $storage->setVisibility($fullPath, 'public'); } catch (Exception $e) { throw new ImageUploadException('Image Path ' . $fullPath . ' is not writable by the server.'); } @@ -167,6 +168,7 @@ class ImageService $thumbData = (string)$thumb->encode(); $storage->put($thumbFilePath, $thumbData); + $storage->setVisibility($thumbFilePath, 'public'); $this->cache->put('images-' . $image->id . '-' . $thumbFilePath, $thumbFilePath, 60 * 72); return $this->getPublicUrl($thumbFilePath); @@ -269,4 +271,4 @@ class ImageService } -} \ No newline at end of file +} From c44314def3f84e449c92357d178599bb474706ae Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 10 Jul 2016 10:28:05 +0100 Subject: [PATCH 04/24] Added check for s3 bucket name to choose shortest url --- app/Services/ImageService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php index f645a06a5..c10e989f9 100644 --- a/app/Services/ImageService.php +++ b/app/Services/ImageService.php @@ -259,9 +259,15 @@ class ImageService $storageUrl = config('filesystems.url'); // Get the standard public s3 url if s3 is set as storage type + // Uses the nice, short URL if bucket name has no periods in otherwise the longer + // region-based url will be used to prevent http issues. if ($storageUrl == false && config('filesystems.default') === 's3') { $storageDetails = config('filesystems.disks.s3'); - $storageUrl = 'https://' . $storageDetails['bucket'] . '.s3.amazonaws.com'; + if (strpos($storageDetails['bucket'], '.') === false) { + $storageUrl = 'https://' . $storageDetails['bucket'] . '.s3.amazonaws.com'; + } else { + $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket']; + } } $this->storageUrl = $storageUrl; From 7215392784bcbb6eca45301ed89ea04965785d27 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 10 Jul 2016 12:12:52 +0100 Subject: [PATCH 05/24] Changed when revisions are saved and update changelog input Revisions are now saved when te page content is originally saved whereas before they were saved on the next update to the page. --- app/Repos/PageRepo.php | 19 ++++++---- resources/assets/js/directives.js | 15 +++++++- resources/assets/sass/_header.scss | 1 + resources/assets/sass/_lists.scss | 9 +++-- resources/assets/sass/_pages.scss | 3 -- resources/views/pages/form.blade.php | 17 +++++++-- resources/views/pages/restrictions.blade.php | 2 +- resources/views/pages/revisions.blade.php | 38 +++++++++++++------- 8 files changed, 73 insertions(+), 31 deletions(-) diff --git a/app/Repos/PageRepo.php b/app/Repos/PageRepo.php index 515d18bd9..d3a060363 100644 --- a/app/Repos/PageRepo.php +++ b/app/Repos/PageRepo.php @@ -147,7 +147,7 @@ class PageRepo extends EntityRepo $draftPage->fill($input); // Save page tags if present - if(isset($input['tags'])) { + if (isset($input['tags'])) { $this->tagRepo->saveTagsToEntity($draftPage, $input['tags']); } @@ -308,10 +308,9 @@ class PageRepo extends EntityRepo */ public function updatePage(Page $page, $book_id, $input) { - // Save a revision before updating - if ($page->html !== $input['html'] || $page->name !== $input['name']) { - $this->saveRevision($page, $input['summary']); - } + // Hold the old details to compare later + $oldHtml = $page->html; + $oldName = $page->name; // Prevent slug being updated if no name change if ($page->name !== $input['name']) { @@ -319,7 +318,7 @@ class PageRepo extends EntityRepo } // Save page tags if present - if(isset($input['tags'])) { + if (isset($input['tags'])) { $this->tagRepo->saveTagsToEntity($page, $input['tags']); } @@ -335,6 +334,11 @@ class PageRepo extends EntityRepo // Remove all update drafts for this user & page. $this->userUpdateDraftsQuery($page, $userId)->delete(); + // Save a revision after updating + if ($oldHtml !== $input['html'] || $oldName !== $input['name'] || $input['summary'] !== null) { + $this->saveRevision($page, $input['summary']); + } + return $page; } @@ -360,6 +364,7 @@ class PageRepo extends EntityRepo /** * Saves a page revision into the system. * @param Page $page + * @param null|string $summary * @return $this */ public function saveRevision(Page $page, $summary = null) @@ -406,7 +411,7 @@ class PageRepo extends EntityRepo $draft->fill($data); if (setting('app-editor') !== 'markdown') $draft->markdown = ''; - + $draft->save(); return $draft; } diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js index 0119ded42..e50f5c6dd 100644 --- a/resources/assets/js/directives.js +++ b/resources/assets/js/directives.js @@ -157,9 +157,22 @@ module.exports = function (ngApp, events) { return { restrict: 'A', link: function (scope, element, attrs) { - var menu = element.find('ul'); + const menu = element.find('ul'); element.find('[dropdown-toggle]').on('click', function () { menu.show().addClass('anim menuIn'); + 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'); diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss index e0b1a99cb..12bd17076 100644 --- a/resources/assets/sass/_header.scss +++ b/resources/assets/sass/_header.scss @@ -155,6 +155,7 @@ form.search-box { text-decoration: none; } } + } .faded span.faded-text { diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index 08f00677e..2658c4689 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -375,6 +375,9 @@ ul.pagination { .text-muted { color: #999; } + li.padded { + padding: $-xs $-m; + } a { display: block; padding: $-xs $-m; @@ -384,10 +387,10 @@ ul.pagination { background-color: #EEE; } i { - margin-right: $-m; + margin-right: $-s; padding-right: 0; - display: inline; - width: 22px; + display: inline-block; + width: 16px; } } li.border-bottom { diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss index 1d203ef78..49b701dda 100644 --- a/resources/assets/sass/_pages.scss +++ b/resources/assets/sass/_pages.scss @@ -18,9 +18,6 @@ flex: 1; flex-direction: column; } - #summary-input { - width: 140px; - } } .page-style.editor { diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php index c2bdc6692..a5558f8e4 100644 --- a/resources/views/pages/form.blade.php +++ b/resources/views/pages/form.blade.php @@ -22,14 +22,25 @@
  • Delete Draft
    • +
  • + Discard Draft +
    • - - - +
    + @{{(changeSummary | limitTo:16) + (changeSummary.length>16?'...':'') || 'Set Changelog'}} +
      +
    • +

      Enter a brief description of the changes you've made

      + +
      • +
    +
    + +
    diff --git a/resources/views/pages/restrictions.blade.php b/resources/views/pages/restrictions.blade.php index 09eb8a65b..8dccc021e 100644 --- a/resources/views/pages/restrictions.blade.php +++ b/resources/views/pages/restrictions.blade.php @@ -16,7 +16,7 @@ @endif » - {{ $page->getShortName() }} + {{ $page->getShortName() }} diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php index 24e91b366..d92b97d62 100644 --- a/resources/views/pages/revisions.blade.php +++ b/resources/views/pages/revisions.blade.php @@ -5,32 +5,40 @@
    -
    +
    - Back to page + {{ $page->book->getShortName() }} + @if($page->hasChapter()) + » + + + {{$page->chapter->getShortName()}} + + @endif + » + {{ $page->getShortName() }}
    -
    -
    -
    + +

    Page Revisions For "{{ $page->name }}"

    @if(count($page->revisions) > 0) - + - + - @foreach($page->revisions as $revision) + @foreach($page->revisions as $index => $revision) - + @if ($index !== 0) + + @else + + @endif @endforeach
    NameName Created By Revision DateSummaryChangelog Actions
    {{$revision->name}} @@ -41,11 +49,15 @@ @if($revision->createdBy) {{$revision->createdBy->name}} @else Deleted User @endif {{$revision->created_at->format('jS F, Y H:i:s')}}
    ({{$revision->created_at->diffForHumans()}})    		 {{$revision->summary}} - Preview -  |  - Restore - + Preview +  |  + Restore + Current Version
    From 3fd82200ccf325b0052e3c6298d9db79ed45f090 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 12 Jul 2016 21:11:48 +0100 Subject: [PATCH 06/24] Added WYSIWYG editor shortcuts --- resources/assets/js/pages/page-form.js | 104 ++++++++++++++----------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js index 611d2e782..b2d5f0c5c 100644 --- a/resources/assets/js/pages/page-form.js +++ b/resources/assets/js/pages/page-form.js @@ -1,3 +1,60 @@ +"use strict"; + +function editorPaste(e) { + if (!e.clipboardData) return + var items = e.clipboardData.items; + if (!items) return; + for (var i = 0; i < items.length; i++) { + if (items[i].type.indexOf("image") !== -1) { + + var file = items[i].getAsFile(); + var formData = new FormData(); + var ext = 'png'; + var xhr = new XMLHttpRequest(); + + if (file.name) { + var fileNameMatches = file.name.match(/\.(.+)$/); + if (fileNameMatches) { + ext = fileNameMatches[1]; + } + } + + var id = "image-" + Math.random().toString(16).slice(2); + editor.execCommand('mceInsertContent', false, ''); + + var remoteFilename = "image-" + Date.now() + "." + ext; + formData.append('file', file, remoteFilename); + formData.append('_token', document.querySelector('meta[name="token"]').getAttribute('content')); + + xhr.open('POST', '/images/gallery/upload'); + xhr.onload = function () { + if (xhr.status === 200 || xhr.status === 201) { + var result = JSON.parse(xhr.responseText); + editor.dom.setAttrib(id, 'src', result.url); + } else { + console.log('An error occured uploading the image'); + console.log(xhr.responseText); + editor.dom.remove(id); + } + }; + xhr.send(formData); + } + } +} + +function registerEditorShortcuts(editor) { + // Headers + for (let i = 1; i < 5; i++) { + editor.addShortcut('ctrl+' + i, '', ['FormatBlock', false, 'h' + i]); + } + + // Other block shortcuts + editor.addShortcut('ctrl+q', '', ['FormatBlock', false, 'blockquote']); + editor.addShortcut('ctrl+d', '', ['FormatBlock', false, 'p']); + editor.addShortcut('ctrl+e', '', ['FormatBlock', false, 'pre']); + editor.addShortcut('ctrl+s', '', ['FormatBlock', false, 'code']); +} + var mceOptions = module.exports = { selector: '#html-editor', content_css: [ @@ -66,6 +123,8 @@ var mceOptions = module.exports = { mceOptions.extraSetups[i](editor); } + registerEditorShortcuts(editor); + (function () { var wrap; @@ -122,49 +181,6 @@ var mceOptions = module.exports = { }); // Paste image-uploads - editor.on('paste', function (e) { - if (e.clipboardData) { - var items = e.clipboardData.items; - if (items) { - for (var i = 0; i < items.length; i++) { - if (items[i].type.indexOf("image") !== -1) { - - var file = items[i].getAsFile(); - var formData = new FormData(); - var ext = 'png'; - var xhr = new XMLHttpRequest(); - - if (file.name) { - var fileNameMatches = file.name.match(/\.(.+)$/); - if (fileNameMatches) { - ext = fileNameMatches[1]; - } - } - - var id = "image-" + Math.random().toString(16).slice(2); - editor.execCommand('mceInsertContent', false, ''); - - var remoteFilename = "image-" + Date.now() + "." + ext; - formData.append('file', file, remoteFilename); - formData.append('_token', document.querySelector('meta[name="token"]').getAttribute('content')); - - xhr.open('POST', '/images/gallery/upload'); - xhr.onload = function () { - if (xhr.status === 200 || xhr.status === 201) { - var result = JSON.parse(xhr.responseText); - editor.dom.setAttrib(id, 'src', result.url); - } else { - console.log('An error occured uploading the image'); - console.log(xhr.responseText); - editor.dom.remove(id); - } - }; - xhr.send(formData); - } - } - } - - } - }); + editor.on('paste', editorPaste); } }; \ No newline at end of file From 50a5d3c546b3554bbe9caf0617b9f82440cba108 Mon Sep 17 00:00:00 2001 From: Nick Walke Date: Thu, 21 Jul 2016 10:04:06 -0500 Subject: [PATCH 07/24] Added issue template --- .github/ISSUE_TEMPLATE | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE new file mode 100644 index 000000000..4f9f4c480 --- /dev/null +++ b/.github/ISSUE_TEMPLATE @@ -0,0 +1,11 @@ +### For Feature Requests +Desired Feature: + +### For Bug Reports +PHP Version: + +MySQL Version: + +Expected Behavior: + +Actual Behavior: From 547e117760b3df5607d665f9609aa629018f3443 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 26 Jul 2016 17:46:09 +0100 Subject: [PATCH 08/24] Changed issue template to use md extension --- .github/{ISSUE_TEMPLATE => ISSUE_TEMPLATE.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ISSUE_TEMPLATE => ISSUE_TEMPLATE.md} (100%) diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE.md similarity index 100% rename from .github/ISSUE_TEMPLATE rename to .github/ISSUE_TEMPLATE.md From d05e85efa9e64019dd937c043fbd56b085efb988 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 26 Jul 2016 18:03:10 +0100 Subject: [PATCH 09/24] Fixed back-to-top button on firefox. Fixes #153. --- resources/assets/js/global.js | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index 44562abd0..eeb1e4ea7 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -10,9 +10,12 @@ require('angular-ui-sortable'); var ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize', 'ui.sortable']); // Global Event System -var Events = { - listeners: {}, - emit: function (eventName, eventData) { +class Events { + constructor() { + this.listeners = {}; + } + + emit(eventName, eventData) { if (typeof this.listeners[eventName] === 'undefined') return this; var eventsToStart = this.listeners[eventName]; for (let i = 0; i < eventsToStart.length; i++) { @@ -20,14 +23,15 @@ var Events = { event(eventData); } return this; - }, - listen: function (eventName, callback) { + } + + listen(eventName, callback) { if (typeof this.listeners[eventName] === 'undefined') this.listeners[eventName] = []; this.listeners[eventName].push(callback); return this; } }; -window.Events = Events; +window.Events = new Events(); var services = require('./services')(ngApp, Events); var directives = require('./directives')(ngApp, Events); @@ -38,14 +42,15 @@ var controllers = require('./controllers')(ngApp, Events); // Smooth scrolling jQuery.fn.smoothScrollTo = function () { if (this.length === 0) return; - $('body').animate({ + let scrollElem = document.documentElement.scrollTop === 0 ? document.body : document.documentElement; + $(scrollElem).animate({ scrollTop: this.offset().top - 60 // Adjust to change final scroll position top margin }, 800); // Adjust to change animations speed (ms) return this; }; // Making contains text expression not worry about casing -$.expr[":"].contains = $.expr.createPseudo(function (arg) { +jQuery.expr[":"].contains = $.expr.createPseudo(function (arg) { return function (elem) { return $(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0; }; @@ -95,13 +100,14 @@ $(function () { var scrollTop = document.getElementById('back-to-top'); var scrollTopBreakpoint = 1200; window.addEventListener('scroll', function() { - if (!scrollTopShowing && document.body.scrollTop > scrollTopBreakpoint) { + let scrollTopPos = document.documentElement.scrollTop || document.body.scrollTop || 0; + if (!scrollTopShowing && scrollTopPos > scrollTopBreakpoint) { scrollTop.style.display = 'block'; scrollTopShowing = true; setTimeout(() => { scrollTop.style.opacity = 0.4; }, 1); - } else if (scrollTopShowing && document.body.scrollTop < scrollTopBreakpoint) { + } else if (scrollTopShowing && scrollTopPos < scrollTopBreakpoint) { scrollTop.style.opacity = 0; scrollTopShowing = false; setTimeout(() => { From 42976ca48c8de04726e62356f76f0bbb77b2ab15 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 26 Jul 2016 18:16:40 +0100 Subject: [PATCH 10/24] Fixed revision-based redirect on new pages --- app/Repos/PageRepo.php | 2 ++ tests/Entity/EntityTest.php | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Repos/PageRepo.php b/app/Repos/PageRepo.php index d3a060363..d3b71cebd 100644 --- a/app/Repos/PageRepo.php +++ b/app/Repos/PageRepo.php @@ -157,6 +157,8 @@ class PageRepo extends EntityRepo $draftPage->draft = false; $draftPage->save(); + $this->saveRevision($draftPage, 'Initial Publish'); + return $draftPage; } diff --git a/tests/Entity/EntityTest.php b/tests/Entity/EntityTest.php index 3bf6a3f2a..8c0c286a6 100644 --- a/tests/Entity/EntityTest.php +++ b/tests/Entity/EntityTest.php @@ -216,13 +216,24 @@ class EntityTest extends TestCase public function test_old_page_slugs_redirect_to_new_pages() { - $page = \BookStack\Page::all()->first(); + $page = \BookStack\Page::first(); $pageUrl = $page->getUrl(); $newPageUrl = '/books/' . $page->book->slug . '/page/super-test-page'; + // Need to save twice since revisions are not generated in seeder. $this->asAdmin()->visit($pageUrl) + ->clickInElement('#content', 'Edit') + ->type('super test', '#name') + ->press('Save Page'); + + $page = \BookStack\Page::first(); + $pageUrl = $page->getUrl(); + + // Second Save + $this->visit($pageUrl) ->clickInElement('#content', 'Edit') ->type('super test page', '#name') ->press('Save Page') + // Check redirect ->seePageIs($newPageUrl) ->visit($pageUrl) ->seePageIs($newPageUrl); From 632ecc668ffe3e120a9bcc3d872dfd89be080629 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Aug 2016 15:07:45 +0100 Subject: [PATCH 11/24] Applied baseUrl to login redirect --- app/Http/Middleware/Authenticate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index ee5144e6c..372f30bf6 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -40,7 +40,7 @@ class Authenticate if ($request->ajax()) { return response('Unauthorized.', 401); } else { - return redirect()->guest('/login'); + return redirect()->guest(baseUrl('/login')); } } From f2ceba978a4e5da4fc33e5678d7675a842c71526 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Thu, 25 Aug 2016 16:47:25 +0100 Subject: [PATCH 12/24] Removed animation from page content. Prevents issues with browsers that do not support animaton-fill-direction. Fixes #173. --- resources/views/pages/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 9d6b74a03..2e6e35476 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -58,7 +58,7 @@
    -
    +
    From f83de5f8342ca2038371bcb2d0545014a37e0508 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Thu, 25 Aug 2016 17:17:26 +0100 Subject: [PATCH 13/24] Fixed single word quoted search terms Fixes #170 --- app/Entity.php | 5 +++-- app/Repos/EntityRepo.php | 11 ++++++----- tests/Entity/EntitySearchTest.php | 8 ++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/Entity.php b/app/Entity.php index 1342c2997..496d20a33 100644 --- a/app/Entity.php +++ b/app/Entity.php @@ -167,7 +167,8 @@ class Entity extends Ownable foreach ($terms as $key => $term) { $term = htmlentities($term, ENT_QUOTES); $term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term); - if (preg_match('/\s/', $term)) { + if (preg_match('/".*?"/', $term)) { + $term = str_replace('"', '', $term); $exactTerms[] = '%' . $term . '%'; $term = '"' . $term . '"'; } else { @@ -206,5 +207,5 @@ class Entity extends Ownable return $search->orderBy($orderBy, 'desc'); } - + } diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php index 012a64967..28f4c0ae8 100644 --- a/app/Repos/EntityRepo.php +++ b/app/Repos/EntityRepo.php @@ -168,15 +168,16 @@ class EntityRepo * @param $termString * @return array */ - protected function prepareSearchTerms($termString) + public function prepareSearchTerms($termString) { $termString = $this->cleanSearchTermString($termString); - preg_match_all('/"(.*?)"/', $termString, $matches); + preg_match_all('/(".*?")/', $termString, $matches); + $terms = []; if (count($matches[1]) > 0) { - $terms = $matches[1]; + foreach ($matches[1] as $match) { + $terms[] = $match; + } $termString = trim(preg_replace('/"(.*?)"/', '', $termString)); - } else { - $terms = []; } if (!empty($termString)) $terms = array_merge($terms, explode(' ', $termString)); return $terms; diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php index a9d9bc047..8adfd35a3 100644 --- a/tests/Entity/EntitySearchTest.php +++ b/tests/Entity/EntitySearchTest.php @@ -76,6 +76,14 @@ class EntitySearchTest extends TestCase ->see('Chapter Search Results')->seeInElement('.entity-list', $chapter->name); } + public function test_search_quote_term_preparation() + { + $termString = '"192" cat "dog hat"'; + $repo = $this->app[\BookStack\Repos\EntityRepo::class]; + $preparedTerms = $repo->prepareSearchTerms($termString); + $this->assertTrue($preparedTerms === ['"192"','"dog hat"', 'cat']); + } + public function test_books_search_listing() { $book = \BookStack\Book::all()->last(); From 7973412c297720daa94d98980960d2b4ba3c9d17 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 26 Aug 2016 20:20:58 +0100 Subject: [PATCH 14/24] Improved sort efficiency by a factor of 10 Fixes #145 --- app/Http/Controllers/BookController.php | 33 +++++--- app/Http/Controllers/ChapterController.php | 2 +- app/Repos/BookRepo.php | 10 +-- app/Repos/ChapterRepo.php | 14 ++-- app/Repos/EntityRepo.php | 10 +++ app/Services/PermissionService.php | 95 +++++++++++++++++++--- resources/views/books/sort.blade.php | 35 +++++--- 7 files changed, 152 insertions(+), 47 deletions(-) diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php index 5b97fbdaf..8ada59433 100644 --- a/app/Http/Controllers/BookController.php +++ b/app/Http/Controllers/BookController.php @@ -3,7 +3,6 @@ use Activity; use BookStack\Repos\UserRepo; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use BookStack\Http\Requests; use BookStack\Repos\BookRepo; use BookStack\Repos\ChapterRepo; @@ -180,21 +179,31 @@ class BookController extends Controller return redirect($book->getUrl()); } - $sortedBooks = []; // Sort pages and chapters + $sortedBooks = []; + $updatedModels = collect(); $sortMap = json_decode($request->get('sort-tree')); $defaultBookId = $book->id; - foreach ($sortMap as $index => $bookChild) { - $id = $bookChild->id; + + // Loop through contents of provided map and update entities accordingly + foreach ($sortMap as $bookChild) { + $priority = $bookChild->sort; + $id = intval($bookChild->id); $isPage = $bookChild->type == 'page'; - $bookId = $this->bookRepo->exists($bookChild->book) ? $bookChild->book : $defaultBookId; + $bookId = $this->bookRepo->exists($bookChild->book) ? intval($bookChild->book) : $defaultBookId; + $chapterId = ($isPage && $bookChild->parentChapter === false) ? 0 : intval($bookChild->parentChapter); $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id); - $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model); - $model->priority = $index; - if ($isPage) { - $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter; + + // Update models only if there's a change in parent chain or ordering. + if ($model->priority !== $priority || $model->book_id !== $bookId || ($isPage && $model->chapter_id !== $chapterId)) { + $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model); + $model->priority = $priority; + if ($isPage) $model->chapter_id = $chapterId; + $model->save(); + $updatedModels->push($model); } - $model->save(); + + // Store involved books to be sorted later if (!in_array($bookId, $sortedBooks)) { $sortedBooks[] = $bookId; } @@ -203,10 +212,12 @@ class BookController extends Controller // Add activity for books foreach ($sortedBooks as $bookId) { $updatedBook = $this->bookRepo->getById($bookId); - $this->bookRepo->updateBookPermissions($updatedBook); Activity::add($updatedBook, 'book_sort', $updatedBook->id); } + // Update permissions on changed models + $this->bookRepo->buildJointPermissions($updatedModels); + return redirect($book->getUrl()); } diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php index 3c9050bf6..03ec2c110 100644 --- a/app/Http/Controllers/ChapterController.php +++ b/app/Http/Controllers/ChapterController.php @@ -204,7 +204,7 @@ class ChapterController extends Controller return redirect()->back(); } - $this->chapterRepo->changeBook($parent->id, $chapter); + $this->chapterRepo->changeBook($parent->id, $chapter, true); Activity::add($chapter, 'chapter_move', $chapter->book->id); session()->flash('success', sprintf('Chapter moved to "%s"', $parent->name)); diff --git a/app/Repos/BookRepo.php b/app/Repos/BookRepo.php index 58816d738..fdc4dd8d4 100644 --- a/app/Repos/BookRepo.php +++ b/app/Repos/BookRepo.php @@ -2,6 +2,7 @@ use Alpha\B; use BookStack\Exceptions\NotFoundException; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Str; use BookStack\Book; use Views; @@ -173,15 +174,6 @@ class BookRepo extends EntityRepo $book->delete(); } - /** - * Alias method to update the book jointPermissions in the PermissionService. - * @param Book $book - */ - public function updateBookPermissions(Book $book) - { - $this->permissionService->buildJointPermissionsForEntity($book); - } - /** * Get the next child element priority. * @param Book $book diff --git a/app/Repos/ChapterRepo.php b/app/Repos/ChapterRepo.php index 1a8cbdf0f..c12a9f0f2 100644 --- a/app/Repos/ChapterRepo.php +++ b/app/Repos/ChapterRepo.php @@ -195,11 +195,12 @@ class ChapterRepo extends EntityRepo /** * Changes the book relation of this chapter. - * @param $bookId + * @param $bookId * @param Chapter $chapter + * @param bool $rebuildPermissions * @return Chapter */ - public function changeBook($bookId, Chapter $chapter) + public function changeBook($bookId, Chapter $chapter, $rebuildPermissions = false) { $chapter->book_id = $bookId; // Update related activity @@ -213,9 +214,12 @@ class ChapterRepo extends EntityRepo foreach ($chapter->pages as $page) { $this->pageRepo->changeBook($bookId, $page); } - // Update permissions - $chapter->load('book'); - $this->permissionService->buildJointPermissionsForEntity($chapter->book); + + // Update permissions if applicable + if ($rebuildPermissions) { + $chapter->load('book'); + $this->permissionService->buildJointPermissionsForEntity($chapter->book); + } return $chapter; } diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php index 28f4c0ae8..c94601738 100644 --- a/app/Repos/EntityRepo.php +++ b/app/Repos/EntityRepo.php @@ -6,6 +6,7 @@ use BookStack\Entity; use BookStack\Page; use BookStack\Services\PermissionService; use BookStack\User; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; class EntityRepo @@ -260,6 +261,15 @@ class EntityRepo return $query; } + /** + * Alias method to update the book jointPermissions in the PermissionService. + * @param Collection $collection collection on entities + */ + public function buildJointPermissions(Collection $collection) + { + $this->permissionService->buildJointPermissionsForEntities($collection); + } + } diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php index 0fffe60f2..cee074cd7 100644 --- a/app/Services/PermissionService.php +++ b/app/Services/PermissionService.php @@ -8,7 +8,7 @@ use BookStack\Ownable; use BookStack\Page; use BookStack\Role; use BookStack\User; -use Illuminate\Database\Eloquent\Collection; +use Illuminate\Support\Collection; class PermissionService { @@ -25,6 +25,8 @@ class PermissionService protected $jointPermission; protected $role; + protected $entityCache; + /** * PermissionService constructor. * @param JointPermission $jointPermission @@ -48,6 +50,57 @@ class PermissionService $this->page = $page; } + /** + * Prepare the local entity cache and ensure it's empty + */ + protected function readyEntityCache() + { + $this->entityCache = [ + 'books' => collect(), + 'chapters' => collect() + ]; + } + + /** + * Get a book via ID, Checks local cache + * @param $bookId + * @return Book + */ + protected function getBook($bookId) + { + if (isset($this->entityCache['books']) && $this->entityCache['books']->has($bookId)) { + return $this->entityCache['books']->get($bookId); + } + + $book = $this->book->find($bookId); + if ($book === null) $book = false; + if (isset($this->entityCache['books'])) { + $this->entityCache['books']->put($bookId, $book); + } + + return $book; + } + + /** + * Get a chapter via ID, Checks local cache + * @param $chapterId + * @return Book + */ + protected function getChapter($chapterId) + { + if (isset($this->entityCache['chapters']) && $this->entityCache['chapters']->has($chapterId)) { + return $this->entityCache['chapters']->get($chapterId); + } + + $chapter = $this->chapter->find($chapterId); + if ($chapter === null) $chapter = false; + if (isset($this->entityCache['chapters'])) { + $this->entityCache['chapters']->put($chapterId, $chapter); + } + + return $chapter; + } + /** * Get the roles for the current user; * @return array|bool @@ -76,6 +129,7 @@ class PermissionService public function buildJointPermissions() { $this->jointPermission->truncate(); + $this->readyEntityCache(); // Get all roles (Should be the most limited dimension) $roles = $this->role->with('permissions')->get(); @@ -97,7 +151,7 @@ class PermissionService } /** - * Create the entity jointPermissions for a particular entity. + * Rebuild the entity jointPermissions for a particular entity. * @param Entity $entity */ public function buildJointPermissionsForEntity(Entity $entity) @@ -116,6 +170,17 @@ class PermissionService $this->createManyJointPermissions($entities, $roles); } + /** + * Rebuild the entity jointPermissions for a collection of entities. + * @param Collection $entities + */ + public function buildJointPermissionsForEntities(Collection $entities) + { + $roles = $this->role->with('jointPermissions')->get(); + $this->deleteManyJointPermissionsForEntities($entities); + $this->createManyJointPermissions($entities, $roles); + } + /** * Build the entity jointPermissions for a particular role. * @param Role $role @@ -177,9 +242,14 @@ class PermissionService */ protected function deleteManyJointPermissionsForEntities($entities) { + $query = $this->jointPermission->newQuery(); foreach ($entities as $entity) { - $entity->jointPermissions()->delete(); + $query->orWhere(function($query) use ($entity) { + $query->where('entity_id', '=', $entity->id) + ->where('entity_type', '=', $entity->getMorphClass()); + }); } + $query->delete(); } /** @@ -189,6 +259,7 @@ class PermissionService */ protected function createManyJointPermissions($entities, $roles) { + $this->readyEntityCache(); $jointPermissions = []; foreach ($entities as $entity) { foreach ($roles as $role) { @@ -248,8 +319,9 @@ class PermissionService } elseif ($entity->isA('chapter')) { if (!$entity->restricted) { - $hasExplicitAccessToBook = $entity->book->hasActiveRestriction($role->id, $restrictionAction); - $hasPermissiveAccessToBook = !$entity->book->restricted; + $book = $this->getBook($entity->book_id); + $hasExplicitAccessToBook = $book->hasActiveRestriction($role->id, $restrictionAction); + $hasPermissiveAccessToBook = !$book->restricted; return $this->createJointPermissionDataArray($entity, $role, $action, ($hasExplicitAccessToBook || ($roleHasPermission && $hasPermissiveAccessToBook)), ($hasExplicitAccessToBook || ($roleHasPermissionOwn && $hasPermissiveAccessToBook))); @@ -261,11 +333,14 @@ class PermissionService } elseif ($entity->isA('page')) { if (!$entity->restricted) { - $hasExplicitAccessToBook = $entity->book->hasActiveRestriction($role->id, $restrictionAction); - $hasPermissiveAccessToBook = !$entity->book->restricted; - $hasExplicitAccessToChapter = $entity->chapter && $entity->chapter->hasActiveRestriction($role->id, $restrictionAction); - $hasPermissiveAccessToChapter = $entity->chapter && !$entity->chapter->restricted; - $acknowledgeChapter = ($entity->chapter && $entity->chapter->restricted); + $book = $this->getBook($entity->book_id); + $hasExplicitAccessToBook = $book->hasActiveRestriction($role->id, $restrictionAction); + $hasPermissiveAccessToBook = !$book->restricted; + + $chapter = $this->getChapter($entity->chapter_id); + $hasExplicitAccessToChapter = $chapter && $chapter->hasActiveRestriction($role->id, $restrictionAction); + $hasPermissiveAccessToChapter = $chapter && !$chapter->restricted; + $acknowledgeChapter = ($chapter && $chapter->restricted); $hasExplicitAccessToParents = $acknowledgeChapter ? $hasExplicitAccessToChapter : $hasExplicitAccessToBook; $hasPermissiveAccessToParents = $acknowledgeChapter ? $hasPermissiveAccessToChapter : $hasPermissiveAccessToBook; diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php index 3849dfcfc..984db0ce6 100644 --- a/resources/views/books/sort.blade.php +++ b/resources/views/books/sort.blade.php @@ -50,7 +50,7 @@ var sortableOptions = { group: 'serialization', onDrop: function($item, container, _super) { - var pageMap = buildPageMap(); + var pageMap = buildEntityMap(); $('#sort-tree-input').val(JSON.stringify(pageMap)); _super($item, container); }, @@ -74,29 +74,42 @@ $link.remove(); }); - function buildPageMap() { - var pageMap = []; + /** + * Build up a mapping of entities with their ordering and nesting. + * @returns {Array} + */ + function buildEntityMap() { + var entityMap = []; var $lists = $('.sort-list'); $lists.each(function(listIndex) { var list = $(this); var bookId = list.closest('[data-type="book"]').attr('data-id'); - var $childElements = list.find('[data-type="page"], [data-type="chapter"]'); - $childElements.each(function(childIndex) { + var $directChildren = list.find('> [data-type="page"], > [data-type="chapter"]'); + $directChildren.each(function(directChildIndex) { var $childElem = $(this); var type = $childElem.attr('data-type'); var parentChapter = false; - if(type === 'page' && $childElem.closest('[data-type="chapter"]').length === 1) { - parentChapter = $childElem.closest('[data-type="chapter"]').attr('data-id'); - } - pageMap.push({ - id: $childElem.attr('data-id'), + var childId = $childElem.attr('data-id'); + entityMap.push({ + id: childId, + sort: directChildIndex, parentChapter: parentChapter, type: type, book: bookId }); + $chapterChildren = $childElem.find('[data-type="page"]').each(function(pageIndex) { + var $chapterChild = $(this); + entityMap.push({ + id: $chapterChild.attr('data-id'), + sort: pageIndex, + parentChapter: childId, + type: 'page', + book: bookId + }); + }); }); }); - return pageMap; + return entityMap; } }); From 3f81eba13b1bb23de2c135d6fc404fd76f7b6ce7 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 27 Aug 2016 11:27:23 +0100 Subject: [PATCH 15/24] Updated travis testing to work with new helper configuration (#175) * Updated travis to call phpunit globally rather then booting application first --- .travis.yml | 5 +++-- app/helpers.php | 48 +++++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index bea8d1795..c4d289a53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ php: cache: directories: - - vendor - node_modules - $HOME/.composer/cache @@ -29,8 +28,10 @@ before_script: - composer install --prefer-dist --no-interaction - npm install - ./node_modules/.bin/gulp + - php artisan clear-compiled -n + - php artisan optimize -n - php artisan migrate --force -n --database=mysql_testing - php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing script: - - vendor/bin/phpunit \ No newline at end of file + - phpunit \ No newline at end of file diff --git a/app/helpers.php b/app/helpers.php index e4f9b1b10..d28b1956f 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -2,33 +2,31 @@ use BookStack\Ownable; -if (!function_exists('versioned_asset')) { - /** - * Get the path to a versioned file. - * - * @param string $file - * @return string - * - * @throws \InvalidArgumentException - */ - function versioned_asset($file) - { - static $manifest = null; +/** + * Get the path to a versioned file. + * + * @param string $file + * @return string + * + * @throws \InvalidArgumentException + */ +function versioned_asset($file) +{ + static $manifest = null; - if (is_null($manifest)) { - $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true); - } - - if (isset($manifest[$file])) { - return baseUrl($manifest[$file]); - } - - if (file_exists(public_path($file))) { - return baseUrl($file); - } - - throw new InvalidArgumentException("File {$file} not defined in asset manifest."); + if (is_null($manifest)) { + $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true); } + + if (isset($manifest[$file])) { + return baseUrl($manifest[$file]); + } + + if (file_exists(public_path($file))) { + return baseUrl($file); + } + + throw new InvalidArgumentException("File {$file} not defined in asset manifest."); } /** From 56df64063dcf46166e366ddf7e292b21a07e1003 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 30 Aug 2016 20:05:59 +0100 Subject: [PATCH 16/24] Updated popup design and started integrating link selector Extracted design and base styles from image manager into generic popup classes that can be used by other app components such as the new popup Book/Chapter/Page link selector --- resources/assets/js/controllers.js | 4 +- resources/assets/js/global.js | 14 +- resources/assets/js/pages/page-form.js | 9 + .../{_image-manager.scss => _components.scss} | 77 +++++---- resources/assets/sass/_grid.scss | 4 + resources/assets/sass/styles.scss | 2 +- resources/views/pages/edit.blade.php | 12 ++ .../views/partials/image-manager.blade.php | 154 ++++++++++-------- 8 files changed, 168 insertions(+), 108 deletions(-) rename resources/assets/sass/{_image-manager.scss => _components.scss} (89%) diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js index 9067f6ca4..beb2fe93e 100644 --- a/resources/assets/js/controllers.js +++ b/resources/assets/js/controllers.js @@ -69,7 +69,7 @@ module.exports = function (ngApp, events) { */ function callbackAndHide(returnData) { if (callback) callback(returnData); - $scope.showing = false; + $scope.hide(); } /** @@ -109,6 +109,7 @@ module.exports = function (ngApp, events) { function show(doneCallback) { callback = doneCallback; $scope.showing = true; + $('#image-manager').find('.overlay').css('display', 'flex').hide().fadeIn(240); // Get initial images if they have not yet been loaded in. if (!dataLoaded) { fetchData(); @@ -131,6 +132,7 @@ module.exports = function (ngApp, events) { */ $scope.hide = function () { $scope.showing = false; + $('#image-manager').find('.overlay').fadeOut(240); }; var baseUrl = window.baseUrl('/images/' + $scope.imageType + '/all/'); diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index 3a107afa8..cc868a0ea 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -18,7 +18,7 @@ window.baseUrl = function(path) { var ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize', 'ui.sortable']); // Global Event System -class Events { +class EventManager { constructor() { this.listeners = {}; } @@ -39,12 +39,12 @@ class Events { return this; } }; -window.Events = new Events(); +window.Events = new EventManager(); -var services = require('./services')(ngApp, Events); -var directives = require('./directives')(ngApp, Events); -var controllers = require('./controllers')(ngApp, Events); +var services = require('./services')(ngApp, window.Events); +var directives = require('./directives')(ngApp, window.Events); +var controllers = require('./controllers')(ngApp, window.Events); //Global jQuery Config & Extensions @@ -130,6 +130,10 @@ $(function () { $('.entity-list.compact').find('p').not('.empty-text').slideToggle(240); }); + // Popup close + $('.popup-close').click(function() { + $(this).closest('.overlay').fadeOut(240); + }); }); diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js index 86678a1ba..b733494fa 100644 --- a/resources/assets/js/pages/page-form.js +++ b/resources/assets/js/pages/page-form.js @@ -95,7 +95,12 @@ var mceOptions = module.exports = { alignright: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-right'}, }, file_browser_callback: function (field_name, url, type, win) { + + // Show image manager window.ImageManager.showExternal(function (image) { + + // Set popover link input to image url then fire change event + // to ensure the new value sticks win.document.getElementById(field_name).value = image.url; if ("createEvent" in document) { var evt = document.createEvent("HTMLEvents"); @@ -104,6 +109,8 @@ var mceOptions = module.exports = { } else { win.document.getElementById(field_name).fireEvent("onchange"); } + + // Replace the actively selected content with the linked image var html = ''; html += '' + image.name + ''; html += ''; @@ -119,6 +126,8 @@ var mceOptions = module.exports = { extraSetups: [], setup: function (editor) { + // Run additional setup actions + // Used by the angular side of things for (var i = 0; i < mceOptions.extraSetups.length; i++) { mceOptions.extraSetups[i](editor); } diff --git a/resources/assets/sass/_image-manager.scss b/resources/assets/sass/_components.scss similarity index 89% rename from resources/assets/sass/_image-manager.scss rename to resources/assets/sass/_components.scss index 73b3b59d6..a41277e6f 100644 --- a/resources/assets/sass/_image-manager.scss +++ b/resources/assets/sass/_components.scss @@ -1,5 +1,5 @@ .overlay { - background-color: rgba(0, 0, 0, 0.2); + background-color: rgba(0, 0, 0, 0.333); position: fixed; z-index: 95536; width: 100%; @@ -10,26 +10,56 @@ left: 0; right: 0; bottom: 0; + display: flex; + align-items: center; + justify-content: center; + display: none; } -.image-manager-body { +.popup-body { background-color: #FFF; max-height: 90%; - width: 90%; - height: 90%; + width: 1200px; + height: auto; margin: 2% 5%; border-radius: 4px; box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3); overflow: hidden; - position: fixed; - top: 0; - bottom: 0; - left: 0; z-index: 999; display: flex; - h1, h2, h3 { - font-weight: 300; + flex-direction: column; + &.small { + margin: 2% auto; + width: 800px; + max-width: 90%; } + &:before { + display: flex; + align-self: flex-start; + } +} + +.popup-header { + display: block; + position: relative; + height: 40px; + .popup-close { + position: absolute; + top: 0; + right: 0; + margin: 0; + height: 40px; + border-radius: 0; + box-shadow: none; + } + .popup-title { + color: #FFF; + padding: 8px $-m; + } +} + +.image-manager-body { + min-height: 60vh; } #image-manager .dropzone-container { @@ -37,12 +67,6 @@ border: 3px dashed #DDD; } -.image-manager-bottom { - position: absolute; - bottom: 0; - right: 0; -} - .image-manager-list .image { display: block; position: relative; @@ -103,18 +127,13 @@ .image-manager-sidebar { width: 300px; - height: 100%; margin-left: 1px; - padding: 0 $-l; + padding: $-m $-l; + overflow-y: auto; border-left: 1px solid #DDD; -} - -.image-manager-close { - position: absolute; - top: 0; - right: 0; - margin: 0; - border-radius: 0; + .dropzone-container { + margin-top: $-m; + } } .image-manager-list { @@ -125,7 +144,6 @@ .image-manager-content { display: flex; flex-direction: column; - height: 100%; flex: 1; .container { width: 100%; @@ -141,12 +159,13 @@ * Copyright (c) 2012 Matias Meno */ .dz-message { - font-size: 1.4em; + font-size: 1.2em; + line-height: 1.1; font-style: italic; color: #aaa; text-align: center; cursor: pointer; - padding: $-xl $-m; + padding: $-l $-m; transition: all ease-in-out 120ms; } diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss index 1a1321e58..26cfc25ff 100644 --- a/resources/assets/sass/_grid.scss +++ b/resources/assets/sass/_grid.scss @@ -25,6 +25,10 @@ body.flexbox { } } +.flex-child > div { + flex: 1; +} + /** Rules for all columns */ div[class^="col-"] img { max-width: 100%; diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss index a6c364018..90b452a8e 100644 --- a/resources/assets/sass/styles.scss +++ b/resources/assets/sass/styles.scss @@ -12,7 +12,7 @@ @import "animations"; @import "tinymce"; @import "highlightjs"; -@import "image-manager"; +@import "components"; @import "header"; @import "lists"; @import "pages"; diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index 9fe6a6a19..f470d8d80 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -21,4 +21,16 @@
    @include('partials/image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id]) +
    +
    +
    +
    +
    Entity Select
    + +
    + @include('partials/entity-selector', ['name' => 'entity-selector']) +
    +
    +
    + @stop \ No newline at end of file diff --git a/resources/views/partials/image-manager.blade.php b/resources/views/partials/image-manager.blade.php index 69928e119..1b3fb0cfb 100644 --- a/resources/views/partials/image-manager.blade.php +++ b/resources/views/partials/image-manager.blade.php @@ -1,84 +1,94 @@
    -
    -
    +
    +
    -
    -
    -
    -
    All
    -
    Book
    -
    Page
    +
    +
    Image Select
    + +
    + +
    + +
    +
    +
    +
    All
    +
    Book
    +
    Page
    +
    -
    -
    -
    - - - -
    -
    -
    -
    -
    - -
    - - Uploaded @{{ getDate(image.created_at) | date:'mediumDate' }} +
    +
    + + + +
    +
    +
    +
    +
    + +
    + + Uploaded @{{ getDate(image.created_at) | date:'mediumDate' }} +
    +
    Load More
    -
    Load More
    + +
    +
    + +
    + +
    +
    + + + +
    +
    + + +
    +
    + +
    +

    + This image is used in the pages below, Click delete again to confirm you want to delete + this image. +

    +
      +
    • + +
      • +
    +
    + +
    +
    + +
    + +
    + +
    + + + + +
    +
    + + +
    - - -
    -

    Images

    - -
    - -
    - -
    -
    - - - -
    -
    - - -
    -
    - -
    - -
    -

    - This image is used in the pages below, Click delete again to confirm you want to delete - this image. -

    -
      -
    • - -
      • -
    -
    - -
    - -
    -
    - -
    - -
    - -
    \ No newline at end of file From 5b64358ef1214bf7db6924f76b83f1b8fc088a43 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Thu, 1 Sep 2016 20:36:22 +0100 Subject: [PATCH 17/24] Added link selector interface to WYSIWYG editor --- resources/assets/js/directives.js | 94 +++++++++++++++++++- resources/assets/js/global.js | 5 ++ resources/assets/js/pages/page-form.js | 47 ++++++---- resources/assets/sass/_buttons.scss | 10 +++ resources/assets/sass/_components.scss | 25 +++--- resources/views/books/list-item.blade.php | 2 +- resources/views/chapters/list-item.blade.php | 4 +- resources/views/pages/edit.blade.php | 13 ++- resources/views/pages/list-item.blade.php | 2 +- 9 files changed, 163 insertions(+), 39 deletions(-) diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js index fc7b88259..94e281512 100644 --- a/resources/assets/js/directives.js +++ b/resources/assets/js/directives.js @@ -600,6 +600,58 @@ module.exports = function (ngApp, events) { } }]); + ngApp.directive('entityLinkSelector', [function($http) { + return { + restict: 'A', + link: function(scope, element, attrs) { + + const selectButton = element.find('.entity-link-selector-confirm'); + let callback = false; + let entitySelection = null; + + // Handle entity selection change, Stores the selected entity locally + function entitySelectionChange(entity) { + entitySelection = entity; + if (entity === null) { + selectButton.attr('disabled', 'true'); + } else { + selectButton.removeAttr('disabled'); + } + } + events.listen('entity-select-change', entitySelectionChange); + + // Handle selection confirm button click + selectButton.click(event => { + hide(); + if (entitySelection !== null) callback(entitySelection); + }); + + // Show selector interface + function show() { + element.fadeIn(240); + } + + // Hide selector interface + function hide() { + element.fadeOut(240); + } + + // Listen to confirmation of entity selections (doubleclick) + events.listen('entity-select-confirm', entity => { + hide(); + callback(entity); + }); + + // Show entity selector, Accessible globally, and store the callback + window.showEntityLinkSelector = function(passedCallback) { + show(); + callback = passedCallback; + }; + + } + }; + }]); + ngApp.directive('entitySelector', ['$http', '$sce', function ($http, $sce) { return { @@ -613,26 +665,60 @@ module.exports = function (ngApp, events) { // Add input for forms const input = element.find('[entity-selector-input]').first(); + // Detect double click events + var lastClick = 0; + function isDoubleClick() { + let now = Date.now(); + let answer = now - lastClick < 300; + lastClick = now; + return answer; + } + // Listen to entity item clicks element.on('click', '.entity-list a', function(event) { event.preventDefault(); event.stopPropagation(); let item = $(this).closest('[data-entity-type]'); - itemSelect(item); + itemSelect(item, isDoubleClick()); }); element.on('click', '[data-entity-type]', function(event) { - itemSelect($(this)); + itemSelect($(this), isDoubleClick()); }); // Select entity action - function itemSelect(item) { + function itemSelect(item, doubleClick) { let entityType = item.attr('data-entity-type'); let entityId = item.attr('data-entity-id'); - let isSelected = !item.hasClass('selected'); + let isSelected = !item.hasClass('selected') || doubleClick; element.find('.selected').removeClass('selected').removeClass('primary-background'); if (isSelected) item.addClass('selected').addClass('primary-background'); let newVal = isSelected ? `${entityType}:${entityId}` : ''; input.val(newVal); + + if (!isSelected) { + events.emit('entity-select-change', null); + } + + if (!doubleClick && !isSelected) return; + + let link = item.find('.entity-list-item-link').attr('href'); + let name = item.find('.entity-list-item-name').text(); + + if (doubleClick) { + events.emit('entity-select-confirm', { + id: Number(entityId), + name: name, + link: link + }); + } + + if (isSelected) { + events.emit('entity-select-change', { + id: Number(entityId), + name: name, + link: link + }); + } } // Get search url with correct types diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index cc868a0ea..eb2750965 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -135,6 +135,11 @@ $(function () { $(this).closest('.overlay').fadeOut(240); }); + $('.overlay').click(function(event) { + if (!$(event.target).hasClass('overlay')) return; + $(this).fadeOut(240); + }); + }); // Page specific items diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js index b733494fa..d8f298959 100644 --- a/resources/assets/js/pages/page-form.js +++ b/resources/assets/js/pages/page-form.js @@ -96,26 +96,37 @@ var mceOptions = module.exports = { }, file_browser_callback: function (field_name, url, type, win) { - // Show image manager - window.ImageManager.showExternal(function (image) { + if (type === 'file') { + window.showEntityLinkSelector(function(entity) { + var originalField = win.document.getElementById(field_name); + originalField.value = entity.link; + $(originalField).closest('.mce-form').find('input').eq(2).val(entity.name); + }); + } - // Set popover link input to image url then fire change event - // to ensure the new value sticks - win.document.getElementById(field_name).value = image.url; - if ("createEvent" in document) { - var evt = document.createEvent("HTMLEvents"); - evt.initEvent("change", false, true); - win.document.getElementById(field_name).dispatchEvent(evt); - } else { - win.document.getElementById(field_name).fireEvent("onchange"); - } + if (type === 'image') { + // Show image manager + window.ImageManager.showExternal(function (image) { + + // Set popover link input to image url then fire change event + // to ensure the new value sticks + win.document.getElementById(field_name).value = image.url; + if ("createEvent" in document) { + var evt = document.createEvent("HTMLEvents"); + evt.initEvent("change", false, true); + win.document.getElementById(field_name).dispatchEvent(evt); + } else { + win.document.getElementById(field_name).fireEvent("onchange"); + } + + // Replace the actively selected content with the linked image + var html = ''; + html += '' + image.name + ''; + html += ''; + win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html); + }); + } - // Replace the actively selected content with the linked image - var html = ''; - html += '' + image.name + ''; - html += ''; - win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html); - }); }, paste_preprocess: function (plugin, args) { var content = args.content; diff --git a/resources/assets/sass/_buttons.scss b/resources/assets/sass/_buttons.scss index 5bdb0cf28..5de889673 100644 --- a/resources/assets/sass/_buttons.scss +++ b/resources/assets/sass/_buttons.scss @@ -100,3 +100,13 @@ $button-border-radius: 2px; } } +.button[disabled] { + background-color: #BBB; + cursor: default; + &:hover { + background-color: #BBB; + cursor: default; + box-shadow: none; + } +} + diff --git a/resources/assets/sass/_components.scss b/resources/assets/sass/_components.scss index a41277e6f..544001261 100644 --- a/resources/assets/sass/_components.scss +++ b/resources/assets/sass/_components.scss @@ -39,25 +39,28 @@ } } -.popup-header { +.corner-button { + position: absolute; + top: 0; + right: 0; + margin: 0; + height: 40px; + border-radius: 0; + box-shadow: none; +} + +.popup-header, .popup-footer { display: block; position: relative; height: 40px; - .popup-close { - position: absolute; - top: 0; - right: 0; - margin: 0; - height: 40px; - border-radius: 0; - box-shadow: none; - } .popup-title { color: #FFF; padding: 8px $-m; } } - +#entity-selector-wrap .popup-body .form-group { + margin: 0; +} .image-manager-body { min-height: 60vh; } diff --git a/resources/views/books/list-item.blade.php b/resources/views/books/list-item.blade.php index 945eb9015..2eefdfbf5 100644 --- a/resources/views/books/list-item.blade.php +++ b/resources/views/books/list-item.blade.php @@ -1,5 +1,5 @@
    -

    {{$book->name}}

    +

    {{$book->name}}

    @if(isset($book->searchSnippet))

    {!! $book->searchSnippet !!}

    @else diff --git a/resources/views/chapters/list-item.blade.php b/resources/views/chapters/list-item.blade.php index 3677851df..35d3a7589 100644 --- a/resources/views/chapters/list-item.blade.php +++ b/resources/views/chapters/list-item.blade.php @@ -6,8 +6,8 @@   »   @endif - - {{ $chapter->name }} + + {{ $chapter->name }} @if(isset($chapter->searchSnippet)) diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index f470d8d80..ad569a327 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -22,15 +22,24 @@ @include('partials/image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id])
    -
    +
    Entity Select
    - +
    @include('partials/entity-selector', ['name' => 'entity-selector']) +
    + +
    + + @stop \ No newline at end of file diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php index a95870db0..98243f6fa 100644 --- a/resources/views/pages/list-item.blade.php +++ b/resources/views/pages/list-item.blade.php @@ -1,6 +1,6 @@

    - {{ $page->name }} + {{ $page->name }}

    @if(isset($page->searchSnippet)) From 23e014cb25263aa20f21edd343704c88a3131fc6 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 2 Sep 2016 18:54:26 +0100 Subject: [PATCH 18/24] Added link selector to markdown editor --- resources/assets/js/directives.js | 30 +++++++++++++++++-- resources/assets/js/global.js | 5 ++++ resources/views/pages/edit.blade.php | 17 ++--------- resources/views/pages/form.blade.php | 2 ++ .../partials/entity-selector-popup.blade.php | 14 +++++++++ 5 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 resources/views/partials/entity-selector-popup.blade.php diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js index 94e281512..4e1bb0dfd 100644 --- a/resources/assets/js/directives.js +++ b/resources/assets/js/directives.js @@ -271,8 +271,6 @@ module.exports = function (ngApp, events) { scope.mdModel = content; scope.mdChange(markdown(content)); - console.log('test'); - element.on('change input', (event) => { content = element.val(); $timeout(() => { @@ -304,6 +302,7 @@ module.exports = function (ngApp, events) { const input = element.find('[markdown-input] textarea').first(); const display = element.find('.markdown-display').first(); const insertImage = element.find('button[data-action="insertImage"]'); + const insertEntityLink = element.find('button[data-action="insertEntityLink"]') let currentCaretPos = 0; @@ -355,6 +354,13 @@ module.exports = function (ngApp, events) { input[0].selectionEnd = caretPos + ('![](http://'.length); return; } + + // Insert entity link shortcut + if (event.which === 75 && event.ctrlKey && event.shiftKey) { + showLinkSelector(); + return; + } + // Pass key presses to controller via event scope.$emit('editor-keydown', event); }); @@ -370,6 +376,26 @@ module.exports = function (ngApp, events) { }); }); + function showLinkSelector() { + window.showEntityLinkSelector((entity) => { + let selectionStart = currentCaretPos; + let selectionEnd = input[0].selectionEnd; + let textSelected = (selectionEnd !== selectionStart); + let currentContent = input.val(); + + if (textSelected) { + let selectedText = currentContent.substring(selectionStart, selectionEnd); + let linkText = `[${selectedText}](${entity.link})`; + input.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionEnd)); + } else { + let linkText = ` [${entity.name}](${entity.link}) `; + input.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionStart)) + } + input.change(); + }); + } + insertEntityLink.click(showLinkSelector); + } } }]); diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index eb2750965..ace0dcdd2 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -140,6 +140,11 @@ $(function () { $(this).fadeOut(240); }); + $('.markdown-display').on('click', 'a', function(event) { + event.preventDefault(); + window.open($(this).attr('href')); + }); + }); // Page specific items diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index ad569a327..58df580a5 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -19,22 +19,9 @@
    + @include('partials/image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id]) - -
    -
    -
    -
    -
    Entity Select
    - -
    - @include('partials/entity-selector', ['name' => 'entity-selector']) -
    - -
    -
    -
    -
    + @include('partials/entity-selector-popup')