"+b(this).html()+"
");b(e).addClass(r.uploadButtonClass);(function k(){if(b.fn.ajaxForm){if(r.dragDrop){var s=b('');b(m).before(s);b(s).append(e);b(s).prepend(b(r.dragDropStr));f(m,r,s)}else{b(m).before(e)}q(m,d,r,e)}else{window.setTimeout(k,10)}})();this.startUpload=function(){b("."+this.formGroup).each(function(u,s){if(b(this).is("form")){b(this).submit()}})};this.stopUpload=function(){b(".upload-red").each(function(u,s){if(b(this).hasClass(m.formGroup)){b(this).click()}})};this.getResponses=function(){return this.responses};var g=false;function j(){if(r.afterUploadAll&&!g){g=true;(function s(){if(m.sCounter!=0&&(m.sCounter+m.fCounter==m.tCounter)){r.afterUploadAll(m);g=false}else{window.setTimeout(s,100)}})()}}function f(w,u,v){v.on("dragenter",function(s){s.stopPropagation();s.preventDefault();b(this).css("border","3px dashed #ddd")});v.on("dragover",function(s){s.stopPropagation();s.preventDefault()});v.on("drop",function(x){b(this).css("border","3px dashed #ddd");x.preventDefault();w.errorLog.html("");var s=x.originalEvent.dataTransfer.files;if(!u.multiple&&s.length>1){if(u.showError){b(""+u.multiDragErrorStr+"
").appendTo(w.errorLog)}return}if(u.onSelect(s)==false){return}l(u,w,s)});b(document).on("dragenter",function(s){s.stopPropagation();s.preventDefault()});b(document).on("dragover",function(s){s.stopPropagation();s.preventDefault();v.css("border","3px dashed #ddd")});b(document).on("drop",function(s){s.stopPropagation();s.preventDefault();v.css("border","3px dashed #ddd")})}function i(s){var v="";var u=s/1024;if(parseInt(u)>1024){var w=u/1024;v=w.toFixed(2)+" MB"}else{v=u.toFixed(2)+" KB"}return v}function o(x){var y=[];if(jQuery.type(x)=="string"){y=x.split("&")}else{y=b.param(x).split("&")}var u=y.length;var s=[];var w,v;for(w=0;w"+H.sizeErrorStr+"
").appendTo(B.errorLog)}continue}if(H.maxFileCount!=-1&&B.selectedFiles>=H.maxFileCount){if(H.showError){b(""+H.maxFileCountErrorStr+"
").appendTo(B.errorLog)}continue}B.selectedFiles++;var D=H;var w=new FormData();var A=H.fileName.replace("[]","");w.append(A,u[C]);var y=H.formData;if(y){var F=o(y);for(var z=0;z"}y.fileCounter++}if(D.maxFileCount!=-1&&(y.selectedFiles+G.length)>D.maxFileCount){if(D.showError){b("
"+D.maxFileCountErrorStr+"
").appendTo(y.errorLog)}return}y.selectedFiles+=G.length;var s=new p(y,D);s.filename.html(E);n(w,D,s,G,y)}});w.css({margin:0,padding:0});var C=b(u).width()+10;if(C==10){C=120}var x=u.height()+10;if(x==10){x=35}u.css({position:"relative",overflow:"hidden",cursor:"default"});z.css({position:"absolute",cursor:"pointer",top:"0px",width:'100%',height:'34px',left:"0px","z-index":"100",opacity:"0.0",filter:"alpha(opacity=0)","-ms-filter":"alpha(opacity=0)","-khtml-opacity":"0.0","-moz-opacity":"0.0"});w.appendTo(u)}function p(v,u){this.statusbar=b("");this.filename=b("").appendTo(this.statusbar);this.progressDiv=b("").appendTo(this.statusbar).hide();this.progressbar=b("").appendTo(this.progressDiv);this.abort=b(""+y.uploadErrorStr+"
");u.cancel.show();z.remove();u.cancel.click(function(){u.statusbar.remove()});return false},beforeSend:function(B,s){u.progressDiv.show();u.cancel.hide();u.done.hide();if(y.showAbort){u.abort.show();u.abort.click(function(){B.abort();A.selectedFiles-=w.length})}if(!a.formdata){u.progressbar.width("5%")}else{u.progressbar.width("1%")}},uploadProgress:function(E,s,D,C){if(C>98){C=98}var B=C+"%";if(C>1){u.progressbar.width(B)}if(y.showProgress){u.progressbar.html(B);u.progressbar.css("text-align","center")}},success:function(B,s,C){A.responses.push(B);u.progressbar.width("100%");if(y.showProgress){u.progressbar.html("100%");u.progressbar.css("text-align","center")}u.abort.hide();y.onSuccess.call(this,w,B,C);if(y.showStatusAfterSuccess){if(y.showDone){u.done.show();u.done.click(function(){u.statusbar.hide("slow");u.statusbar.remove()})}else{u.done.hide()}if(y.showDelete){u.del.show();u.del.click(function(){u.statusbar.hide().remove();if(y.deleteCallback){y.deleteCallback.call(this,B,u)}A.selectedFiles-=w.length;h(y,A)})}else{u.del.hide()}}else{u.statusbar.hide("slow");u.statusbar.remove()}z.remove();A.sCounter+=w.length},error:function(C,s,B){u.abort.hide();if(C.statusText=="abort"){u.statusbar.hide("slow").remove();h(y,A)}else{y.onError.call(this,w,s,B);if(y.showStatusAfterError){u.progressDiv.hide();u.statusbar.append("ERROR: "+B+"")}else{u.statusbar.hide();u.statusbar.remove()}A.selectedFiles-=w.length}z.remove();A.fCounter+=w.length}};if(y.autoSubmit){z.ajaxSubmit(v)}else{if(y.showCancel){u.cancel.show();u.cancel.click(function(){z.remove();u.statusbar.remove();A.selectedFiles-=w.length;h(y,A)})}z.ajaxForm(v)}}return this}}(jQuery));
\ No newline at end of file
+(function(b){if(b.fn.ajaxForm==undefined){}var a={};a.fileapi=b("").get(0).files!==undefined;a.formdata=window.FormData!==undefined;b.fn.uploadFile=function(t){var r=b.extend({url:"",method:"POST",enctype:"multipart/form-data",formData:null,returnType:null,allowedTypes:"*",fileName:"file",formData:{},dynamicFormData:function(){return{}},maxFileSize:-1,maxFileCount:-1,multiple:true,dragDrop:true,autoSubmit:true,showCancel:true,showAbort:true,showDone:true,showDelete:false,showError:true,showStatusAfterSuccess:true,showStatusAfterError:true,showFileCounter:true,fileCounterStyle:"). ",showProgress:false,onSelect:function(s){return true},onSubmit:function(s,u){},onSuccess:function(u,s,v){},onError:function(v,s,u){},deleteCallback:false,afterUploadAll:false,uploadButtonClass:"upload",dragDropStr:"",abortStr:"Abort",cancelStr:"Cancel",deletelStr:"Delete",doneStr:"Done",multiDragErrorStr:"Multiple File Drag & Drop is not allowed.",extErrorStr:"",sizeErrorStr:"",uploadErrorStr:"Upload is not allowed",maxFileCountErrorStr:""},t);this.fileCounter=1;this.selectedFiles=0;this.fCounter=0;this.sCounter=0;this.tCounter=0;var d="upload-"+(new Date().getTime());this.formGroup=d;this.hide();this.errorLog=b("");this.after(this.errorLog);this.responses=[];if(!a.formdata){r.dragDrop=false}if(!a.formdata){r.multiple=false}var m=this;var e=b(""+u.abortStr+"
").appendTo(this.statusbar).hide();this.cancel=b(""+u.cancelStr+"
").appendTo(this.statusbar).hide();this.done=b(""+u.doneStr+"
").appendTo(this.statusbar).hide();this.del=b(""+u.deletelStr+"
").appendTo(this.statusbar).hide();v.errorLog.after(this.statusbar);return this}function n(z,y,u,w,A){var x=null;var v={cache:false,contentType:false,processData:false,forceSync:false,data:y.formData,formData:y.fileData,dataType:y.returnType,beforeSubmit:function(F,C,E){if(y.onSubmit.call(this,w)!=false){var B=y.dynamicFormData();if(B){var s=o(B);if(s){for(var D=0;D"+b(this).html()+"
");b(e).addClass(r.uploadButtonClass);(function k(){if(b.fn.ajaxForm){if(r.dragDrop){var s=b('');b(m).before(s);b(s).append(e);b(s).prepend(b(r.dragDropStr));f(m,r,s)}else{b(m).before(e)}q(m,d,r,e)}else{window.setTimeout(k,10)}})();this.startUpload=function(){b("."+this.formGroup).each(function(u,s){if(b(this).is("form")){b(this).submit()}})};this.stopUpload=function(){b(".upload-red").each(function(u,s){if(b(this).hasClass(m.formGroup)){b(this).click()}})};this.getResponses=function(){return this.responses};var g=false;function j(){if(r.afterUploadAll&&!g){g=true;(function s(){if(m.sCounter!=0&&(m.sCounter+m.fCounter==m.tCounter)){r.afterUploadAll(m);g=false}else{window.setTimeout(s,100)}})()}}function f(w,u,v){v.on("dragenter",function(s){s.stopPropagation();s.preventDefault();b(this).css("border","2px dashed #ddd")});v.on("dragover",function(s){s.stopPropagation();s.preventDefault()});v.on("drop",function(x){b(this).css("border","2px dashed #ddd");x.preventDefault();w.errorLog.html("");var s=x.originalEvent.dataTransfer.files;if(!u.multiple&&s.length>1){if(u.showError){b(""+u.multiDragErrorStr+"
").appendTo(w.errorLog)}return}if(u.onSelect(s)==false){return}l(u,w,s)});b(document).on("dragenter",function(s){s.stopPropagation();s.preventDefault()});b(document).on("dragover",function(s){s.stopPropagation();s.preventDefault();v.css("border","2px dashed #ddd")});b(document).on("drop",function(s){s.stopPropagation();s.preventDefault();v.css("border","2px dashed #ddd")})}function i(s){var v="";var u=s/1024;if(parseInt(u)>1024){var w=u/1024;v=w.toFixed(2)+" MB"}else{v=u.toFixed(2)+" KB"}return v}function o(x){var y=[];if(jQuery.type(x)=="string"){y=x.split("&")}else{y=b.param(x).split("&")}var u=y.length;var s=[];var w,v;for(w=0;w"+H.sizeErrorStr+"
").appendTo(B.errorLog)}continue}if(H.maxFileCount!=-1&&B.selectedFiles>=H.maxFileCount){if(H.showError){b(""+H.maxFileCountErrorStr+"
").appendTo(B.errorLog)}continue}B.selectedFiles++;var D=H;var w=new FormData();var A=H.fileName.replace("[]","");w.append(A,u[C]);var y=H.formData;if(y){var F=o(y);for(var z=0;z"}y.fileCounter++}if(D.maxFileCount!=-1&&(y.selectedFiles+G.length)>D.maxFileCount){if(D.showError){b("
"+D.maxFileCountErrorStr+"
").appendTo(y.errorLog)}return}y.selectedFiles+=G.length;var s=new p(y,D);s.filename.html(E);n(w,D,s,G,y)}});w.css({margin:0,padding:0});var C=b(u).width()+10;if(C==10){C=120}var x=u.height()+10;if(x==10){x=35}u.css({position:"relative",overflow:"hidden",cursor:"default"});z.css({position:"absolute",cursor:"pointer",top:"0px",width:'100%',height:'34px',left:"0px","z-index":"100",opacity:"0.0",filter:"alpha(opacity=0)","-ms-filter":"alpha(opacity=0)","-khtml-opacity":"0.0","-moz-opacity":"0.0"});w.appendTo(u)}function p(v,u){this.statusbar=b("");this.filename=b("").appendTo(this.statusbar);this.progressDiv=b("").appendTo(this.statusbar).hide();this.progressbar=b("").appendTo(this.progressDiv);this.abort=b(""+y.uploadErrorStr+"
");u.cancel.show();z.remove();u.cancel.click(function(){u.statusbar.remove()});return false},beforeSend:function(B,s){u.progressDiv.show();u.cancel.hide();u.done.hide();if(y.showAbort){u.abort.show();u.abort.click(function(){B.abort();A.selectedFiles-=w.length})}if(!a.formdata){u.progressbar.width("5%")}else{u.progressbar.width("1%")}},uploadProgress:function(E,s,D,C){if(C>98){C=98}var B=C+"%";if(C>1){u.progressbar.width(B)}if(y.showProgress){u.progressbar.html(B);u.progressbar.css("text-align","center")}},success:function(B,s,C){A.responses.push(B);u.progressbar.width("100%");if(y.showProgress){u.progressbar.html("100%");u.progressbar.css("text-align","center")}u.abort.hide();y.onSuccess.call(this,w,B,C);if(y.showStatusAfterSuccess){if(y.showDone){u.done.show();u.done.click(function(){u.statusbar.hide("slow");u.statusbar.remove()})}else{u.done.hide()}if(y.showDelete){u.del.show();u.del.click(function(){u.statusbar.hide().remove();if(y.deleteCallback){y.deleteCallback.call(this,B,u)}A.selectedFiles-=w.length;h(y,A)})}else{u.del.hide()}}else{u.statusbar.hide("slow");u.statusbar.remove()}z.remove();A.sCounter+=w.length},error:function(C,s,B){u.abort.hide();if(C.statusText=="abort"){u.statusbar.hide("slow").remove();h(y,A)}else{y.onError.call(this,w,s,B);if(y.showStatusAfterError){u.progressDiv.hide();u.statusbar.append("ERROR: "+B+"")}else{u.statusbar.hide();u.statusbar.remove()}A.selectedFiles-=w.length}z.remove();A.fCounter+=w.length}};if(y.autoSubmit){z.ajaxSubmit(v)}else{if(y.showCancel){u.cancel.show();u.cancel.click(function(){z.remove();u.statusbar.remove();A.selectedFiles-=w.length;h(y,A)})}z.ajaxForm(v)}}return this}}(jQuery));
\ No newline at end of file
diff --git a/assets/js/um-functions.js b/assets/js/um-functions.js
index e69de29b..cd5ad3a1 100644
--- a/assets/js/um-functions.js
+++ b/assets/js/um-functions.js
@@ -0,0 +1,80 @@
+function initCrop_UM() {
+
+ jQuery('.um-single-image-preview.crop img').imgAreaSelect({
+ handles: true,
+ });
+
+}
+
+function initImageUpload_UM( trigger ) {
+
+ if (trigger.data('upload_help_text')){
+ upload_help_text = '' + trigger.data('upload_help_text') + '';
+ } else {
+ upload_help_text = '';
+ }
+
+ if ( trigger.data('icon') ) {
+ icon = '';
+ } else {
+ icon = '';
+ }
+
+ if ( trigger.data('upload_text') ) {
+ upload_text = '' + trigger.data('upload_text') + '';
+ } else {
+ upload_text = '';
+ }
+
+ trigger.uploadFile({
+ url: ultimatemember_image_upload_url,
+ method: "POST",
+ multiple: false,
+ formData: {key: trigger.data('key'), set_id: trigger.data('set_id'), set_mode: trigger.data('set_mode') },
+ fileName: trigger.data('key'),
+ allowedTypes: trigger.data('allowed_types'),
+ maxFileSize: trigger.data('max_size'),
+ dragDropStr: icon + upload_text + upload_help_text,
+ sizeErrorStr: trigger.data('max_size_error'),
+ extErrorStr: trigger.data('extension_error'),
+ maxFileCountErrorStr: trigger.data('max_files_error'),
+ maxFileCount: 1,
+ showDelete: false,
+ showAbort: false,
+ showDone: false,
+ showFileCounter: false,
+ showStatusAfterSuccess: false,
+ onSubmit:function(files){
+
+ trigger.parents('.um-modal-body').find('.um-error-block').remove();
+
+ },
+ onSuccess:function(files,data,xhr){
+
+ trigger.selectedFiles = 0;
+
+ data = jQuery.parseJSON(data);
+ if (data.error && data.error != '') {
+
+ trigger.parents('.um-modal-body').append('"+u.abortStr+"
").appendTo(this.statusbar).hide();this.cancel=b(""+u.cancelStr+"
").appendTo(this.statusbar).hide();this.done=b(""+u.doneStr+"
").appendTo(this.statusbar).hide();this.del=b(""+u.deletelStr+"
").appendTo(this.statusbar).hide();v.errorLog.after(this.statusbar);return this}function n(z,y,u,w,A){var x=null;var v={cache:false,contentType:false,processData:false,forceSync:false,data:y.formData,formData:y.fileData,dataType:y.returnType,beforeSubmit:function(F,C,E){if(y.onSubmit.call(this,w)!=false){var B=y.dynamicFormData();if(B){var s=o(B);if(s){for(var D=0;D'+data.error+'
');
+
+ } else {
+
+ jQuery.each( data, function(key, value) {
+ trigger.parents('.um-modal-body').find('.um-single-image-preview img').attr('src', value);
+ });
+
+ trigger.parents('.um-modal-body').find('.ajax-upload-dragdrop').fadeOut( function () {
+ trigger.parents('.um-modal-body').find('.um-single-image-preview').show();
+ trigger.parents('.um-modal-body').find('.um-modal-btn.um-finish-upload.disabled').removeClass('disabled');
+ um_modal_responsive();
+ } );
+
+ initCrop_UM();
+
+ }
+
+ }
+ });
+
+}
\ No newline at end of file
diff --git a/assets/js/um-modal.js b/assets/js/um-modal.js
index 860cfc15..bcfb6fba 100644
--- a/assets/js/um-modal.js
+++ b/assets/js/um-modal.js
@@ -1,66 +1,73 @@
-function um_new_modal( id, ajax, size ){
+function um_new_modal( id, size ){
var modal = jQuery('body').find('.um-modal-overlay');
jQuery('.tipsy').hide();
-
- um_remove_modal();
-
+
jQuery('body,html').css("overflow", "hidden");
jQuery('body').append('');
+
jQuery('#' + id).prependTo('.um-modal');
jQuery('#' + id).show();
jQuery('.um-modal').show();
-
+
um_modal_size( size );
- if ( ajax == true ) { um_modal_preload(); }
+
+ initImageUpload_UM( jQuery('.um-modal:visible').find('.um-single-image-upload') );
+
um_modal_responsive();
}
-function um_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
-
- if ( arg2 ) {
- jQuery('.um-modal-header:visible').html( arg2 );
- }
-
- jQuery.ajax({
- url: ultimatemember_ajax_url,
- type: 'POST',
- data: {action: 'ultimatemember_frontend_modal', act_id: act_id, arg1 : arg1, arg2 : arg2, arg3: arg3 },
- complete: function(){
- um_modal_loaded();
- um_modal_responsive();
- },
- success: function(data){
-
- jQuery('.um-modal').find('.um-modal-body').html( data );
-
- }
- });
- return false;
-}
-
function um_modal_responsive() {
- var required_margin = jQuery('.um-modal:visible').innerHeight() / 2 + 'px';
- jQuery('.um-modal:visible').css({'margin-top': '-' + required_margin });
+
+ var modal = jQuery('.um-modal:visible');
+
+ if ( modal.length ) {
+
+ var window_height_diff = jQuery(window).height() - modal.innerHeight();
+
+ var half_gap = window_height_diff / 2 + 'px';
+
+ var element_width = jQuery(window).width();
+
+ modal.removeClass('uimob340');
+ modal.removeClass('uimob500');
+
+ if ( element_width <= 340 ) {
+
+ modal.addClass('uimob340');
+ modal.animate({ 'bottom' : 0 }, 300);
+
+ } else if ( element_width <= 500 ) {
+
+ modal.addClass('uimob500');
+ modal.animate({ 'bottom' : 0 }, 300);
+
+ } else if ( element_width <= 800 ) {
+
+ modal.animate({ 'bottom' : half_gap }, 300);
+
+ } else if ( element_width <= 960 ) {
+
+ modal.animate({ 'bottom' : half_gap }, 300);
+
+ } else if ( element_width > 960 ) {
+
+ modal.animate({ 'bottom' : half_gap }, 300);
+
+ }
+
+ }
}
function um_remove_modal(){
- jQuery('body,html').css("overflow", "inherit");
+ jQuery('.um-single-image-preview.crop img').imgAreaSelect({ hide: true });
+ jQuery('body,html').css("overflow", "auto");
jQuery('.um-modal div[id^="um_"]').hide().appendTo('body');
jQuery('.um-modal,.um-modal-overlay').remove();
}
-function um_modal_preload() {
- jQuery('.um-modal:visible').addClass('loading');
- jQuery('.um-modal-body:visible').empty();
-}
-
-function um_modal_loaded() {
- jQuery('.um-modal:visible').removeClass('loading');
-}
-
function um_modal_size( aclass ) {
jQuery('.um-modal:visible').addClass(aclass);
}
@@ -82,11 +89,55 @@ jQuery(document).ready(function() {
um_remove_modal();
});
+ /**
+ disable link event
+ **/
+ jQuery(document).on('click', 'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal a', function(e){
+ e.preventDefault();
+ return false;
+ });
+
+ /**
+ remove uploaded image
+ **/
+ jQuery(document).on('click', '.um-modal .um-single-image-preview a.cancel', function(e){
+ e.preventDefault();
+
+ var parent = jQuery(this).parents('.um-modal-body');
+
+ parent.find('.um-single-image-preview').hide();
+
+ parent.find('.ajax-upload-dragdrop').show();
+
+ parent.find('.um-modal-btn.um-finish-upload').addClass('disabled');
+
+ um_modal_responsive();
+
+ return false;
+ });
+
+ /**
+ finish upload
+ **/
+ jQuery(document).on('click', '.um-finish-upload', function(){
+
+ var key = jQuery(this).attr('data-key');
+
+ var src = jQuery(this).parents('.um-modal-body').find('.um-single-image-preview img').attr('src');
+
+ jQuery('.um-single-image-preview[data-key='+key+']').fadeIn().find('img').attr('src', src);
+
+ um_remove_modal();
+
+ jQuery('.um-single-image-preview[data-key='+key+']').parents('.um-field').find('.um-btn-auto-width').html('Change/Modify Photo');
+
+ });
+
/**
fire new modal
**/
- jQuery(document).on('click', 'a[data-modal^="um_"], span[data-modal^="um_"]', function(){
-
+ jQuery(document).on('click', 'a[data-modal^="um_"], span[data-modal^="um_"]', function(e){
+
var modal_id = jQuery(this).attr('data-modal');
if ( jQuery(this).data('modal-size') ) {
@@ -95,13 +146,13 @@ jQuery(document).ready(function() {
var size = 'normal';
}
- if ( jQuery(this).data('dynamic-content') ) {
- um_new_modal( modal_id, true, size );
- um_modal_ajaxcall( jQuery(this).data('dynamic-content'), jQuery(this).data('arg1'), jQuery(this).data('arg2'), jQuery(this).data('arg3') );
+ if ( jQuery(this).data('modal-copy') ) {
+ jQuery('#' + modal_id).html( jQuery(this).parents('.um-field').find('.um-modal-hidden-content').html() );
+ um_new_modal( modal_id, size );
} else {
- um_new_modal( modal_id, false, size );
+ um_new_modal( modal_id, size );
}
-
+
});
});
\ No newline at end of file
diff --git a/assets/js/um-responsive.js b/assets/js/um-responsive.js
index 534b4ecc..f06c4bd1 100644
--- a/assets/js/um-responsive.js
+++ b/assets/js/um-responsive.js
@@ -1,12 +1,21 @@
function um_responsive(){
-
- /* responsive layout */
+
jQuery('.um').each(function(){
element_width = jQuery(this).width();
+
+ if ( element_width <= 340 ) {
- if ( element_width <= 500 ) {
-
+ jQuery(this).removeClass('uimob340');
+ jQuery(this).removeClass('uimob500');
+ jQuery(this).removeClass('uimob800');
+ jQuery(this).removeClass('uimob960');
+
+ jQuery(this).addClass('uimob340');
+
+ } else if ( element_width <= 500 ) {
+
+ jQuery(this).removeClass('uimob340');
jQuery(this).removeClass('uimob500');
jQuery(this).removeClass('uimob800');
jQuery(this).removeClass('uimob960');
@@ -15,6 +24,7 @@ function um_responsive(){
} else if ( element_width <= 800 ) {
+ jQuery(this).removeClass('uimob340');
jQuery(this).removeClass('uimob500');
jQuery(this).removeClass('uimob800');
jQuery(this).removeClass('uimob960');
@@ -23,6 +33,7 @@ function um_responsive(){
} else if ( element_width <= 960 ) {
+ jQuery(this).removeClass('uimob340');
jQuery(this).removeClass('uimob500');
jQuery(this).removeClass('uimob800');
jQuery(this).removeClass('uimob960');
@@ -31,6 +42,7 @@ function um_responsive(){
} else if ( element_width > 960 ) {
+ jQuery(this).removeClass('uimob340');
jQuery(this).removeClass('uimob500');
jQuery(this).removeClass('uimob800');
jQuery(this).removeClass('uimob960');
@@ -55,6 +67,7 @@ function um_responsive(){
jQuery(window).load(function() {
um_responsive();
+ um_modal_responsive();
});
@@ -62,5 +75,6 @@ jQuery(window).load(function() {
jQuery(window).resize(function() {
um_responsive();
+ um_modal_responsive();
});
\ No newline at end of file
diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js
index 7c368d5f..581b8bf0 100644
--- a/assets/js/um-scripts.js
+++ b/assets/js/um-scripts.js
@@ -66,7 +66,7 @@ jQuery(document).ready(function() {
hiddenSuffix: '__true'
});
- /* Rating field */
+ /* rating field */
jQuery('.um-rating').raty({
half: false,
starType: 'i',
@@ -81,6 +81,7 @@ jQuery(document).ready(function() {
}
});
+ /* rating read-only field */
jQuery('.um-rating-readonly').raty({
half: false,
starType: 'i',
@@ -91,87 +92,15 @@ jQuery(document).ready(function() {
readOnly: true
});
- /* Image Upload */
- jQuery(".um-single-image-upload").each(function(){
-
- var trigger = jQuery(this);
-
- if (trigger.data('upload_help_text')){
- upload_help_text = '' + trigger.data('upload_help_text') + '';
- } else {
- upload_help_text = '';
- }
-
- if ( trigger.data('icon') ) {
- icon = '';
- } else {
- icon = '';
- }
-
- if ( trigger.data('upload_text') ) {
- upload_text = '' + trigger.data('upload_text') + '';
- } else {
- upload_text = '';
- }
-
- trigger.uploadFile({
- url: ultimatemember_image_upload_url,
- method: "POST",
- multiple: false,
- formData: {key: trigger.data('key'), set_id: trigger.data('set_id'), set_mode: trigger.data('set_mode') },
- fileName: trigger.data('key'),
- allowedTypes: trigger.data('allowed_types'),
- maxFileSize: trigger.data('max_size'),
- dragDropStr: icon + upload_text + upload_help_text,
- sizeErrorStr: trigger.data('max_size_error'),
- extErrorStr: trigger.data('extension_error'),
- maxFileCountErrorStr: trigger.data('max_files_error'),
- maxFileCount: 1,
- showDelete: false,
- showAbort: false,
- showDone: false,
- showFileCounter: false,
- showStatusAfterSuccess: false,
- onSubmit:function(files){
-
- trigger.parents('.um-field').find('.um-error-block').remove();
-
- },
- onSuccess:function(files,data,xhr){
-
- trigger.selectedFiles = 0;
-
- data = jQuery.parseJSON(data);
- if (data.error && data.error != '') {
-
- trigger.parents('.um-field').append(''+data.error+'
');
-
- } else {
-
- trigger.parents('.um-field').find('.ajax-upload-dragdrop').fadeOut( function() {
- trigger.parents('.um-field').find('.um-single-image-preview').fadeIn();
- });
-
- jQuery.each( data, function(key, value) {
- trigger.parents('.um-field').find('.um-single-image-preview img').attr('src', value);
- });
-
- }
-
- }
- });
-
- });
-
- /* Remove a single image upload */
- jQuery(document).on('click', '.um-single-image-preview a.cancel', function(e){
+ /* remove uploaded image */
+ jQuery(document).on('click', '.um .um-single-image-preview a.cancel', function(e){
e.preventDefault();
- var trigger = jQuery(this).parents('.um-field').find('.um-single-image-upload');
+ var parent = jQuery(this).parents('.um-field');
- trigger.parents('.um-field').find('.um-single-image-preview').fadeOut(function(){
- trigger.parents('.um-field').find('.ajax-upload-dragdrop').fadeIn();
- });
+ parent.find('.um-single-image-preview').hide();
+
+ parent.find('.um-btn-auto-width').html('Upload');
return false;
});
diff --git a/core/lib/upload/um-image-upload.php b/core/lib/upload/um-image-upload.php
index 1bc5f72a..b638773a 100644
--- a/core/lib/upload/um-image-upload.php
+++ b/core/lib/upload/um-image-upload.php
@@ -20,11 +20,12 @@ if(isset($_FILES[$id]['name'])) {
$error = $ultimatemember->files->check_image_upload( $temp, $id );
if ( $error ){
+
$ret['error'] = $error;
+
} else {
- $ret[] = $ultimatemember->files->new_image_upload_temp( $temp, $file, 35 );
-
+ $ret[] = $ultimatemember->files->new_image_upload_temp( $temp, $file, um_get_option('image_compression') );
}
diff --git a/core/um-builtin.php b/core/um-builtin.php
index 2e9db0c3..074a6246 100644
--- a/core/um-builtin.php
+++ b/core/um-builtin.php
@@ -239,7 +239,7 @@ class UM_Builtin {
'image' => array(
'name' => 'Image Upload',
- 'col1' => array('_title','_metakey','_help','_allowed_types','_max_size'),
+ 'col1' => array('_title','_metakey','_help','_allowed_types','_max_size','_crop'),
'col2' => array('_label','_public','_roles','_upload_text','_upload_help_text','_button_text'),
'col3' => array('_required','_editable','_icon'),
'validate' => array(
diff --git a/core/um-enqueue.php b/core/um-enqueue.php
index c7c411b1..7b8b767c 100644
--- a/core/um-enqueue.php
+++ b/core/um-enqueue.php
@@ -149,6 +149,19 @@ class UM_Enqueue {
}
+ /***
+ *** @Load crop script
+ ***/
+ function load_imagecrop(){
+
+ wp_register_script('um_crop', um_url . 'assets/js/um-crop.js' );
+ wp_enqueue_script('um_crop');
+
+ wp_register_style('um_crop', um_url . 'assets/css/um-crop.css' );
+ wp_enqueue_style('um_crop');
+
+ }
+
/***
*** @Load masonry
***/
@@ -219,6 +232,8 @@ class UM_Enqueue {
$this->load_raty();
+ $this->load_imagecrop();
+
$this->load_masonry();
$this->load_tipsy();
diff --git a/core/um-fields.php b/core/um-fields.php
index 05543498..5da36579 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -593,6 +593,8 @@ class UM_Fields {
case 'image':
+ if ( !isset( $array['crop'] ) ) $array['crop'] = 0;
+
if (!isset($array['invalid_image'])) $array['invalid_image'] = "Please upload a valid image!";
if (!isset($array['allowed_types'])) {
$array['allowed_types'] = "gif,jpg,jpeg,png";
@@ -975,19 +977,52 @@ class UM_Fields {
$output .= $this->field_label($label, $key, $data);
}
- $output .= '';
-
- if ( $this->is_error($key) ) {
- $output .= $this->field_error( $this->show_error($key) );
- }
+ if ( $crop ) {
+ $crop_class = 'crop';
+ } else {
+ $crop_class = '';
+ }
- $output .= '';
+ $modal_label = ( isset( $data['label'] ) ) ? $data['label'] : __('Upload Photo','ultimatemember');
+
+ $output .= '
+
+
+
+ '. $button_text . '
+
+
';
+
+ /* modal hidden */
+ $output .= '';
+
+ /* end */
+
+ if ( $this->is_error($key) ) {
+ $output .= $this->field_error( $this->show_error($key) );
+ }
+
+ $output .= '';
+
break;
/* Single File Upload */
diff --git a/templates/modal/um_dynamic_modal.php b/templates/modal/um_dynamic_modal.php
deleted file mode 100644
index 2f4cc146..00000000
--- a/templates/modal/um_dynamic_modal.php
+++ /dev/null
@@ -1,11 +0,0 @@
-
\ No newline at end of file
diff --git a/templates/modal/um_upload_image.php b/templates/modal/um_upload_image.php
new file mode 100644
index 00000000..daa75ed8
--- /dev/null
+++ b/templates/modal/um_upload_image.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/um-config.php b/um-config.php
index 865c8de9..6e071011 100644
--- a/um-config.php
+++ b/um-config.php
@@ -736,6 +736,29 @@ $this->sections[] = array(
*** @
***/
+$this->sections[] = array(
+
+ 'icon' => 'um-icon-files',
+ 'title' => __( 'Image & File Uploads'),
+ 'fields' => array(
+
+ array(
+ 'id' => 'image_compression',
+ 'type' => 'text',
+ 'title' => __( 'Image Quality' ),
+ 'desc' => __( 'Quality is used to determine quality of image uploads, and ranges from 0 (worst quality, smaller file) to 100 (best quality, biggest file). The default range is 75.' ),
+ 'default' => 60,
+ 'validate' => 'numeric',
+ ),
+
+ )
+
+);
+
+/***
+*** @
+***/
+
$this->sections[] = array(
'icon' => 'um-icon-search',