Merge branch 'master' of https://github.com/2amigos/yii2-file-upload-…

…widget

composer.json

@@ -21,10 +21,10 @@
         }
     ],
     "require": {
-        "yiisoft/yii2": "~2.0.0",
-        "yiisoft/yii2-bootstrap": "~2.0.0",
-        "2amigos/yii2-gallery-widget": "~1.0",
-        "bower-asset/blueimp-file-upload": "~9.9"
+        "yiisoft/yii2": "^2.0.0",
+        "yiisoft/yii2-bootstrap": "^2.0.0",
+        "2amigos/yii2-gallery-widget": "^1.0",
+        "bower-asset/blueimp-file-upload": "^9.9"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0"

src/messages/fr/fileupload.php

@@ -25,4 +25,5 @@
     'Error' => 'Erreur',
     'Delete' => 'Supprimer',
     'Processing' => 'Chargement',
+    'Select file...' => 'Sélectionner un fichier...',
 ];

tests/data/test-file-upload-ui.bin

@@ -85,7 +85,7 @@
     <!-- The file upload form used as target for the file upload widget -->
 <div id="model-test-fileupload" data-upload-template-id="template-upload" data-download-template-id="template-download">    <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
     <div class="row fileupload-buttonbar">
-        <div class="col-lg-7">
+        <div class="col-lg-12">
             <!-- The fileinput-button span is used to style the file input field as button -->
             <span class="btn btn-success fileinput-button">
                 <i class="glyphicon glyphicon-plus"></i>
@@ -209,7 +209,7 @@
     <!-- The file upload form used as target for the file upload widget -->
 <div id="w2-fileupload" data-upload-template-id="template-upload" data-download-template-id="template-download">    <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
     <div class="row fileupload-buttonbar">
-        <div class="col-lg-7">
+        <div class="col-lg-12">
             <!-- The fileinput-button span is used to style the file input field as button -->
             <span class="btn btn-success fileinput-button">
                 <i class="glyphicon glyphicon-plus"></i>
@@ -333,7 +333,7 @@
     <!-- The file upload form used as target for the file upload widget -->
 <div id="custom-id-fileupload" data-upload-template-id="template-upload" data-download-template-id="template-download">    <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
     <div class="row fileupload-buttonbar">
-        <div class="col-lg-7">
+        <div class="col-lg-12">
             <!-- The fileinput-button span is used to style the file input field as button -->
             <span class="btn btn-success fileinput-button">
                 <i class="glyphicon glyphicon-plus"></i>