Jelajahi Sumber

tweaks to image upload
add more strings

causefx 8 tahun lalu
induk
melakukan
fb444035af

+ 2 - 0
api/functions/organizr-functions.php

@@ -278,6 +278,8 @@ function editImages(){
         }
     }
     if(!empty($filesCheck)){
+        ini_set('upload_max_filesize', '10M');
+        ini_set('post_max_size', '10M');
         $tempFile = $_FILES['file']['tmp_name'];
         $targetPath = dirname(__DIR__,2).DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'tabs'.DIRECTORY_SEPARATOR;
         $targetFile =  $targetPath. $_FILES['file']['name'];

+ 1 - 1
api/pages/settings-image-manager.php

@@ -24,7 +24,7 @@ $pageSettingsImageManager = '
         </div>
     </div>
 </div>
-<form action="#" id="new-image-form" class="mfp-hide white-popup-block mfp-with-anim dropzone">
+<form action="#" id="new-image-form" class="mfp-hide white-popup-block mfp-with-anim dropzone" enctype="multipart/form-data">
     <h1 lang="en">Upload Image</h1>
     <div class="fallback">
         <input name="file" type="file" multiple />

+ 1 - 0
js/functions.js

@@ -5,6 +5,7 @@ var lang = new Lang();
 lang.dynamic('th', 'js/langpack/th.json');
 lang.dynamic('de', 'js/langpack/de.json');
 lang.dynamic('nb', 'js/langpack/nb.json');
+lang.dynamic('strings', 'js/langpack/strings.json');
 lang.init({
 	defaultLang: 'en',
 	currentLang: language(moment.locale(navigator.languages[0])),

+ 5 - 5
plugins/bower_components/dropzone-master/dist/dropzone.js

@@ -105,9 +105,9 @@
 
     /*
     This is a list of all available events you can register on a dropzone object.
-    
+
     You can register an event handler like this:
-    
+
         dropzone.on("dragEnter", function() { });
      */
 
@@ -170,7 +170,7 @@
           }
         }
         if (!messageElement) {
-          messageElement = Dropzone.createElement("<div class=\"dz-message\"><span></span></div>");
+          messageElement = Dropzone.createElement("<div class=\"dz-message\"><span lang=\"en\"></span></div>");
           this.element.appendChild(messageElement);
         }
         span = messageElement.getElementsByTagName("span")[0];
@@ -537,7 +537,7 @@
         this.element.setAttribute("enctype", "multipart/form-data");
       }
       if (this.element.classList.contains("dropzone") && !this.element.querySelector(".dz-message")) {
-        this.element.appendChild(Dropzone.createElement("<div class=\"dz-default dz-message\"><span>" + this.options.dictDefaultMessage + "</span></div>"));
+        this.element.appendChild(Dropzone.createElement("<div class=\"dz-default dz-message\"><span lang=\"en\">" + this.options.dictDefaultMessage + "</span></div>"));
       }
       if (this.clickableElements.length) {
         setupHiddenFileInput = (function(_this) {
@@ -1655,7 +1655,7 @@
 
 
   /*
-  
+
   Bugfix for iOS 6 and 7
   Source: http://stackoverflow.com/questions/11929099/html5-canvas-drawimage-ratio-bug-ios
   based on the work of https://github.com/stomita/ios-imagefile-megapixel