Started work on drawing revisions

Improved sidebar and selection styling of image manager.
Allowed image manager imageType to be changed on open.
Created models for image revisions.

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 8437c80d71d1ac58b1565fcc56fc66be45a63af0..277c27069127856b393a3631a7d9270d0ddf43d5 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -245,26 +245,28 @@ class ImageController extends Controller
     }
 
     /**
     }
 
     /**

-     * Deletes an image and all thumbnail/image files
+     * Show the usage of an image on pages.

      * @param EntityRepo $entityRepo
      * @param EntityRepo $entityRepo

-     * @param Request $request
+     * @param $id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function usage(EntityRepo $entityRepo, $id)
+    {
+        $image = $this->imageRepo->getById($id);
+        $pageSearch = $entityRepo->searchForImage($image->url);
+        return response()->json($pageSearch);
+    }
+
+    /**
+     * Deletes an image and all thumbnail/image files

      * @param int $id
      * @return \Illuminate\Http\JsonResponse
      */
      * @param int $id
      * @return \Illuminate\Http\JsonResponse
      */

-    public function destroy(EntityRepo $entityRepo, Request $request, $id)
+    public function destroy($id)

     {
         $image = $this->imageRepo->getById($id);
         $this->checkOwnablePermission('image-delete', $image);
 
     {
         $image = $this->imageRepo->getById($id);
         $this->checkOwnablePermission('image-delete', $image);
 

-        // Check if this image is used on any pages
-        $isForced = in_array($request->get('force', ''), [true, 'true']);
-        if (!$isForced) {
-            $pageSearch = $entityRepo->searchForImage($image->url);
-            if ($pageSearch !== false) {
-                return response()->json($pageSearch, 400);
-            }
-        }
-

         $this->imageRepo->destroyImage($image);
         return response()->json(trans('components.images_deleted'));
     }
         $this->imageRepo->destroyImage($image);
         return response()->json(trans('components.images_deleted'));
     }

diff --git a/app/Image.php b/app/Image.php
index ad23a077adc5ba12cb652ad55043fa3289101f4d..30bbe21e29b9aef942094ca2355ac27c928093ae 100644 (file)
--- a/app/Image.php
+++ b/app/Image.php
@@ -9,13 +9,23 @@ class Image extends Ownable
 
     /**
      * Get a thumbnail for this image.
 
     /**
      * Get a thumbnail for this image.

-     * @param  int       $width
-     * @param  int       $height
+     * @param  int $width
+     * @param  int $height

      * @param bool|false $keepRatio
      * @return string
      * @param bool|false $keepRatio
      * @return string

+     * @throws \Exception

      */
     public function getThumb($width, $height, $keepRatio = false)
     {
         return Images::getThumbnail($this, $width, $height, $keepRatio);
     }
      */
     public function getThumb($width, $height, $keepRatio = false)
     {
         return Images::getThumbnail($this, $width, $height, $keepRatio);
     }

+
+    /**
+     * Get the revisions for this image.
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function revisions()
+    {
+        return $this->hasMany(ImageRevision::class);
+    }

 }
 }

diff --git a/app/ImageRevision.php b/app/ImageRevision.php
new file mode 100644 (file)
index 0000000..fde2328
--- /dev/null
+++ b/app/ImageRevision.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace BookStack;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ImageRevision extends Model
+{
+    /**
+     * Relation for the user that created this entity.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function createdBy()
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+
+    /**
+     * Get the image that this is a revision of.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function image()
+    {
+        return $this->belongsTo(Image::class);
+    }
+}

diff --git a/database/migrations/2018_05_13_090521_create_image_revisions_table.php b/database/migrations/2018_05_13_090521_create_image_revisions_table.php
new file mode 100644 (file)
index 0000000..968773a
--- /dev/null
+++ b/database/migrations/2018_05_13_090521_create_image_revisions_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateImageRevisionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('image_revisions', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('image_id');
+            $table->string('path');
+            $table->string('url');
+            $table->integer('created_by');
+
+            $table->index('image_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('image_revisions');
+    }
+}

diff --git a/resources/assets/js/components/wysiwyg-editor.js b/resources/assets/js/components/wysiwyg-editor.js
index 56aa294fadac9980d9f778a13b1a8d66de7ef388..03d73d2b5b8eb3f4753d873383c7a4605b65ab0f 100644 (file)
--- a/resources/assets/js/components/wysiwyg-editor.js
+++ b/resources/assets/js/components/wysiwyg-editor.js
@@ -221,8 +221,6 @@ function codePlugin() {
 
 function drawIoPlugin() {
 
 
 function drawIoPlugin() {
 

-    const drawIoUrl = 'https://www.draw.io/?embed=1&ui=atlas&spin=1&proto=json';
-    let iframe = null;

     let pageEditor = null;
     let currentNode = null;
 
     let pageEditor = null;
     let currentNode = null;
 


@@ -230,6 +228,20 @@ function drawIoPlugin() {
         return node.hasAttribute('drawio-diagram');
     }
 
         return node.hasAttribute('drawio-diagram');
     }
 

+    function showDrawingManager(mceEditor, selectedNode = null) {
+        // TODO - Handle how image manager links in.
+        // Show image manager
+        window.ImageManager.show(function (image) {
+
+
+            // // Replace the actively selected content with the linked image
+            // let html = `<a href="${image.url}" target="_blank">`;
+            // html += `<img src="${image.thumbs.display}" alt="${image.name}">`;
+            // html += '</a>';
+            // win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html);
+        }, 'drawio');
+    }
+

     function showDrawingEditor(mceEditor, selectedNode = null) {
         pageEditor = mceEditor;
         currentNode = selectedNode;
     function showDrawingEditor(mceEditor, selectedNode = null) {
         pageEditor = mceEditor;
         currentNode = selectedNode;


@@ -287,7 +299,12 @@ function drawIoPlugin() {
     window.tinymce.PluginManager.add('drawio', function(editor, url) {
 
         editor.addCommand('drawio', () => {
     window.tinymce.PluginManager.add('drawio', function(editor, url) {
 
         editor.addCommand('drawio', () => {

-            showDrawingEditor(editor);
+            let selectedNode = editor.selection.getNode();
+            if (isDrawing(selectedNode)) {
+                showDrawingManager(editor, selectedNode);
+            } else {
+                showDrawingEditor(editor);
+            }

         });
 
         editor.addButton('drawio', {
         });
 
         editor.addButton('drawio', {


@@ -443,7 +460,7 @@ class WysiwygEditor {
                         html += `<img src="${image.thumbs.display}" alt="${image.name}">`;
                         html += '</a>';
                         win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html);
                         html += `<img src="${image.thumbs.display}" alt="${image.name}">`;
                         html += '</a>';
                         win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html);

-                    });
+                    }, 'gallery');

                 }
 
             },
                 }
 
             },

diff --git a/resources/assets/js/vues/image-manager.js b/resources/assets/js/vues/image-manager.js
index 89fe6769e37091a862fc334c5799762cbefac522..bef6661929315e470842c5c6a9381655ccbe5943 100644 (file)
--- a/resources/assets/js/vues/image-manager.js
+++ b/resources/assets/js/vues/image-manager.js
@@ -26,17 +26,22 @@ const data = {
 
     imageUpdateSuccess: false,
     imageDeleteSuccess: false,
 
     imageUpdateSuccess: false,
     imageDeleteSuccess: false,

+    deleteConfirm: false,

 };
 
 const methods = {
 
 };
 
 const methods = {
 

-    show(providedCallback) {
+    show(providedCallback, imageType = null) {

         callback = providedCallback;
         this.showing = true;
         this.$el.children[0].components.overlay.show();
 
         // Get initial images if they have not yet been loaded in.
         callback = providedCallback;
         this.showing = true;
         this.$el.children[0].components.overlay.show();
 
         // Get initial images if they have not yet been loaded in.

-        if (dataLoaded) return;
+        if (dataLoaded && imageType === this.imageType) return;
+        if (imageType) {
+            this.imageType = imageType;
+            this.resetState();
+        }

         this.fetchData();
         dataLoaded = true;
     },
         this.fetchData();
         dataLoaded = true;
     },


@@ -62,13 +67,18 @@ const methods = {
     },
 
     setView(viewName) {
     },
 
     setView(viewName) {

+        this.view = viewName;
+        this.resetState();
+        this.fetchData();
+    },
+
+    resetState() {

         this.cancelSearch();
         this.images = [];
         this.hasMore = false;
         this.cancelSearch();
         this.images = [];
         this.hasMore = false;

+        this.deleteConfirm = false;

         page = 0;
         page = 0;

-        this.view = viewName;
-        baseUrl = window.baseUrl(`/images/${this.imageType}/${viewName}/`);
-        this.fetchData();
+        baseUrl = window.baseUrl(`/images/${this.imageType}/${this.view}/`);

     },
 
     searchImages() {
     },
 
     searchImages() {


@@ -105,6 +115,7 @@ const methods = {
             this.callbackAndHide(image);
         } else {
             this.selectedImage = image;
             this.callbackAndHide(image);
         } else {
             this.selectedImage = image;

+            this.deleteConfirm = false;

             this.dependantPages = false;
         }
 
             this.dependantPages = false;
         }
 


@@ -134,17 +145,22 @@ const methods = {
     },
 
     deleteImage() {
     },
 
     deleteImage() {

-        let force = this.dependantPages !== false;
-        let url = window.baseUrl('/images/' + this.selectedImage.id);
-        if (force) url += '?force=true';
-        this.$http.delete(url).then(response => {
+
+        if (!this.deleteConfirm) {
+            let url = window.baseUrl(`/images/usage/${this.selectedImage.id}`);
+            this.$http.get(url).then(resp => {
+                this.dependantPages = resp.data;
+            }).catch(console.error).then(() => {
+                this.deleteConfirm = true;
+            });
+            return;
+        }
+
+        this.$http.delete(`/images/${this.selectedImage.id}`).then(resp => {

             this.images.splice(this.images.indexOf(this.selectedImage), 1);
             this.selectedImage = false;
             this.$events.emit('success', trans('components.image_delete_success'));
             this.images.splice(this.images.indexOf(this.selectedImage), 1);
             this.selectedImage = false;
             this.$events.emit('success', trans('components.image_delete_success'));

-        }).catch(error=> {
-            if (error.response.status === 400) {
-                this.dependantPages = error.response.data;
-            }
+            this.deleteConfirm = false;

         });
     },
 
         });
     },
 

diff --git a/resources/assets/sass/_components.scss b/resources/assets/sass/_components.scss
index 31e006e27d7b492f64d3fe41741886b2043da7be..27dcfda64f9a0a2e3c2c74d2b42386f68f2643e0 100644 (file)
--- a/resources/assets/sass/_components.scss
+++ b/resources/assets/sass/_components.scss
@@ -146,7 +146,8 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 .dropzone-container {
   position: relative;
 
 .dropzone-container {
   position: relative;

-  border: 3px dashed #DDD;
+  background-color: #EEE;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3E%3Cpath fill='%23a9a9a9' fill-opacity='0.52' d='M1 3h1v1H1V3zm2-2h1v1H3V1z'%3E%3C/path%3E%3C/svg%3E");

 }
 
 .image-manager-list .image {
 }
 
 .image-manager-list .image {


@@ -163,8 +164,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   transition: all cubic-bezier(.4, 0, 1, 1) 160ms;
   overflow: hidden;
   &.selected {
   transition: all cubic-bezier(.4, 0, 1, 1) 160ms;
   overflow: hidden;
   &.selected {

-    transform: scale3d(0.92, 0.92, 0.92);
-    border: 1px solid #444;
+    //transform: scale3d(0.92, 0.92, 0.92);
+    border: 4px solid #FFF;
+    overflow: hidden;
+    border-radius: 8px;

     box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
   }
   img {
     box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
   }
   img {


@@ -210,12 +213,21 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 .image-manager-sidebar {
   width: 300px;
   margin-left: 1px;
 .image-manager-sidebar {
   width: 300px;
   margin-left: 1px;

-  padding: $-m $-l;

   overflow-y: auto;
   overflow-x: hidden;
   border-left: 1px solid #DDD;
   overflow-y: auto;
   overflow-x: hidden;
   border-left: 1px solid #DDD;

+  .inner {
+    padding: $-m;
+  }
+  img {
+    max-width: 100%;
+    max-height: 200px;
+    display: block;
+    margin: 0 auto $-m auto;
+    box-shadow: $bs-light;
+  }

   .dropzone-container {
   .dropzone-container {

-    margin-top: $-m;
+    border-bottom: 1px solid #DDD;

   }
 }
 
   }
 }
 


@@ -242,10 +254,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
  * Copyright (c) 2012 Matias Meno <[email protected]>
  */
 .dz-message {
  * Copyright (c) 2012 Matias Meno <[email protected]>
  */
 .dz-message {

-  font-size: 1.2em;
-  line-height: 1.1;
+  font-size: 1em;
+  line-height: 2.35;

   font-style: italic;
   font-style: italic;

-  color: #aaa;
+  color: #888;

   text-align: center;
   cursor: pointer;
   padding: $-l $-m;
   text-align: center;
   cursor: pointer;
   padding: $-l $-m;

diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss
index c7d288ad387f3ced379a5b7e7596a51fbee8c027..0b2dfbf75942ab95984315cc32a7f499bab4c60c 100644 (file)
--- a/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@ -154,6 +154,7 @@ $btt-size: 40px;
   }
   input {
     flex: 5;
   }
   input {
     flex: 5;

+    padding: $-xs $-s;

     &:focus, &:active {
       outline: 0;
     }
     &:focus, &:active {
       outline: 0;
     }

diff --git a/resources/lang/de/components.php b/resources/lang/de/components.php
index 510af4dd34da959a5e6c5d3ed3989f1c65c4aee0..af07f26982077eb7e58c06cd772a58cc2aca19a6 100644 (file)
--- a/resources/lang/de/components.php
+++ b/resources/lang/de/components.php
@@ -12,7 +12,8 @@ return [
     'image_uploaded' => 'Hochgeladen am :uploadedDate',
     'image_load_more' => 'Mehr',
     'image_image_name' => 'Bildname',
     'image_uploaded' => 'Hochgeladen am :uploadedDate',
     'image_load_more' => 'Mehr',
     'image_image_name' => 'Bildname',

-    'image_delete_confirm' => 'Dieses Bild wird auf den folgenden Seiten benutzt. Bitte klicken Sie erneut auf löschen, wenn Sie dieses Bild wirklich entfernen möchten.',
+    'image_delete_used' => 'Dieses Bild wird auf den folgenden Seiten benutzt. ',
+    'image_delete_confirm' => 'Bitte klicken Sie erneut auf löschen, wenn Sie dieses Bild wirklich entfernen möchten.',

     'image_select_image' => 'Bild auswählen',
     'image_dropzone' => 'Ziehen Sie Bilder hierher oder klicken Sie, um ein Bild auszuwählen',
     'images_deleted' => 'Bilder gelöscht',
     'image_select_image' => 'Bild auswählen',
     'image_dropzone' => 'Ziehen Sie Bilder hierher oder klicken Sie, um ein Bild auszuwählen',
     'images_deleted' => 'Bilder gelöscht',

diff --git a/resources/lang/en/components.php b/resources/lang/en/components.php
index 2266fe2b233890fcc5b2539166bdae3ee6d98449..c093f731605150d3aa56c162db6e3a649fe85a2c 100644 (file)
--- a/resources/lang/en/components.php
+++ b/resources/lang/en/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Uploaded :uploadedDate',
     'image_load_more' => 'Load More',
     'image_image_name' => 'Image Name',
     'image_uploaded' => 'Uploaded :uploadedDate',
     'image_load_more' => 'Load More',
     'image_image_name' => 'Image Name',

-    'image_delete_confirm' => 'This image is used in the pages below, Click delete again to confirm you want to delete this image.',
+    'image_delete_used' => 'This image is used in the pages below.',
+    'image_delete_confirm' => 'Click delete again to confirm you want to delete this image.',

     'image_select_image' => 'Select Image',
     'image_dropzone' => 'Drop images or click here to upload',
     'images_deleted' => 'Images Deleted',
     'image_select_image' => 'Select Image',
     'image_dropzone' => 'Drop images or click here to upload',
     'images_deleted' => 'Images Deleted',

diff --git a/resources/lang/es/components.php b/resources/lang/es/components.php
index a13d5d4fbc51d31126d0a22508281987c23f8b54..cdcba487d1faba8739fa207707e6ca1427658213 100644 (file)
--- a/resources/lang/es/components.php
+++ b/resources/lang/es/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Subido el :uploadedDate',
     'image_load_more' => 'Cargar más',
     'image_image_name' => 'Nombre de imagen',
     'image_uploaded' => 'Subido el :uploadedDate',
     'image_load_more' => 'Cargar más',
     'image_image_name' => 'Nombre de imagen',

-    'image_delete_confirm' => 'Esta imagen está siendo utilizada en las páginas mostradas a continuación, haga click de nuevo para confirmar que quiere borrar esta imagen.',
+    'image_delete_used' => 'Esta imagen está siendo utilizada en las páginas mostradas a continuación.',
+    'image_delete_confirm' => 'Haga click de nuevo para confirmar que quiere borrar esta imagen.',

     'image_select_image' => 'Seleccionar Imagen',
     'image_dropzone' => 'Arrastre las imágenes o hacer click aquí para Subir',
     'images_deleted' => 'Imágenes borradas',
     'image_select_image' => 'Seleccionar Imagen',
     'image_dropzone' => 'Arrastre las imágenes o hacer click aquí para Subir',
     'images_deleted' => 'Imágenes borradas',

diff --git a/resources/lang/es_AR/components.php b/resources/lang/es_AR/components.php
index ef4f33111635e5c60a877395cf5426a4c571fd5a..ea61f5f4ca0f4e3e98b085b3990651c5a99746d2 100644 (file)
--- a/resources/lang/es_AR/components.php
+++ b/resources/lang/es_AR/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Subido el :uploadedDate',
     'image_load_more' => 'Cargar más',
     'image_image_name' => 'Nombre de imagen',
     'image_uploaded' => 'Subido el :uploadedDate',
     'image_load_more' => 'Cargar más',
     'image_image_name' => 'Nombre de imagen',

-    'image_delete_confirm' => 'Esta imagen esta siendo utilizada en las páginas a continuación, haga click de nuevo para confirmar que quiere borrar esta imagen.',
+    'image_delete_used' => 'Esta imagen esta siendo utilizada en las páginas a continuación.',
+    'image_delete_confirm' => 'Haga click de nuevo para confirmar que quiere borrar esta imagen.',

     'image_select_image' => 'Seleccionar Imagen',
     'image_dropzone' => 'Arrastre las imágenes o hacer click aquí para Subir',
     'images_deleted' => 'Imágenes borradas',
     'image_select_image' => 'Seleccionar Imagen',
     'image_dropzone' => 'Arrastre las imágenes o hacer click aquí para Subir',
     'images_deleted' => 'Imágenes borradas',

diff --git a/resources/lang/fr/components.php b/resources/lang/fr/components.php
index ddfe665d95b89a6172fac1724990ef1366192b14..438137b5ede40bbebc88b8aba06e21385eba3c1b 100644 (file)
--- a/resources/lang/fr/components.php
+++ b/resources/lang/fr/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Ajoutée le :uploadedDate',
     'image_load_more' => 'Charger plus',
     'image_image_name' => 'Nom de l\'image',
     'image_uploaded' => 'Ajoutée le :uploadedDate',
     'image_load_more' => 'Charger plus',
     'image_image_name' => 'Nom de l\'image',

-    'image_delete_confirm' => 'Cette image est utilisée dans les pages ci-dessous. Confirmez que vous souhaitez bien supprimer cette image.',
+    'image_delete_used' => 'Cette image est utilisée dans les pages ci-dessous.',
+    'image_delete_confirm' => 'Confirmez que vous souhaitez bien supprimer cette image.',

     'image_select_image' => 'Selectionner l\'image',
     'image_dropzone' => 'Glissez les images ici ou cliquez pour les ajouter',
     'images_deleted' => 'Images supprimées',
     'image_select_image' => 'Selectionner l\'image',
     'image_dropzone' => 'Glissez les images ici ou cliquez pour les ajouter',
     'images_deleted' => 'Images supprimées',

diff --git a/resources/lang/it/components.php b/resources/lang/it/components.php
index 081a4c0e6e46b8fa32d0214f5f08f36a4e6b3e0b..c9ab18a3ecfbcdf979958480ebfde43f86a2f0ee 100755 (executable)
--- a/resources/lang/it/components.php
+++ b/resources/lang/it/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Uploaded :uploadedDate',
     'image_load_more' => 'Carica Altre',
     'image_image_name' => 'Nome Immagine',
     'image_uploaded' => 'Uploaded :uploadedDate',
     'image_load_more' => 'Carica Altre',
     'image_image_name' => 'Nome Immagine',

-    'image_delete_confirm' => 'Questa immagine è usata nelle pagine elencate, clicca elimina nuovamente per confermare.',
+    'image_delete_used' => 'Questa immagine è usata nelle pagine elencate.',
+    'image_delete_confirm' => 'Clicca elimina nuovamente per confermare.',

     'image_select_image' => 'Seleziona Immagine',
     'image_dropzone' => 'Rilascia immagini o clicca qui per caricarle',
     'images_deleted' => 'Immagini Eliminate',
     'image_select_image' => 'Seleziona Immagine',
     'image_dropzone' => 'Rilascia immagini o clicca qui per caricarle',
     'images_deleted' => 'Immagini Eliminate',

diff --git a/resources/lang/ja/components.php b/resources/lang/ja/components.php
index 8e9eb2e475fe37ca75e65309206e2928e14578b5..53a9cda1ba4f2698e33be5f772ee54de610ec721 100644 (file)
--- a/resources/lang/ja/components.php
+++ b/resources/lang/ja/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'アップロード日時: :uploadedDate',
     'image_load_more' => 'さらに読み込む',
     'image_image_name' => '画像名',
     'image_uploaded' => 'アップロード日時: :uploadedDate',
     'image_load_more' => 'さらに読み込む',
     'image_image_name' => '画像名',

-    'image_delete_confirm' => 'この画像は以下のページで利用されています。削除してもよろしければ、再度ボタンを押して下さい。',
+    'image_delete_used' => 'この画像は以下のページで利用されています。',
+    'image_delete_confirm' => '削除してもよろしければ、再度ボタンを押して下さい。',

     'image_select_image' => '選択',
     'image_dropzone' => '画像をドロップするか、クリックしてアップロード',
     'images_deleted' => '画像を削除しました',
     'image_select_image' => '選択',
     'image_dropzone' => '画像をドロップするか、クリックしてアップロード',
     'images_deleted' => '画像を削除しました',

diff --git a/resources/lang/nl/components.php b/resources/lang/nl/components.php
index fb306820e4b69169691f243eb3708544c80016df..576298ef2b2211fcc83f5436469b252438ac2f60 100644 (file)
--- a/resources/lang/nl/components.php
+++ b/resources/lang/nl/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Uploaded :uploadedDate',
     'image_load_more' => 'Meer Laden',
     'image_image_name' => 'Afbeeldingsnaam',
     'image_uploaded' => 'Uploaded :uploadedDate',
     'image_load_more' => 'Meer Laden',
     'image_image_name' => 'Afbeeldingsnaam',

-    'image_delete_confirm' => 'Deze afbeeldingen is op onderstaande pagina\'s in gebruik, Klik opnieuw op verwijderen om de afbeelding echt te verwijderen.',
+    'image_delete_used' => 'Deze afbeeldingen is op onderstaande pagina\'s in gebruik.',
+    'image_delete_confirm' => 'Klik opnieuw op verwijderen om de afbeelding echt te verwijderen.',

     'image_select_image' => 'Kies Afbeelding',
     'image_dropzone' => 'Sleep afbeeldingen hier of klik hier om te uploaden',
     'images_deleted' => 'Verwijderde Afbeeldingen',
     'image_select_image' => 'Kies Afbeelding',
     'image_dropzone' => 'Sleep afbeeldingen hier of klik hier om te uploaden',
     'images_deleted' => 'Verwijderde Afbeeldingen',

diff --git a/resources/lang/pl/components.php b/resources/lang/pl/components.php
index c1dbcd44b3b0edb4775ad151805d4bf60445f2a5..177fdba5f4d11b27c34f2a9f2f3424cfcf56969a 100644 (file)
--- a/resources/lang/pl/components.php
+++ b/resources/lang/pl/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Udostępniono :uploadedDate',
     'image_load_more' => 'Wczytaj więcej',
     'image_image_name' => 'Nazwa obrazka',
     'image_uploaded' => 'Udostępniono :uploadedDate',
     'image_load_more' => 'Wczytaj więcej',
     'image_image_name' => 'Nazwa obrazka',

-    'image_delete_confirm' => 'Ten obrazek jest używany na stronach poniżej, kliknij ponownie Usuń by potwierdzić usunięcie obrazka.',
+    'image_delete_used' => 'Ten obrazek jest używany na stronach poniżej.',
+    'image_delete_confirm' => 'Kliknij ponownie Usuń by potwierdzić usunięcie obrazka.',

     'image_select_image' => 'Wybierz obrazek',
     'image_dropzone' => 'Upuść obrazki tutaj lub kliknij by wybrać obrazki do udostępnienia',
     'images_deleted' => 'Usunięte obrazki',
     'image_select_image' => 'Wybierz obrazek',
     'image_dropzone' => 'Upuść obrazki tutaj lub kliknij by wybrać obrazki do udostępnienia',
     'images_deleted' => 'Usunięte obrazki',

diff --git a/resources/lang/pt_BR/components.php b/resources/lang/pt_BR/components.php
index 03fd4ac0ca8e3182f1d19b22f94218cf03dd38b7..872c00c9fe0c30cd90ce2bc4a398ea2ac1ed9503 100644 (file)
--- a/resources/lang/pt_BR/components.php
+++ b/resources/lang/pt_BR/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Carregado :uploadedDate',
     'image_load_more' => 'Carregar Mais',
     'image_image_name' => 'Nome da Imagem',
     'image_uploaded' => 'Carregado :uploadedDate',
     'image_load_more' => 'Carregar Mais',
     'image_image_name' => 'Nome da Imagem',

-    'image_delete_confirm' => 'Essa imagem é usada nas páginas abaixo. Clique em Excluir novamente para confirmar que você deseja mesmo eliminar a imagem.',
+    'image_delete_used' => 'Essa imagem é usada nas páginas abaixo.',
+    'image_delete_confirm' => 'Clique em Excluir novamente para confirmar que você deseja mesmo eliminar a imagem.',

     'image_select_image' => 'Selecionar Imagem',
     'image_dropzone' => 'Arraste imagens ou clique aqui para fazer upload',
     'images_deleted' => 'Imagens excluídas',
     'image_select_image' => 'Selecionar Imagem',
     'image_dropzone' => 'Arraste imagens ou clique aqui para fazer upload',
     'images_deleted' => 'Imagens excluídas',

diff --git a/resources/lang/ru/components.php b/resources/lang/ru/components.php
index 49aed1e879f6c2235269a020eb4aea14bf298c40..6ee44d6be971e0b49458e73ada7dc6338b98f6fe 100644 (file)
--- a/resources/lang/ru/components.php
+++ b/resources/lang/ru/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Загруженно :uploadedDate',
     'image_load_more' => 'Загрузить ещё',
     'image_image_name' => 'Имя изображения',
     'image_uploaded' => 'Загруженно :uploadedDate',
     'image_load_more' => 'Загрузить ещё',
     'image_image_name' => 'Имя изображения',

-    'image_delete_confirm' => 'Это изображение используется на странице ниже. Снова кликните удалить для подтверждения того что вы хотите удалить.',
+    'image_delete_used' => 'Это изображение используется на странице ниже.',
+    'image_delete_confirm' => 'Снова кликните удалить для подтверждения того что вы хотите удалить.',

     'image_select_image' => 'Выбрать изображение',
     'image_dropzone' => 'Перетащите изображение или кликните для загрузки',
     'images_deleted' => 'Изображения удалены',
     'image_select_image' => 'Выбрать изображение',
     'image_dropzone' => 'Перетащите изображение или кликните для загрузки',
     'images_deleted' => 'Изображения удалены',

diff --git a/resources/lang/sk/components.php b/resources/lang/sk/components.php
index f4fa92043cd640cf3139a90dca22972defe1e1a5..c20b62c7afb4c51645bf12333cb39642e9b8e7aa 100644 (file)
--- a/resources/lang/sk/components.php
+++ b/resources/lang/sk/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Nahrané :uploadedDate',
     'image_load_more' => 'Načítať viac',
     'image_image_name' => 'Názov obrázka',
     'image_uploaded' => 'Nahrané :uploadedDate',
     'image_load_more' => 'Načítať viac',
     'image_image_name' => 'Názov obrázka',

-    'image_delete_confirm' => 'Tento obrázok je použitý na stránkach uvedených nižšie, kliknite znova na zmazať pre potvrdenie zmazania tohto obrázka.',
+    'image_delete_used' => 'Tento obrázok je použitý na stránkach uvedených nižšie.',
+    'image_delete_confirm' => 'Kliknite znova na zmazať pre potvrdenie zmazania tohto obrázka.',

     'image_select_image' => 'Vybrať obrázok',
     'image_dropzone' => 'Presuňte obrázky sem alebo kliknite sem pre nahranie',
     'images_deleted' => 'Obrázky zmazané',
     'image_select_image' => 'Vybrať obrázok',
     'image_dropzone' => 'Presuňte obrázky sem alebo kliknite sem pre nahranie',
     'images_deleted' => 'Obrázky zmazané',

diff --git a/resources/lang/sv/components.php b/resources/lang/sv/components.php
index 7249c5c1f3c654a6a9aee5d98b0416165fb28922..318a2ee5c8f3c880c1a5624d31d88c5ba5535dab 100644 (file)
--- a/resources/lang/sv/components.php
+++ b/resources/lang/sv/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => 'Laddades upp :uploadedDate',
     'image_load_more' => 'Ladda fler',
     'image_image_name' => 'Bildnamn',
     'image_uploaded' => 'Laddades upp :uploadedDate',
     'image_load_more' => 'Ladda fler',
     'image_image_name' => 'Bildnamn',

-    'image_delete_confirm' => 'Den här bilden används på nedanstående sidor, klicka på "ta bort" en gång till för att bekräfta att du vill ta bort bilden.',
+    'image_delete_used' => 'Den här bilden används på nedanstående sidor.',
+    'image_delete_confirm' => 'Klicka på "ta bort" en gång till för att bekräfta att du vill ta bort bilden.',

     'image_select_image' => 'Välj bild',
     'image_dropzone' => 'Släpp bilder här eller klicka för att ladda upp',
     'images_deleted' => 'Bilder borttagna',
     'image_select_image' => 'Välj bild',
     'image_dropzone' => 'Släpp bilder här eller klicka för att ladda upp',
     'images_deleted' => 'Bilder borttagna',

diff --git a/resources/lang/zh_CN/components.php b/resources/lang/zh_CN/components.php
index 9e6f28649dea988cb1a72daf5613385352a2a986..42857b9e776ce450756cf9e379a7475217bc6240 100644 (file)
--- a/resources/lang/zh_CN/components.php
+++ b/resources/lang/zh_CN/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => '上传于 :uploadedDate',
     'image_load_more' => '显示更多',
     'image_image_name' => '图片名称',
     'image_uploaded' => '上传于 :uploadedDate',
     'image_load_more' => '显示更多',
     'image_image_name' => '图片名称',

-    'image_delete_confirm' => '该图像用于以下页面，如果你想删除它，请再次按下按钮。',
+    'image_delete_used' => '该图像用于以下页面。',
+    'image_delete_confirm' => '如果你想删除它，请再次按下按钮。',

     'image_select_image' => '选择图片',
     'image_dropzone' => '拖放图片或点击此处上传',
     'images_deleted' => '图片已删除',
     'image_select_image' => '选择图片',
     'image_dropzone' => '拖放图片或点击此处上传',
     'images_deleted' => '图片已删除',

diff --git a/resources/lang/zh_TW/components.php b/resources/lang/zh_TW/components.php
index ae0a083ad8a84cab7d919e99718cfc5e8c581c86..e8826eebb73ca9222a541c1fe0434cd341edc3e8 100644 (file)
--- a/resources/lang/zh_TW/components.php
+++ b/resources/lang/zh_TW/components.php
@@ -13,7 +13,8 @@ return [
     'image_uploaded' => '上傳於 :uploadedDate',
     'image_load_more' => '載入更多',
     'image_image_name' => '圖片名稱',
     'image_uploaded' => '上傳於 :uploadedDate',
     'image_load_more' => '載入更多',
     'image_image_name' => '圖片名稱',

-    'image_delete_confirm' => '所使用圖片目前用於以下頁面，如果你想刪除它，請再次按下按鈕。',
+    'image_delete_used' => '所使用圖片目前用於以下頁面。',
+    'image_delete_confirm' => '如果你想刪除它，請再次按下按鈕。',

     'image_select_image' => '選擇圖片',
     'image_dropzone' => '拖曳圖片或點選這裡上傳',
     'images_deleted' => '圖片已刪除',
     'image_select_image' => '選擇圖片',
     'image_dropzone' => '拖曳圖片或點選這裡上傳',
     'images_deleted' => '圖片已刪除',

diff --git a/resources/views/components/image-manager.blade.php b/resources/views/components/image-manager.blade.php
index 78c6435d6dc10752b8c472af2321915f47de31e6..45b30697bc9217f98e91cd315bfa03840dfb04ce 100644 (file)
--- a/resources/views/components/image-manager.blade.php
+++ b/resources/views/components/image-manager.blade.php
@@ -1,5 +1,5 @@
 <div id="image-manager" image-type="{{ $imageType }}" uploaded-to="{{ $uploaded_to or 0 }}">
 <div id="image-manager" image-type="{{ $imageType }}" uploaded-to="{{ $uploaded_to or 0 }}">

-    <div overlay v-cloak @click="hide()">
+    <div overlay v-cloak @click="hide">

         <div class="popup-body" @click.stop="">
 
             <div class="popup-header primary-background">
         <div class="popup-body" @click.stop="">
 
             <div class="popup-header primary-background">


@@ -40,6 +40,9 @@
                 </div>
 
                 <div class="image-manager-sidebar">
                 </div>
 
                 <div class="image-manager-sidebar">

+
+                    <dropzone ref="dropzone" placeholder="{{ trans('components.image_dropzone') }}" :upload-url="uploadUrl" :uploaded-to="uploadedTo" @success="uploadSuccess"></dropzone>
+

                     <div class="inner">
 
                         <div class="image-manager-details anim fadeIn" v-if="selectedImage">
                     <div class="inner">
 
                         <div class="image-manager-details anim fadeIn" v-if="selectedImage">


@@ -47,39 +50,43 @@
                             <form @submit.prevent="saveImageDetails">
                                 <div>
                                     <a :href="selectedImage.url" target="_blank" style="display: block;">
                             <form @submit.prevent="saveImageDetails">
                                 <div>
                                     <a :href="selectedImage.url" target="_blank" style="display: block;">

-                                        <img :src="selectedImage.thumbs.gallery" :alt="selectedImage.title"
+                                        <img :src="selectedImage.thumbs.display" :alt="selectedImage.title"

                                              :title="selectedImage.name">
                                     </a>
                                 </div>
                                 <div class="form-group">
                                     <label for="name">{{ trans('components.image_image_name') }}</label>
                                              :title="selectedImage.name">
                                     </a>
                                 </div>
                                 <div class="form-group">
                                     <label for="name">{{ trans('components.image_image_name') }}</label>

-                                    <input id="name" name="name" v-model="selectedImage.name">
+                                    <input id="name" class="input-base" name="name" v-model="selectedImage.name">

                                 </div>
                             </form>
 
                                 </div>
                             </form>
 

-                            <div v-show="dependantPages">
-                                <p class="text-neg text-small">
-                                    {{ trans('components.image_delete_confirm') }}
-                                </p>
-                                <ul class="text-neg">
-                                    <li v-for="page in dependantPages">
-                                        <a :href="page.url" target="_blank" class="text-neg" v-text="page.name"></a>
-                                    </li>
-                                </ul>
-                            </div>
-

                             <div class="clearfix">
                             <div class="clearfix">

-                                <form class="float left" @submit.prevent="deleteImage">
-                                    <button class="button icon neg">@icon('delete')</button>
-                                </form>
-                                <button class="button pos anim fadeIn float right" v-show="selectedImage" @click="callbackAndHide(selectedImage)">
+                                <div class="float left">
+                                    <button type="button" class="button icon outline" @click="deleteImage">@icon('delete')</button>
+
+                                </div>
+                                <button class="button anim fadeIn float right" v-show="selectedImage" @click="callbackAndHide(selectedImage)">

                                     {{ trans('components.image_select_image') }}
                                 </button>
                                     {{ trans('components.image_select_image') }}
                                 </button>

+                                <div class="clearfix"></div>
+                                <div v-show="dependantPages">
+                                    <p class="text-neg text-small">
+                                        {{ trans('components.image_delete_used') }}
+                                    </p>
+                                    <ul class="text-neg">
+                                        <li v-for="page in dependantPages">
+                                            <a :href="page.url" target="_blank" class="text-neg" v-text="page.name"></a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div v-show="deleteConfirm" class="text-neg text-small">
+                                    {{ trans('components.image_delete_confirm') }}
+                                </div>

                             </div>
 
                         </div>
 
                             </div>
 
                         </div>
 

-                        <dropzone ref="dropzone" placeholder="{{ trans('components.image_dropzone') }}" :upload-url="uploadUrl" :uploaded-to="uploadedTo" @success="uploadSuccess"></dropzone>
+

 
                     </div>
                 </div>
 
                     </div>
                 </div>

diff --git a/routes/web.php b/routes/web.php
index f7b2347a5d74a7c091653299270b599d2e816359..0efd19efe46ab19299e5ebb21cdb0cb0b0986ffc 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -97,6 +97,7 @@ Route::group(['middleware' => 'auth'], function () {
         Route::put('/update/{imageId}', 'ImageController@update');
         Route::post('/drawing/upload', 'ImageController@uploadDrawing');
         Route::put('/drawing/upload/{id}', 'ImageController@replaceDrawing');
         Route::put('/update/{imageId}', 'ImageController@update');
         Route::post('/drawing/upload', 'ImageController@uploadDrawing');
         Route::put('/drawing/upload/{id}', 'ImageController@replaceDrawing');

+        Route::get('/usage/{id}', 'ImageController@usage');

         Route::post('/{type}/upload', 'ImageController@uploadByType');
         Route::get('/{type}/all', 'ImageController@getAllByType');
         Route::get('/{type}/all/{page}', 'ImageController@getAllByType');
         Route::post('/{type}/upload', 'ImageController@uploadByType');
         Route::get('/{type}/all', 'ImageController@getAllByType');
         Route::get('/{type}/all/{page}', 'ImageController@getAllByType');