colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated draw.io references to diagrams.net 

Related to #2044
This commit is contained in:
Dan Brown 2020-09-28 20:45:38 +01:00
parent d48ac0a37d
commit 8b0f5e7000
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.example.complete
View File

@ -238,9 +238,9 @@ DISABLE_EXTERNAL_SERVICES=false
# Example: AVATAR_URL=https://seccdn.libravatar.org/avatar/${hash}?s=${size}&d=identicon # Example: AVATAR_URL=https://seccdn.libravatar.org/avatar/${hash}?s=${size}&d=identicon
AVATAR_URL= AVATAR_URL=
# Enable draw.io integration # Enable diagrams.net integration
# Can simply be true/false to enable/disable the integration. # Can simply be true/false to enable/disable the integration.
# Alternatively, It can be URL to the draw.io instance you want to use. # Alternatively, It can be URL to the diagrams.net instance you want to use.
# For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1 # For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1
DRAWIO=true DRAWIO=true

2
readme.md
View File

@ -168,6 +168,6 @@ These are the great open-source projects used to help build BookStack:
* [Snappy (WKHTML2PDF)](https://github.com/barryvdh/laravel-snappy) * [Snappy (WKHTML2PDF)](https://github.com/barryvdh/laravel-snappy)
* [Laravel IDE helper](https://github.com/barryvdh/laravel-ide-helper) * [Laravel IDE helper](https://github.com/barryvdh/laravel-ide-helper)
* [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html) * [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html)
* [Draw.io](https://github.com/jgraph/drawio) * [diagrams.net](https://github.com/jgraph/drawio)
* [Laravel Stats](https://github.com/stefanzweifel/laravel-stats) * [Laravel Stats](https://github.com/stefanzweifel/laravel-stats)
* [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml) * [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml)

2
resources/views/pages/form.blade.php
View File

@ -1,7 +1,7 @@
<div component="page-editor" class="page-editor flex-fill flex" <div component="page-editor" class="page-editor flex-fill flex"
option:page-editor:drafts-enabled="{{ $draftsEnabled ? 'true' : 'false' }}" option:page-editor:drafts-enabled="{{ $draftsEnabled ? 'true' : 'false' }}"
@if(config('services.drawio')) @if(config('services.drawio'))
drawio-url="{{ is_string(config('services.drawio')) ? config('services.drawio') : 'https://www.draw.io/?embed=1&proto=json&spin=1' }}" drawio-url="{{ is_string(config('services.drawio')) ? config('services.drawio') : 'https://embed.diagrams.net/?embed=1&proto=json&spin=1' }}"
@endif @endif
@if($model->name === trans('entities.pages_initial_name')) @if($model->name === trans('entities.pages_initial_name'))
option:page-editor:has-default-title="true" option:page-editor:has-default-title="true"

2
tests/Uploads/DrawioTest.php
View File

@ -69,7 +69,7 @@ class DrawioTest extends TestCase
$editor = $this->getEditor(); $editor = $this->getEditor();
$resp = $this->actingAs($editor)->get($page->getUrl('/edit')); $resp = $this->actingAs($editor)->get($page->getUrl('/edit'));
$resp->assertSee('drawio-url="https://www.draw.io/?embed=1&amp;proto=json&amp;spin=1"'); $resp->assertSee('drawio-url="https://embed.diagrams.net/?embed=1&amp;proto=json&amp;spin=1"');
config()->set('services.drawio', false); config()->set('services.drawio', false);
$resp = $this->actingAs($editor)->get($page->getUrl('/edit')); $resp = $this->actingAs($editor)->get($page->getUrl('/edit'));