From: Dan Brown <redacted>
Date: Sun, 4 Aug 2019 15:26:38 +0000 (+0100)
Subject: Merge branch 'master' into 129-page-templates
X-Git-Tag: v0.27~1^2~21^2~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2ebbc6b658e80c1a291de9d699627c82ed07577f?ds=inline;hp=-c

Merge branch 'master' into 129-page-templates
---

2ebbc6b658e80c1a291de9d699627c82ed07577f
diff --combined resources/assets/sass/_pages.scss
index 7f2dad147,fc784eebe..be0cc381c
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@@ -20,6 -20,10 +20,10 @@@
    }
  }
  
+ body.mce-fullscreen .page-editor .edit-area {
+   z-index: 12;
+ }
+ 
  @include smaller-than($s) {
    .page-edit-toolbar {
      overflow-x: scroll;
@@@ -258,7 -262,7 +262,7 @@@
      display: block;
      cursor: pointer;
      padding: $-s $-m;
 -    font-size: 13.5px;
 +    font-size: 16px;
      line-height: 1.6;
      border-bottom: 1px solid rgba(255, 255, 255, 0.3);
    }
diff --combined resources/lang/en/settings.php
index 3ef53a247,d275e330a..78f86b68e
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@@ -85,7 -85,6 +85,7 @@@ return 
      'role_manage_roles' => 'Manage roles & role permissions',
      'role_manage_entity_permissions' => 'Manage all book, chapter & page permissions',
      'role_manage_own_entity_permissions' => 'Manage permissions on own book, chapter & pages',
 +    'role_manage_page_templates' => 'Manage page templates',
      'role_manage_settings' => 'Manage app settings',
      'role_asset' => 'Asset Permissions',
      'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
@@@ -157,7 -156,8 +157,8 @@@
          'ru' => 'Русский',
          'uk' => 'Українська',
          'zh_CN' => '简体中文',
-         'zh_TW' => '繁體中文'
+ 	'zh_TW' => '繁體中文',
+ 	'hu' => 'Magyar'
      ]
      //!////////////////////////////////
  ];
diff --combined resources/views/pages/edit.blade.php
index b2cda7e10,4930e30a3..cfb66fdd0
--- a/resources/views/pages/edit.blade.php
+++ b/resources/views/pages/edit.blade.php
@@@ -1,7 -1,7 +1,7 @@@
  @extends('base')
  
  @section('head')
-     <script src="{{ baseUrl('/libs/tinymce/tinymce.min.js?ver=4.9.4') }}"></script>
+     <script src="{{ url('/http/source.bookstackapp.com/libs/tinymce/tinymce.min.js?ver=4.9.4') }}"></script>
  @stop
  
  @section('body-class', 'flexbox')
@@@ -16,7 -16,7 +16,7 @@@
                  <input type="hidden" name="_method" value="PUT">
              @endif
              @include('pages.form', ['model' => $page])
 -            @include('pages.form-toolbox')
 +            @include('pages.editor-toolbox')
          </form>
      </div>
      
diff --combined resources/views/settings/roles/form.blade.php
index 0b21a2184,68b841e03..a9933a7a6
--- a/resources/views/settings/roles/form.blade.php
+++ b/resources/views/settings/roles/form.blade.php
@@@ -38,7 -38,6 +38,7 @@@
                  <div>@include('settings.roles.checkbox', ['permission' => 'user-roles-manage', 'label' => trans('settings.role_manage_roles')])</div>
                  <div>@include('settings.roles.checkbox', ['permission' => 'restrictions-manage-all', 'label' => trans('settings.role_manage_entity_permissions')])</div>
                  <div>@include('settings.roles.checkbox', ['permission' => 'restrictions-manage-own', 'label' => trans('settings.role_manage_own_entity_permissions')])</div>
 +                <div>@include('settings.roles.checkbox', ['permission' => 'templates-manage', 'label' => trans('settings.role_manage_page_templates')])</div>
                  <div>@include('settings.roles.checkbox', ['permission' => 'settings-manage', 'label' => trans('settings.role_manage_settings')])</div>
              </div>
          </div>
@@@ -220,9 -219,9 +220,9 @@@
      </div>
  
      <div class="form-group text-right">
-         <a href="{{ baseUrl("/settings/roles") }}" class="button outline">{{ trans('common.cancel') }}</a>
+         <a href="{{ url("/http/source.bookstackapp.com/settings/roles") }}" class="button outline">{{ trans('common.cancel') }}</a>
          @if (isset($role) && $role->id)
-             <a href="{{ baseUrl("/settings/roles/delete/{$role->id}") }}" class="button outline">{{ trans('settings.role_delete') }}</a>
+             <a href="{{ url("/http/source.bookstackapp.com/settings/roles/delete/{$role->id}") }}" class="button outline">{{ trans('settings.role_delete') }}</a>
          @endif
          <button type="submit" class="button primary">{{ trans('settings.role_save') }}</button>
      </div>
@@@ -240,7 -239,7 +240,7 @@@
                      </div>
                      <div>
                          @if(userCan('users-manage') || $currentUser->id == $user->id)
-                             <a href="{{ baseUrl("/settings/users/{$user->id}") }}">
+                             <a href="{{ url("/http/source.bookstackapp.com/settings/users/{$user->id}") }}">
                                  @endif
                                  {{ $user->name }}
                                  @if(userCan('users-manage') || $currentUser->id == $user->id)