-
-
-
- `,
- scope: true,
- link: function (scope, element, attrs) {
- scope.name = attrs.name;
- scope.value = attrs.value;
- scope.isActive = scope.value == true && scope.value != 'false';
- scope.value = (scope.value == true && scope.value != 'false') ? 'true' : 'false';
-
- scope.switch = function () {
- scope.isActive = !scope.isActive;
- scope.value = scope.isActive ? 'true' : 'false';
- }
-
- }
- };
- });
+export default function (ngApp, events) {
/**
* Common tab controls using simple jQuery functions.
@@ -65,7 +35,7 @@ module.exports = function (ngApp, events) {
});
/**
- * Sub form component to allow inner-form sections to act like thier own forms.
+ * Sub form component to allow inner-form sections to act like their own forms.
*/
ngApp.directive('subForm', function() {
return {
@@ -80,96 +50,13 @@ module.exports = function (ngApp, events) {
element.find('button[type="submit"]').click(submitEvent);
function submitEvent(e) {
- e.preventDefault()
+ e.preventDefault();
if (attrs.subForm) scope.$eval(attrs.subForm);
}
}
};
});
-
- /**
- * Image Picker
- * Is a simple front-end interface that connects to an ImageManager if present.
- */
- ngApp.directive('imagePicker', ['$http', 'imageManagerService', function ($http, imageManagerService) {
- return {
- restrict: 'E',
- template: `
-
-
- - - | - - - -
- `,
- scope: {
- name: '@',
- resizeHeight: '@',
- resizeWidth: '@',
- resizeCrop: '@',
- showRemove: '=',
- currentImage: '@',
- currentId: '@',
- defaultImage: '@',
- imageClass: '@'
- },
- link: function (scope, element, attrs) {
- let usingIds = typeof scope.currentId !== 'undefined' || scope.currentId === 'false';
- scope.image = scope.currentImage;
- scope.value = scope.currentImage || '';
- if (usingIds) scope.value = scope.currentId;
-
- function setImage(imageModel, imageUrl) {
- scope.image = imageUrl;
- scope.value = usingIds ? imageModel.id : imageUrl;
- }
-
- scope.reset = function () {
- setImage({id: 0}, scope.defaultImage);
- };
-
- scope.remove = function () {
- scope.image = 'none';
- scope.value = 'none';
- };
-
- scope.showImageManager = function () {
- imageManagerService.show((image) => {
- scope.updateImageFromModel(image);
- });
- };
-
- scope.updateImageFromModel = function (model) {
- let isResized = scope.resizeWidth && scope.resizeHeight;
-
- if (!isResized) {
- scope.$apply(() => {
- setImage(model, model.url);
- });
- return;
- }
-
- let cropped = scope.resizeCrop ? 'true' : 'false';
- let requestString = '/images/thumb/' + model.id + '/' + scope.resizeWidth + '/' + scope.resizeHeight + '/' + cropped;
- requestString = window.baseUrl(requestString);
- $http.get(requestString).then((response) => {
- setImage(model, response.data.url);
- });
- };
-
- }
- };
- }]);
-
/**
* DropZone
* Used for uploading images
@@ -179,25 +66,26 @@ module.exports = function (ngApp, events) {
restrict: 'E',
template: `
- ![Image Preview]()
- ![Image Preview]()
-
-
- - - - | - - - -
-
+
`,
scope: {
uploadUrl: '@',
eventSuccess: '=',
eventError: '=',
- uploadedTo: '@'
+ uploadedTo: '@',
},
link: function (scope, element, attrs) {
+ scope.message = attrs.message;
if (attrs.placeholder) element[0].querySelector('.dz-message').textContent = attrs.placeholder;
- var dropZone = new DropZone(element[0].querySelector('.dropzone-container'), {
+ let dropZone = new DropZone(element[0].querySelector('.dropzone-container'), {
url: scope.uploadUrl,
init: function () {
- var dz = this;
+ let dz = this;
dz.on('sending', function (file, xhr, data) {
- var token = window.document.querySelector('meta[name=token]').getAttribute('content');
+ let token = window.document.querySelector('meta[name=token]').getAttribute('content');
data.append('_token', token);
- var uploadedTo = typeof scope.uploadedTo === 'undefined' ? 0 : scope.uploadedTo;
+ let uploadedTo = typeof scope.uploadedTo === 'undefined' ? 0 : scope.uploadedTo;
data.append('uploaded_to', uploadedTo);
});
if (typeof scope.eventSuccess !== 'undefined') dz.on('success', scope.eventSuccess);
@@ -214,7 +102,7 @@ module.exports = function (ngApp, events) {
$(file.previewElement).find('[data-dz-errormessage]').text(message);
}
- if (xhr.status === 413) setMessage('The server does not allow uploads of this size. Please try a smaller file.');
+ if (xhr.status === 413) setMessage(trans('errors.server_upload_limit'));
if (errorMessage.file) setMessage(errorMessage.file[0]);
});
@@ -273,7 +161,7 @@ module.exports = function (ngApp, events) {
function tinyMceSetup(editor) {
editor.on('ExecCommand change NodeChange ObjectResized', (e) => {
- var content = editor.getContent();
+ let content = editor.getContent();
$timeout(() => {
scope.mceModel = content;
});
@@ -301,9 +189,9 @@ module.exports = function (ngApp, events) {
// Custom tinyMCE plugins
tinymce.PluginManager.add('customhr', function (editor) {
editor.addCommand('InsertHorizontalRule', function () {
- var hrElem = document.createElement('hr');
- var cNode = editor.selection.getNode();
- var parentNode = cNode.parentNode;
+ let hrElem = document.createElement('hr');
+ let cNode = editor.selection.getNode();
+ let parentNode = cNode.parentNode;
parentNode.insertBefore(hrElem, cNode);
});
@@ -373,15 +261,21 @@ module.exports = function (ngApp, events) {
link: function (scope, element, attrs) {
// Elements
- 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"]')
+ 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"]');
+
+ // Prevent markdown display link click redirect
+ $display.on('click', 'a', function(event) {
+ event.preventDefault();
+ window.open(this.getAttribute('href'));
+ });
let currentCaretPos = 0;
- input.blur(event => {
- currentCaretPos = input[0].selectionStart;
+ $input.blur(event => {
+ currentCaretPos = $input[0].selectionStart;
});
// Scroll sync
@@ -391,10 +285,10 @@ module.exports = function (ngApp, events) {
displayHeight;
function setScrollHeights() {
- inputScrollHeight = input[0].scrollHeight;
- inputHeight = input.height();
- displayScrollHeight = display[0].scrollHeight;
- displayHeight = display.height();
+ inputScrollHeight = $input[0].scrollHeight;
+ inputHeight = $input.height();
+ displayScrollHeight = $display[0].scrollHeight;
+ displayHeight = $display.height();
}
setTimeout(() => {
@@ -403,29 +297,29 @@ module.exports = function (ngApp, events) {
window.addEventListener('resize', setScrollHeights);
let scrollDebounceTime = 800;
let lastScroll = 0;
- input.on('scroll', event => {
+ $input.on('scroll', event => {
let now = Date.now();
if (now - lastScroll > scrollDebounceTime) {
setScrollHeights()
}
- let scrollPercent = (input.scrollTop() / (inputScrollHeight - inputHeight));
+ let scrollPercent = ($input.scrollTop() / (inputScrollHeight - inputHeight));
let displayScrollY = (displayScrollHeight - displayHeight) * scrollPercent;
- display.scrollTop(displayScrollY);
+ $display.scrollTop(displayScrollY);
lastScroll = now;
});
// Editor key-presses
- input.keydown(event => {
+ $input.keydown(event => {
// Insert image shortcut
if (event.which === 73 && event.ctrlKey && event.shiftKey) {
event.preventDefault();
- let caretPos = input[0].selectionStart;
- let currentContent = input.val();
+ let caretPos = $input[0].selectionStart;
+ let currentContent = $input.val();
const mdImageText = "";
- input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
- input.focus();
- input[0].selectionStart = caretPos + ("![](".length);
- input[0].selectionEnd = caretPos + (';
+ $input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
+ $input.focus();
+ $input[0].selectionStart = caretPos + ("![](".length);
+ $input[0].selectionEnd = caretPos + (';
return;
}
@@ -440,48 +334,48 @@ module.exports = function (ngApp, events) {
});
// Insert image from image manager
- insertImage.click(event => {
+ $insertImage.click(event => {
window.ImageManager.showExternal(image => {
let caretPos = currentCaretPos;
- let currentContent = input.val();
+ let currentContent = $input.val();
let mdImageText = "![" + image.name + "](" + image.thumbs.display + ")";
- input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
- input.change();
+ $input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
+ $input.change();
});
});
function showLinkSelector() {
window.showEntityLinkSelector((entity) => {
let selectionStart = currentCaretPos;
- let selectionEnd = input[0].selectionEnd;
+ let selectionEnd = $input[0].selectionEnd;
let textSelected = (selectionEnd !== selectionStart);
- let currentContent = input.val();
+ 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));
+ $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.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionStart))
}
- input.change();
+ $input.change();
});
}
- insertEntityLink.click(showLinkSelector);
+ $insertEntityLink.click(showLinkSelector);
// Upload and insert image on paste
function editorPaste(e) {
e = e.originalEvent;
if (!e.clipboardData) return
- var items = e.clipboardData.items;
+ let items = e.clipboardData.items;
if (!items) return;
- for (var i = 0; i < items.length; i++) {
+ for (let i = 0; i < items.length; i++) {
uploadImage(items[i].getAsFile());
}
}
- input.on('paste', editorPaste);
+ $input.on('paste', editorPaste);
// Handle image drop, Uploads images to BookStack.
function handleImageDrop(event) {
@@ -493,17 +387,17 @@ module.exports = function (ngApp, events) {
}
}
- input.on('drop', handleImageDrop);
+ $input.on('drop', handleImageDrop);
// Handle image upload and add image into markdown content
function uploadImage(file) {
if (file.type.indexOf('image') !== 0) return;
- var formData = new FormData();
- var ext = 'png';
- var xhr = new XMLHttpRequest();
+ let formData = new FormData();
+ let ext = 'png';
+ let xhr = new XMLHttpRequest();
if (file.name) {
- var fileNameMatches = file.name.match(/\.(.+)$/);
+ let fileNameMatches = file.name.match(/\.(.+)$/);
if (fileNameMatches) {
ext = fileNameMatches[1];
}
@@ -511,17 +405,17 @@ module.exports = function (ngApp, events) {
// Insert image into markdown
let id = "image-" + Math.random().toString(16).slice(2);
- let selectStart = input[0].selectionStart;
- let selectEnd = input[0].selectionEnd;
- let content = input[0].value;
+ let selectStart = $input[0].selectionStart;
+ let selectEnd = $input[0].selectionEnd;
+ let content = $input[0].value;
let selectText = content.substring(selectStart, selectEnd);
let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
let innerContent = ((selectEnd > selectStart) ? `![${selectText}]` : '![]') + `(${placeholderImage})`;
- input[0].value = content.substring(0, selectStart) + innerContent + content.substring(selectEnd);
+ $input[0].value = content.substring(0, selectStart) + innerContent + content.substring(selectEnd);
- input.focus();
- input[0].selectionStart = selectStart;
- input[0].selectionEnd = selectStart;
+ $input.focus();
+ $input[0].selectionStart = selectStart;
+ $input[0].selectionEnd = selectStart;
let remoteFilename = "image-" + Date.now() + "." + ext;
formData.append('file', file, remoteFilename);
@@ -529,20 +423,20 @@ module.exports = function (ngApp, events) {
xhr.open('POST', window.baseUrl('/images/gallery/upload'));
xhr.onload = function () {
- let selectStart = input[0].selectionStart;
+ let selectStart = $input[0].selectionStart;
if (xhr.status === 200 || xhr.status === 201) {
- var result = JSON.parse(xhr.responseText);
- input[0].value = input[0].value.replace(placeholderImage, result.thumbs.display);
- input.change();
+ let result = JSON.parse(xhr.responseText);
+ $input[0].value = $input[0].value.replace(placeholderImage, result.thumbs.display);
+ $input.change();
} else {
- console.log('An error occurred uploading the image');
+ console.log(trans('errors.image_upload_error'));
console.log(xhr.responseText);
- input[0].value = input[0].value.replace(innerContent, '');
- input.change();
+ $input[0].value = $input[0].value.replace(innerContent, '');
+ $input.change();
}
- input.focus();
- input[0].selectionStart = selectStart;
- input[0].selectionEnd = selectStart;
+ $input.focus();
+ $input[0].selectionStart = selectStart;
+ $input[0].selectionEnd = selectStart;
};
xhr.send(formData);
}
@@ -680,8 +574,7 @@ module.exports = function (ngApp, events) {
}
// Enter or tab key
else if ((event.keyCode === 13 || event.keyCode === 9) && !event.shiftKey) {
- let text = suggestionElems[active].textContent;
- currentInput[0].value = text;
+ currentInput[0].value = suggestionElems[active].textContent;
currentInput.focus();
$suggestionBox.hide();
isShowing = false;
@@ -732,14 +625,13 @@ module.exports = function (ngApp, events) {
// Build suggestions
$suggestionBox[0].innerHTML = '';
for (let i = 0; i < suggestions.length; i++) {
- var suggestion = document.createElement('li');
+ let suggestion = document.createElement('li');
suggestion.textContent = suggestions[i];
suggestion.onclick = suggestionClick;
if (i === 0) {
- suggestion.className = 'active'
+ suggestion.className = 'active';
active = 0;
}
- ;
$suggestionBox[0].appendChild(suggestion);
}
@@ -748,12 +640,11 @@ module.exports = function (ngApp, events) {
// Suggestion click event
function suggestionClick(event) {
- let text = this.textContent;
- currentInput[0].value = text;
+ currentInput[0].value = this.textContent;
currentInput.focus();
$suggestionBox.hide();
isShowing = false;
- };
+ }
// Get suggestions & cache
function getSuggestions(input, url) {
@@ -779,7 +670,7 @@ module.exports = function (ngApp, events) {
ngApp.directive('entityLinkSelector', [function($http) {
return {
- restict: 'A',
+ restrict: 'A',
link: function(scope, element, attrs) {
const selectButton = element.find('.entity-link-selector-confirm');
@@ -843,7 +734,7 @@ module.exports = function (ngApp, events) {
const input = element.find('[entity-selector-input]').first();
// Detect double click events
- var lastClick = 0;
+ let lastClick = 0;
function isDoubleClick() {
let now = Date.now();
let answer = now - lastClick < 300;
diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js
index 9aa5dff52..94462ed64 100644
--- a/resources/assets/js/global.js
+++ b/resources/assets/js/global.js
@@ -1,11 +1,11 @@
"use strict";
// AngularJS - Create application and load components
-var angular = require('angular');
-var ngResource = require('angular-resource');
-var ngAnimate = require('angular-animate');
-var ngSanitize = require('angular-sanitize');
-require('angular-ui-sortable');
+import angular from "angular";
+import "angular-resource";
+import "angular-animate";
+import "angular-sanitize";
+import "angular-ui-sortable";
// Url retrieval function
window.baseUrl = function(path) {
@@ -15,7 +15,13 @@ window.baseUrl = function(path) {
return basePath + '/' + path;
};
-var ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize', 'ui.sortable']);
+let ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize', 'ui.sortable']);
+
+// Translation setup
+// Creates a global function with name 'trans' to be used in the same way as Laravel's translation system
+import Translations from "./translations"
+let translator = new Translations(window.translations);
+window.trans = translator.get.bind(translator);
// Global Event System
class EventManager {
@@ -25,9 +31,9 @@ class EventManager {
emit(eventName, eventData) {
if (typeof this.listeners[eventName] === 'undefined') return this;
- var eventsToStart = this.listeners[eventName];
+ let eventsToStart = this.listeners[eventName];
for (let i = 0; i < eventsToStart.length; i++) {
- var event = eventsToStart[i];
+ let event = eventsToStart[i];
event(eventData);
}
return this;
@@ -70,93 +76,83 @@ jQuery.expr[":"].contains = $.expr.createPseudo(function (arg) {
});
// Global jQuery Elements
-$(function () {
-
- var notifications = $('.notification');
- var successNotification = notifications.filter('.pos');
- var errorNotification = notifications.filter('.neg');
- var warningNotification = notifications.filter('.warning');
- // Notification Events
- window.Events.listen('success', function (text) {
- successNotification.hide();
- successNotification.find('span').text(text);
- setTimeout(() => {
- successNotification.show();
- }, 1);
- });
- window.Events.listen('warning', function (text) {
- warningNotification.find('span').text(text);
- warningNotification.show();
- });
- window.Events.listen('error', function (text) {
- errorNotification.find('span').text(text);
- errorNotification.show();
- });
-
- // Notification hiding
- notifications.click(function () {
- $(this).fadeOut(100);
- });
-
- // Chapter page list toggles
- $('.chapter-toggle').click(function (e) {
- e.preventDefault();
- $(this).toggleClass('open');
- $(this).closest('.chapter').find('.inset-list').slideToggle(180);
- });
-
- // Back to top button
- $('#back-to-top').click(function() {
- $('#header').smoothScrollTo();
- });
- var scrollTopShowing = false;
- var scrollTop = document.getElementById('back-to-top');
- var scrollTopBreakpoint = 1200;
- window.addEventListener('scroll', function() {
- 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 && scrollTopPos < scrollTopBreakpoint) {
- scrollTop.style.opacity = 0;
- scrollTopShowing = false;
- setTimeout(() => {
- scrollTop.style.display = 'none';
- }, 500);
- }
- });
-
- // Common jQuery actions
- $('[data-action="expand-entity-list-details"]').click(function() {
- $('.entity-list.compact').find('p').not('.empty-text').slideToggle(240);
- });
-
- // Popup close
- $('.popup-close').click(function() {
- $(this).closest('.overlay').fadeOut(240);
- });
- $('.overlay').click(function(event) {
- if (!$(event.target).hasClass('overlay')) return;
- $(this).fadeOut(240);
- });
-
- // Prevent markdown display link click redirect
- $('.markdown-display').on('click', 'a', function(event) {
- event.preventDefault();
- window.open($(this).attr('href'));
- });
-
- // Detect IE for css
- if(navigator.userAgent.indexOf('MSIE')!==-1
- || navigator.appVersion.indexOf('Trident/') > 0
- || navigator.userAgent.indexOf('Safari') !== -1){
- $('body').addClass('flexbox-support');
- }
-
+let notifications = $('.notification');
+let successNotification = notifications.filter('.pos');
+let errorNotification = notifications.filter('.neg');
+let warningNotification = notifications.filter('.warning');
+// Notification Events
+window.Events.listen('success', function (text) {
+ successNotification.hide();
+ successNotification.find('span').text(text);
+ setTimeout(() => {
+ successNotification.show();
+ }, 1);
+});
+window.Events.listen('warning', function (text) {
+ warningNotification.find('span').text(text);
+ warningNotification.show();
+});
+window.Events.listen('error', function (text) {
+ errorNotification.find('span').text(text);
+ errorNotification.show();
});
+// Notification hiding
+notifications.click(function () {
+ $(this).fadeOut(100);
+});
+
+// Chapter page list toggles
+$('.chapter-toggle').click(function (e) {
+ e.preventDefault();
+ $(this).toggleClass('open');
+ $(this).closest('.chapter').find('.inset-list').slideToggle(180);
+});
+
+// Back to top button
+$('#back-to-top').click(function() {
+ $('#header').smoothScrollTo();
+});
+let scrollTopShowing = false;
+let scrollTop = document.getElementById('back-to-top');
+let scrollTopBreakpoint = 1200;
+window.addEventListener('scroll', function() {
+ 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 && scrollTopPos < scrollTopBreakpoint) {
+ scrollTop.style.opacity = 0;
+ scrollTopShowing = false;
+ setTimeout(() => {
+ scrollTop.style.display = 'none';
+ }, 500);
+ }
+});
+
+// Common jQuery actions
+$('[data-action="expand-entity-list-details"]').click(function() {
+ $('.entity-list.compact').find('p').not('.empty-text').slideToggle(240);
+});
+
+// Popup close
+$('.popup-close').click(function() {
+ $(this).closest('.overlay').fadeOut(240);
+});
+$('.overlay').click(function(event) {
+ if (!$(event.target).hasClass('overlay')) return;
+ $(this).fadeOut(240);
+});
+
+// Detect IE for css
+if(navigator.userAgent.indexOf('MSIE')!==-1
+ || navigator.appVersion.indexOf('Trident/') > 0
+ || navigator.userAgent.indexOf('Safari') !== -1){
+ $('body').addClass('flexbox-support');
+}
+
// Page specific items
-require('./pages/page-show');
+import "./pages/page-show";
diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index 1fb8b915f..e1c0cfe8f 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -60,108 +60,108 @@ function registerEditorShortcuts(editor) {
editor.addShortcut('meta+shift+E', '', ['FormatBlock', false, 'code']);
}
-var mceOptions = module.exports = {
- selector: '#html-editor',
- content_css: [
- window.baseUrl('/css/styles.css'),
- window.baseUrl('/libs/material-design-iconic-font/css/material-design-iconic-font.min.css')
- ],
- body_class: 'page-content',
- relative_urls: false,
- remove_script_host: false,
- document_base_url: window.baseUrl('/'),
- statusbar: false,
- menubar: false,
- paste_data_images: false,
- extended_valid_elements: 'pre[*]',
- automatic_uploads: false,
- valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
- plugins: "image table textcolor paste link fullscreen imagetools code customhr autosave lists",
- imagetools_toolbar: 'imageoptions',
- toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
- content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
- style_formats: [
- {title: "Header Large", format: "h2"},
- {title: "Header Medium", format: "h3"},
- {title: "Header Small", format: "h4"},
- {title: "Header Tiny", format: "h5"},
- {title: "Paragraph", format: "p", exact: true, classes: ''},
- {title: "Blockquote", format: "blockquote"},
- {title: "Code Block", icon: "code", format: "pre"},
- {title: "Inline Code", icon: "code", inline: "code"},
- {title: "Callouts", items: [
- {title: "Success", block: 'p', exact: true, attributes : {'class' : 'callout success'}},
- {title: "Info", block: 'p', exact: true, attributes : {'class' : 'callout info'}},
- {title: "Warning", block: 'p', exact: true, attributes : {'class' : 'callout warning'}},
- {title: "Danger", block: 'p', exact: true, attributes : {'class' : 'callout danger'}}
- ]}
- ],
- style_formats_merge: false,
- formats: {
- alignleft: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-left'},
- aligncenter: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-center'},
- 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) {
+export default function() {
+ let settings = {
+ selector: '#html-editor',
+ content_css: [
+ window.baseUrl('/css/styles.css'),
+ window.baseUrl('/libs/material-design-iconic-font/css/material-design-iconic-font.min.css')
+ ],
+ body_class: 'page-content',
+ relative_urls: false,
+ remove_script_host: false,
+ document_base_url: window.baseUrl('/'),
+ statusbar: false,
+ menubar: false,
+ paste_data_images: false,
+ extended_valid_elements: 'pre[*]',
+ automatic_uploads: false,
+ valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
+ plugins: "image table textcolor paste link fullscreen imagetools code customhr autosave lists",
+ imagetools_toolbar: 'imageoptions',
+ toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
+ content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
+ style_formats: [
+ {title: "Header Large", format: "h2"},
+ {title: "Header Medium", format: "h3"},
+ {title: "Header Small", format: "h4"},
+ {title: "Header Tiny", format: "h5"},
+ {title: "Paragraph", format: "p", exact: true, classes: ''},
+ {title: "Blockquote", format: "blockquote"},
+ {title: "Code Block", icon: "code", format: "pre"},
+ {title: "Inline Code", icon: "code", inline: "code"},
+ {title: "Callouts", items: [
+ {title: "Success", block: 'p', exact: true, attributes : {'class' : 'callout success'}},
+ {title: "Info", block: 'p', exact: true, attributes : {'class' : 'callout info'}},
+ {title: "Warning", block: 'p', exact: true, attributes : {'class' : 'callout warning'}},
+ {title: "Danger", block: 'p', exact: true, attributes : {'class' : 'callout danger'}}
+ ]}
+ ],
+ style_formats_merge: false,
+ formats: {
+ alignleft: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-left'},
+ aligncenter: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-center'},
+ 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) {
- if (type === 'file') {
- window.showEntityLinkSelector(function(entity) {
- let originalField = win.document.getElementById(field_name);
- originalField.value = entity.link;
- $(originalField).closest('.mce-form').find('input').eq(2).val(entity.name);
- });
- }
+ if (type === 'file') {
+ window.showEntityLinkSelector(function(entity) {
+ let originalField = win.document.getElementById(field_name);
+ originalField.value = entity.link;
+ $(originalField).closest('.mce-form').find('input').eq(2).val(entity.name);
+ });
+ }
- if (type === 'image') {
- // Show image manager
- window.ImageManager.showExternal(function (image) {
+ 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) {
- let evt = document.createEvent("HTMLEvents");
- evt.initEvent("change", false, true);
- win.document.getElementById(field_name).dispatchEvent(evt);
- } else {
- win.document.getElementById(field_name).fireEvent("onchange");
- }
+ // 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) {
+ let 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
- let html = ``;
- html += `Leave empty to reset to the default color.', + /** + * Registration settings + */ + 'reg_settings' => 'Registration Settings', 'reg_allow' => 'Allow registration?', 'reg_default_role' => 'Default user role after registration', @@ -36,4 +45,96 @@ return [ 'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application.
Note that users will be able to change their email addresses after successful registration.', 'reg_confirm_restrict_domain_placeholder' => 'No restriction set', -]; \ No newline at end of file + /** + * Role settings + */ + + 'roles' => 'Roles', + 'role_user_roles' => 'User Roles', + 'role_create' => 'Create New Role', + 'role_create_success' => 'Role successfully created', + 'role_delete' => 'Delete Role', + 'role_delete_confirm' => 'This will delete the role with the name \':roleName\'.', + 'role_delete_users_assigned' => 'This role has :userCount users assigned to it. If you would like to migrate the users from this role select a new role below.', + 'role_delete_no_migration' => "Don't migrate users", + 'role_delete_sure' => 'Are you sure you want to delete this role?', + 'role_delete_success' => 'Role successfully deleted', + 'role_edit' => 'Edit Role', + 'role_details' => 'Role Details', + 'role_name' => 'Role Name', + 'role_desc' => 'Short Description of Role', + 'role_system' => 'System Permissions', + 'role_manage_users' => 'Manage users', + '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_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.', + 'role_all' => 'All', + 'role_own' => 'Own', + 'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to', + 'role_save' => 'Save Role', + 'role_update_success' => 'Role successfully updated', + 'role_users' => 'Users in this role', + 'role_users_none' => 'No users are currently assigned to this role', + + /** + * Users + */ + + 'users' => 'Users', + 'user_profile' => 'User Profile', + 'users_add_new' => 'Add New User', + 'users_search' => 'Search Users', + 'users_role' => 'User Roles', + 'users_external_auth_id' => 'External Authentication ID', + 'users_password_warning' => 'Only fill the below if you would like to change your password:', + 'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.', + 'users_delete' => 'Delete User', + 'users_delete_named' => 'Delete ser :userName', + 'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.', + 'users_delete_confirm' => 'Are you sure you want to delete this user?', + 'users_delete_success' => 'Users successfully removed', + 'users_edit' => 'Edit User', + 'users_edit_profile' => 'Edit Profile', + 'users_edit_success' => 'User successfully updated', + 'users_avatar' => 'User Avatar', + 'users_avatar_desc' => 'This image should be approx 256px square.', + 'users_social_accounts' => 'Social Accounts', + 'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not previously authorized access. Revoke access from your profile settings on the connected social account.', + 'users_social_connect' => 'Connect Account', + 'users_social_disconnect' => 'Disconnect Account', + 'users_social_connected' => ':socialAccount account was successfully attached to your profile.', + 'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.', +]; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 20acc9a68..b75af7485 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -87,8 +87,8 @@ return [ */ 'custom' => [ - 'attribute-name' => [ - 'rule-name' => 'custom-message', + 'password-confirm' => [ + 'required_with' => 'Password confirmation required', ], ], diff --git a/resources/views/auth/forms/login/ldap.blade.php b/resources/views/auth/forms/login/ldap.blade.php index 5230d43ca..b52b5f13e 100644 --- a/resources/views/auth/forms/login/ldap.blade.php +++ b/resources/views/auth/forms/login/ldap.blade.php @@ -1,19 +1,19 @@
-
+
@include('form/text', ['name' => 'username', 'tabindex' => 1])
@if(session('request-email', false) === true)
-
+
@include('form/text', ['name' => 'email', 'tabindex' => 1])
- Please enter an email to use for this account.
+ {{ trans('auth.ldap_email_hint') }}
@endif
-
+
@include('form/password', ['name' => 'password', 'tabindex' => 2])
\ No newline at end of file
diff --git a/resources/views/auth/forms/login/standard.blade.php b/resources/views/auth/forms/login/standard.blade.php
index abefd21a1..4ea1f35ba 100644
--- a/resources/views/auth/forms/login/standard.blade.php
+++ b/resources/views/auth/forms/login/standard.blade.php
@@ -1,10 +1,10 @@
-
+
@include('form/text', ['name' => 'email', 'tabindex' => 1])
-
+
@include('form/password', ['name' => 'password', 'tabindex' => 2])
- Forgot Password?
+ {{ trans('auth.forgot_password') }}
\ No newline at end of file
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 4fa97c1d5..928565156 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -2,7 +2,7 @@
@section('header-buttons')
@if(setting('registration-enabled', false))
- Sign up
+ {{ trans('auth.sign_up') }}
@endif
@stop
@@ -10,7 +10,7 @@
-
-
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 115785ab2..07bd2c383 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,9 +1,9 @@
@extends('public')
@section('header-buttons')
- Sign in
+ {{ trans('auth.log_in') }}
@if(setting('registration-enabled'))
- Sign up
+ {{ trans('auth.sign_up') }}
@endif
@stop
@@ -12,20 +12,20 @@
Log In
+{{ title_case(trans('auth.log_in')) }}
@if(count($socialDrivers) > 0)-
Social Login
+{{ trans('auth.social_login') }}
@if(isset($socialDrivers['google'])) - + @endif @if(isset($socialDrivers['github'])) - + @endif @endif
-
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 612b50ff8..a463eef45 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -1,9 +1,9 @@
@extends('public')
@section('header-buttons')
- Sign in
+ {{ trans('auth.log_in') }}
@if(setting('registration-enabled'))
- Sign up
+ {{ trans('auth.sign_up') }}
@endif
@stop
@@ -14,29 +14,29 @@
Reset Password
+{{ trans('auth.reset_password') }}
-Enter your email below and you will be sent an email with a password reset link.
+{{ trans('auth.reset_password_send_instructions') }}
-
diff --git a/resources/views/auth/register-confirm.blade.php b/resources/views/auth/register-confirm.blade.php
index 97fd65ab5..364df9266 100644
--- a/resources/views/auth/register-confirm.blade.php
+++ b/resources/views/auth/register-confirm.blade.php
@@ -2,7 +2,7 @@
@section('header-buttons')
@if(!$signedIn)
- Sign in
+ {{ trans('auth.log_in') }}
@endif
@stop
@@ -10,10 +10,9 @@
Reset Password
+{{ trans('auth.reset_password') }}
-
Thanks for registering!
-Please check your email and click the confirmation button to access {{ setting('app-name', 'BookStack') }}.
+{{ trans('auth.register_thanks') }}
+{{ trans('auth.register_confirm', ['appName' => setting('app-name')]) }}
-
-
@@ -93,7 +78,7 @@
@yield('bottom')
diff --git a/resources/views/books/_breadcrumbs.blade.php b/resources/views/books/_breadcrumbs.blade.php
new file mode 100644
index 000000000..e588127ce
--- /dev/null
+++ b/resources/views/books/_breadcrumbs.blade.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php
index 60f4f65bd..2c629e699 100644
--- a/resources/views/books/create.blade.php
+++ b/resources/views/books/create.blade.php
@@ -3,7 +3,7 @@
@section('content')
Sign Up
+{{ title_case(trans('auth.sign_up')) }}
@if(count($socialDrivers) > 0)-
Social Registration
-Register and sign in using another service.
+{{ trans('auth.social_registration') }}
+{{ trans('auth.social_registration_text') }}
@if(isset($socialDrivers['google'])) @endif diff --git a/resources/views/auth/user-unconfirmed.blade.php b/resources/views/auth/user-unconfirmed.blade.php index 08178e891..13567b412 100644 --- a/resources/views/auth/user-unconfirmed.blade.php +++ b/resources/views/auth/user-unconfirmed.blade.php @@ -4,16 +4,16 @@
-
diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index 08acf725d..43f22d89a 100644
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -17,6 +17,7 @@
+
@yield('head')
@@ -53,32 +54,16 @@
Email Address not confirmed
-Your email address has not yet been confirmed.
- Please click the link in the email that was sent shortly after you registered.
- If you cannot find the email you can re-send the confirmation email by submitting the form below.
+
{{ trans('auth.email_not_confirmed') }}
+{{ trans('auth.email_not_confirmed_text') }}
+ {{ trans('auth.email_not_confirmed_click_link') }}
+ {{ trans('auth.email_not_confirmed_resend') }}
- Books
+ {{ trans('entities.books') }}
@if(isset($currentUser) && userCan('settings-manage'))
- Settings
+ {{ trans('settings.settings') }}
@endif
@if(!isset($signedIn) || !$signedIn)
- Sign In
+ {{ trans('auth.log_in') }}
@endif
@if(isset($signedIn) && $signedIn)
-
-
- }})
- {{ $currentUser->getShortName(9) }}
-
-
-
+ @include('partials._header-dropdown', ['currentUser' => $currentUser])
@endif
- Back to top
+ {{ trans('common.back_to_top') }}
-
Create New Book
+{{ trans('entities.books_create') }}
diff --git a/resources/views/books/delete.blade.php b/resources/views/books/delete.blade.php index 68f755131..0b1e67d4a 100644 --- a/resources/views/books/delete.blade.php +++ b/resources/views/books/delete.blade.php @@ -2,16 +2,26 @@ @section('content') + +
-
diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php
index e67e6f459..2419b68da 100644
--- a/resources/views/books/edit.blade.php
+++ b/resources/views/books/edit.blade.php
@@ -2,8 +2,18 @@
@section('content')
+
+
Delete Book
-This will delete the book with the name '{{$book->name}}', All pages and chapters will be removed.
-Are you sure you want to delete this book?
+{{ trans('entities.books_delete') }}
+{{ trans('entities.books_delete_explain', ['bookName' => $book->name]) }}
+{{ trans('entities.books_delete_confirmation') }}
-