diff --git a/views/elements/enquiry_table.ctp b/views/elements/enquiry_table.ctp index 2bf91c01..5f509b6a 100755 --- a/views/elements/enquiry_table.ctp +++ b/views/elements/enquiry_table.ctp @@ -159,7 +159,7 @@ echo $paginator->counter(array( $jsblock = <<counter(array( type : 'select', indicator : 'Saving...', submit : 'Update Status', + cssclass: 'MER-inplace-select', callback : function(value, settings) { var match = /won/i.test(value); @@ -208,6 +209,12 @@ echo $paginator->counter(array( return; } + match = /assigned/i.test(value); + if(match == true) { + \$('#row$enqid').removeClass(); + return; + } + } }); diff --git a/views/products/view.ctp b/views/products/view.ctp index e5a1fdfb..1e6c7698 100755 --- a/views/products/view.ctp +++ b/views/products/view.ctp @@ -42,6 +42,23 @@ +link('product-model-number-builder'); ?> + + + + +
+

Model Number configuration

+ + +
+ + - diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css index 16913222..279d1673 100755 --- a/webroot/css/quotenik.css +++ b/webroot/css/quotenik.css @@ -410,9 +410,9 @@ td.actions a { } td.PriceSummary { - + background: #ff9900; - + } .cake-sql-log table { @@ -578,7 +578,7 @@ td.rightAlign { table.productTable { width: auto; - + } @@ -1138,18 +1138,18 @@ div.commercialComments { form.cmxform fieldset { - margin-bottom: 10px; + margin-bottom: 10px; } form.cmxform legend { - padding: 0 2px; - font-weight: bold; - font-size: 140%; + padding: 0 2px; + font-weight: bold; + font-size: 140%; } form.cmxform label { - float: left; - display: inline-block; - width: 15em; - position: relative; + float: left; + display: inline-block; + width: 15em; + position: relative; } label span.rightHandLabel { @@ -1186,32 +1186,50 @@ form.cmxform input { } form.cmxform fieldset ol { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } form.cmxform fieldset li { - list-style: none; - padding: 5px; - margin: 0; + list-style: none; + padding: 5px; + margin: 0; } form.cmxform fieldset fieldset { - border: none; - margin: 3px 0 0; + border: none; + margin: 3px 0 0; } form.cmxform fieldset fieldset legend { - padding: 0 0 5px; - font-weight: normal; + padding: 0 0 5px; + font-weight: normal; } form.cmxform fieldset fieldset label { - display: block; - + display: block; + } form.cmxform em { - font-weight: bold; - font-style: normal; - color: #f00; + font-weight: bold; + font-style: normal; + color: #f00; } form.cmxform fieldset fieldset label { - margin-left: 123px; /* Width plus 3 (html space) */ + margin-left: 123px; /* Width plus 3 (html space) */ } + + +#sortable { list-style-type: none; margin: 0; padding: 0; } + +#sortable li { + margin: 3px 3px 3px 0; + padding: 3px; + float: left; + border: 2px dotted; + font-size: 2em; + text-align: center; +} + + +select.editinplace { + text-size: 80%; + font-weight: normal; +} \ No newline at end of file diff --git a/webroot/js/jquery.jeditable.mini.js b/webroot/js/jquery.jeditable.mini.js new file mode 100644 index 00000000..ef885f06 --- /dev/null +++ b/webroot/js/jquery.jeditable.mini.js @@ -0,0 +1,38 @@ + +(function($){$.fn.editable=function(target,options){if('disable'==target){$(this).data('disabled.editable',true);return;} +if('enable'==target){$(this).data('disabled.editable',false);return;} +if('destroy'==target){$(this).unbind($(this).data('event.editable')).removeData('disabled.editable').removeData('event.editable');return;} +var settings=$.extend({},$.fn.editable.defaults,{target:target},options);var plugin=$.editable.types[settings.type].plugin||function(){};var submit=$.editable.types[settings.type].submit||function(){};var buttons=$.editable.types[settings.type].buttons||$.editable.types['defaults'].buttons;var content=$.editable.types[settings.type].content||$.editable.types['defaults'].content;var element=$.editable.types[settings.type].element||$.editable.types['defaults'].element;var reset=$.editable.types[settings.type].reset||$.editable.types['defaults'].reset;var callback=settings.callback||function(){};var onedit=settings.onedit||function(){};var onsubmit=settings.onsubmit||function(){};var onreset=settings.onreset||function(){};var onerror=settings.onerror||reset;if(settings.tooltip){$(this).attr('title',settings.tooltip);} +settings.autowidth='auto'==settings.width;settings.autoheight='auto'==settings.height;return this.each(function(){var self=this;var savedwidth=$(self).width();var savedheight=$(self).height();$(this).data('event.editable',settings.event);if(!$.trim($(this).html())){$(this).html(settings.placeholder);} +$(this).bind(settings.event,function(e){if(true===$(this).data('disabled.editable')){return;} +if(self.editing){return;} +if(false===onedit.apply(this,[settings,self])){return;} +e.preventDefault();e.stopPropagation();if(settings.tooltip){$(self).removeAttr('title');} +if(0==$(self).width()){settings.width=savedwidth;settings.height=savedheight;}else{if(settings.width!='none'){settings.width=settings.autowidth?$(self).width():settings.width;} +if(settings.height!='none'){settings.height=settings.autoheight?$(self).height():settings.height;}} +if($(this).html().toLowerCase().replace(/(;|")/g,'')==settings.placeholder.toLowerCase().replace(/(;|")/g,'')){$(this).html('');} +self.editing=true;self.revert=$(self).html();$(self).html('');var form=$('
');if(settings.cssclass){if('inherit'==settings.cssclass){form.attr('class',$(self).attr('class'));}else{form.attr('class',settings.cssclass);}} +if(settings.style){if('inherit'==settings.style){form.attr('style',$(self).attr('style'));form.css('display',$(self).css('display'));}else{form.attr('style',settings.style);}} +var input=element.apply(form,[settings,self]);var input_content;if(settings.loadurl){var t=setTimeout(function(){input.disabled=true;content.apply(form,[settings.loadtext,settings,self]);},100);var loaddata={};loaddata[settings.id]=self.id;if($.isFunction(settings.loaddata)){$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings]));}else{$.extend(loaddata,settings.loaddata);} +$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:false,success:function(result){window.clearTimeout(t);input_content=result;input.disabled=false;}});}else if(settings.data){input_content=settings.data;if($.isFunction(settings.data)){input_content=settings.data.apply(self,[self.revert,settings]);}}else{input_content=self.revert;} +content.apply(form,[input_content,settings,self]);input.attr('name',settings.name);buttons.apply(form,[settings,self]);$(self).append(form);plugin.apply(form,[settings,self]);$(':input:visible:enabled:first',form).focus();if(settings.select){input.select();} +input.keydown(function(e){if(e.keyCode==27){e.preventDefault();reset.apply(form,[settings,self]);}});var t;if('cancel'==settings.onblur){input.blur(function(e){t=setTimeout(function(){reset.apply(form,[settings,self]);},500);});}else if('submit'==settings.onblur){input.blur(function(e){t=setTimeout(function(){form.submit();},200);});}else if($.isFunction(settings.onblur)){input.blur(function(e){settings.onblur.apply(self,[input.val(),settings]);});}else{input.blur(function(e){});} +form.submit(function(e){if(t){clearTimeout(t);} +e.preventDefault();if(false!==onsubmit.apply(form,[settings,self])){if(false!==submit.apply(form,[settings,self])){if($.isFunction(settings.target)){var str=settings.target.apply(self,[input.val(),settings]);$(self).html(str);self.editing=false;callback.apply(self,[self.innerHTML,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}}else{var submitdata={};submitdata[settings.name]=input.val();submitdata[settings.id]=self.id;if($.isFunction(settings.submitdata)){$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings]));}else{$.extend(submitdata,settings.submitdata);} +if('PUT'==settings.method){submitdata['_method']='put';} +$(self).html(settings.indicator);var ajaxoptions={type:'POST',data:submitdata,dataType:'html',url:settings.target,success:function(result,status){if(ajaxoptions.dataType=='html'){$(self).html(result);} +self.editing=false;callback.apply(self,[result,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr]);}};$.extend(ajaxoptions,settings.ajaxoptions);$.ajax(ajaxoptions);}}} +$(self).attr('title',settings.tooltip);return false;});});this.reset=function(form){if(this.editing){if(false!==onreset.apply(form,[settings,self])){$(self).html(self.revert);self.editing=false;if(!$.trim($(self).html())){$(self).html(settings.placeholder);} +if(settings.tooltip){$(self).attr('title',settings.tooltip);}}}};});};$.editable={types:{defaults:{element:function(settings,original){var input=$('');$(this).append(input);return(input);},content:function(string,settings,original){$(':input:first',this).val(string);},reset:function(settings,original){original.reset(this);},buttons:function(settings,original){var form=this;if(settings.submit){if(settings.submit.match(/>$/)){var submit=$(settings.submit).click(function(){if(submit.attr("type")!="submit"){form.submit();}});}else{var submit=$('