[General] Adds bootstrap3-dialog.

* Updates composer.json and composer.lock. Don't forget to run "composer install". * Adds symlinks to bootstrap3-dialog files in public/js and public/css. * Fixes public/.gitignore to not ignore .js and .css files. (refs #5698, gh-87)
cross-solution · Mar 17, 2015 · dbc25b3 · dbc25b3
1 parent 88871b9
commit dbc25b3
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -44,7 +44,8 @@
         "blueimp/jquery-file-upload": "*",
         "ivaynberg/select2": "3.5.*",
         "tinymce/tinymce": "*",
-        "mikemix/zf2htmlpurifier": "0.*"
+        "mikemix/zf2htmlpurifier": "0.*",
+        "cross-solution/bootstrap3-dialog": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": "4.5.*",

diff --git a/composer.lock b/composer.lock
diff --git a/public/.gitignore b/public/.gitignore
@@ -9,4 +9,7 @@
 !index.php
 !images
 !css
+!css/*.css
 !js
+!js/*.js
+
diff --git a/public/css/bootstrap-dialog.min.css b/public/css/bootstrap-dialog.min.css
@@ -0,0 +1 @@
+../../vendor/cross-solution/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css
diff --git a/public/js/bootstrap-dialog.min.js b/public/js/bootstrap-dialog.min.js
@@ -0,0 +1 @@
+../../vendor/cross-solution/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js