From 1d0dee2541ca5b20626809454dc9dfb0d9821ffd Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Mon, 8 Dec 2014 15:20:35 -0500 Subject: [PATCH] Update prod assets --- media/css/libraries.css | 37 ++++++++++++++++++++++++++++++++++++- media/js/app.js | 3 ++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/media/css/libraries.css b/media/css/libraries.css index f3f2d52d0d5..1d0e3d41f5e 100644 --- a/media/css/libraries.css +++ b/media/css/libraries.css @@ -1,4 +1,39 @@ - +.has-warning .twitter-typeahead .tt-input, +.has-warning .twitter-typeahead .tt-hint{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075)}.has-warning .twitter-typeahead .tt-input:focus, +.has-warning .twitter-typeahead .tt-hint:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b}.has-error .twitter-typeahead .tt-input, +.has-error .twitter-typeahead .tt-hint{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075)}.has-error .twitter-typeahead .tt-input:focus, +.has-error .twitter-typeahead .tt-hint:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483}.has-success .twitter-typeahead .tt-input, +.has-success .twitter-typeahead .tt-hint{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075)}.has-success .twitter-typeahead .tt-input:focus, +.has-success .twitter-typeahead .tt-hint:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168}.input-group .twitter-typeahead:first-child .tt-input, +.input-group .twitter-typeahead:first-child .tt-hint{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .twitter-typeahead:last-child .tt-input, +.input-group .twitter-typeahead:last-child .tt-hint{border-bottom-right-radius:3px;border-top-right-radius:3px}.input-group.input-group-sm .twitter-typeahead .tt-input, +.input-group.input-group-sm .twitter-typeahead .tt-hint{height:28px;padding:5px +10px;font-size:11px;line-height:1.456;border-radius:2px}select.input-group.input-group-sm .twitter-typeahead .tt-input, +select.input-group.input-group-sm .twitter-typeahead .tt-hint{height:28px;line-height:28px}textarea.input-group.input-group-sm .twitter-typeahead .tt-input, +textarea.input-group.input-group-sm .twitter-typeahead .tt-hint, +select[multiple].input-group.input-group-sm .twitter-typeahead .tt-input, +select[multiple].input-group.input-group-sm .twitter-typeahead .tt-hint{height:auto}.input-group.input-group-sm .twitter-typeahead:not(:first-child):not(:last-child) .tt-input, +.input-group.input-group-sm .twitter-typeahead:not(:first-child):not(:last-child) .tt-hint{border-radius:0}.input-group.input-group-sm .twitter-typeahead:first-child .tt-input, +.input-group.input-group-sm .twitter-typeahead:first-child .tt-hint{border-bottom-left-radius:2px;border-top-left-radius:2px;border-bottom-right-radius:0;border-top-right-radius:0}.input-group.input-group-sm .twitter-typeahead:last-child .tt-input, +.input-group.input-group-sm .twitter-typeahead:last-child .tt-hint{border-bottom-left-radius:0;border-top-left-radius:0;border-bottom-right-radius:2px;border-top-right-radius:2px}.input-group.input-group-lg .twitter-typeahead .tt-input, +.input-group.input-group-lg .twitter-typeahead .tt-hint{height:42px;padding:10px +16px;font-size:16px;line-height:1.25;border-radius:4px}select.input-group.input-group-lg .twitter-typeahead .tt-input, +select.input-group.input-group-lg .twitter-typeahead .tt-hint{height:42px;line-height:42px}textarea.input-group.input-group-lg .twitter-typeahead .tt-input, +textarea.input-group.input-group-lg .twitter-typeahead .tt-hint, +select[multiple].input-group.input-group-lg .twitter-typeahead .tt-input, +select[multiple].input-group.input-group-lg .twitter-typeahead .tt-hint{height:auto}.input-group.input-group-lg .twitter-typeahead:not(:first-child):not(:last-child) .tt-input, +.input-group.input-group-lg .twitter-typeahead:not(:first-child):not(:last-child) .tt-hint{border-radius:0}.input-group.input-group-lg .twitter-typeahead:first-child .tt-input, +.input-group.input-group-lg .twitter-typeahead:first-child .tt-hint{border-bottom-left-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-top-right-radius:0}.input-group.input-group-lg .twitter-typeahead:last-child .tt-input, +.input-group.input-group-lg .twitter-typeahead:last-child .tt-hint{border-bottom-left-radius:0;border-top-left-radius:0;border-bottom-right-radius:4px;border-top-right-radius:4px}.twitter-typeahead{width:100%;display:table-cell !important;float:left}.twitter-typeahead .tt-hint{color:#a0acb8}.twitter-typeahead .tt-input{z-index:2}.twitter-typeahead .tt-input[disabled], +.twitter-typeahead .tt-input[readonly], +fieldset[disabled] .twitter-typeahead .tt-input{cursor:not-allowed;background-color:#ebedf0 !important}.tt-dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;min-width:160px;width:100%;padding:5px +0;margin:2px +0 0;list-style:none;font-size:13px;background-color:#fff;border:1px +solid #eee;border:1px +solid rgba(0, 0, 0, 0.06);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0, 0, 0, 0.175);box-shadow:0 6px 12px rgba(0, 0, 0, 0.175);background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px}.tt-dropdown-menu .tt-suggestion{display:block;padding:3px +20px;clear:both;font-weight:normal;line-height:1.3856;color:#47535f;white-space:nowrap}.tt-dropdown-menu .tt-suggestion.tt-cursor{text-decoration:none;outline:0;background-color:#f5f5f5;color:#3c4650}.tt-dropdown-menu .tt-suggestion.tt-cursor +a{color:#3c4650}.tt-dropdown-menu .tt-suggestion +p{margin:0} /*! normalize.css v3.0.1 | MIT License | git.io/normalize */ html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button, diff --git a/media/js/app.js b/media/js/app.js index 691f61d8aad..68438011020 100644 --- a/media/js/app.js +++ b/media/js/app.js @@ -64,7 +64,8 @@ searchId='#list-search';else searchId='#'+searchId;var filter=mQuery(el).val();var current=mQuery('#list-search').typeahead('val');current+=" "+filter;mQuery(searchId).typeahead('val',current);var e=mQuery.Event("keypress",{which:13});e.data={};e.data.livesearch=true;Mautic.filterList(e,'list-search',mQuery(searchId).attr('data-action'),mQuery(searchId).attr('data-target'),'liveCache');mQuery(el).val('');},unlockEntity:function(model,id,parameter){mQuery.ajax({url:mauticAjaxUrl,type:"POST",data:"action=unlockEntity&model="+model+"&id="+id+"¶meter="+parameter,dataType:"json"});},processAjaxError:function(request,textStatus,errorThrown,mainContent){console.log(request);if(typeof request.responseJSON!=='undefined'){response=request.responseJSON;}else{var errorStart=request.responseText.indexOf('{"newContent');var jsonString=request.responseText.slice(errorStart);if(jsonString){var response=mQuery.parseJSON(jsonString);console.log(response);}else{response={};}} if(response.newContent&&mainContent){mQuery('#app-content .content-body').html(response.newContent);}else if(response.newContent&&mQuery('.modal.in').length){mQuery('.modal.in .modal-body-content').html(response.newContent);mQuery('.modal.in .modal-body-content').removeClass('hide');if(mQuery('.modal.in .loading-placeholder').length){mQuery('.modal.in .loading-placeholder').addClass('hide');}}else if(typeof mauticEnv!=='undefined'&&mauticEnv=='dev'){console.log(request);if(response.error){var error=response.error.code+': '+errorThrown+'; '+response.error.exception;alert(error);}} Mautic.stopPageLoadingBar();},emulateNoDataForPieChart:function(data){var dataEmpty=true;mQuery.each(data,function(i,part){if(part.value){dataEmpty=false;}});if(dataEmpty){data=[{value:1,color:"#efeeec",highlight:"#EBEBEB",label:"No data"}];} -return data;}};;Mautic.initiateIntegrationAuthorization=function(){mQuery('#integration_details_in_auth').val(1);Mautic.postForm(mQuery('form[name="integration_details"]'),'loadIntegrationAuthWindow');};Mautic.loadIntegrationAuthWindow=function(response){Mautic.stopPageLoadingBar();Mautic.stopIconSpinPostEvent();mQuery('#integration_details_in_auth').val(0);if(response.authUrl){var generator=window.open(response.authUrl,'integraitonauth','height=400,width=500');if(!generator||generator.closed||typeof generator.closed=='undefined'){alert(response.popupBlockerMessage);}}};;Mautic.clientOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','api.client');}};;Mautic.assetOnLoad=function(container){if(typeof Mautic.renderDownloadChartObject==='undefined'){Mautic.renderDownloadChart();} +return data;},processUpdate:function(container,step,state){var baseUrl=mauticBaseUrl.replace('/index_dev.php','');switch(step){case 1:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateSetUpdateLayout',dataType:'json',success:function(response){if(response.success){mQuery('div[id='+container+']').html(response.content);Mautic.processUpdate(container,step+1,state);}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 2:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateDownloadPackage',dataType:'json',success:function(response){mQuery('td[id=update-step-downloading-status]').html(response.stepStatus);if(response.success){mQuery('#updateTable tbody').append(''+response.nextStep+''+response.nextStepStatus+'');Mautic.processUpdate(container,step+1,state);}else{mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('
'+response.message+'
');}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 3:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateExtractPackage',dataType:'json',success:function(response){mQuery('td[id=update-step-extracting-status]').html(response.stepStatus);if(response.success){mQuery('#updateTable tbody').append(''+response.nextStep+''+response.nextStepStatus+'');Mautic.processUpdate(container,step+1,state);}else{mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('
'+response.message+'
');}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 4:mQuery.ajax({showLoadingBar:true,url:baseUrl+'upgrade/upgrade.php?task=moveBundles&updateState='+state,dataType:'json',success:function(response){mQuery('td[id=update-step-moving-status]').html(response.stepStatus);if(response.error){mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('
'+response.message+'
');}else if(response.complete){Mautic.processUpdate(container,step+1,response.updateState);}else{Mautic.processUpdate(container,step,response.updateState);}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 5:mQuery.ajax({showLoadingBar:true,url:baseUrl+'upgrade/upgrade.php?task=moveCore&updateState='+state,dataType:'json',success:function(response){mQuery('td[id=update-step-moving-status]').html(response.stepStatus);if(response.error){mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('
'+response.message+'
');}else if(response.complete){Mautic.processUpdate(container,step+1,response.updateState);}else{Mautic.processUpdate(container,step,response.updateState);}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 6:mQuery.ajax({showLoadingBar:true,url:baseUrl+'upgrade/upgrade.php?task=moveVendors&updateState='+state,dataType:'json',success:function(response){mQuery('td[id=update-step-moving-status]').html(response.stepStatus);if(response.error){mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('
'+response.message+'
');}else if(response.complete){mQuery('#updateTable tbody').append(''+response.nextStep+''+response.nextStepStatus+'');Mautic.processUpdate(container,step+1,response.updateState);}else{Mautic.processUpdate(container,step,response.updateState);}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 7:mQuery.ajax({showLoadingBar:true,url:baseUrl+'upgrade/upgrade.php?task=clearCache&updateState='+state,dataType:'json',success:function(response){mQuery('td[id=update-step-cache-status]').html(response.stepStatus);if(response.error){mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('
'+response.message+'
');}else if(response.complete){mQuery('#updateTable tbody').append(''+response.nextStep+''+response.nextStepStatus+'');Mautic.processUpdate(container,step+1,response.updateState);}else{Mautic.processUpdate(container,step,response.updateState);}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;case 8:mQuery.ajax({showLoadingBar:true,url:mauticAjaxUrl+'?action=core:updateDatabaseMigration',dataType:'json',success:function(response){if(response.success){mQuery('div[id='+container+']').html('
'+response.message+'
');}else{mQuery('div[id=main-update-panel]').removeClass('panel-default').addClass('panel-danger');mQuery('div#main-update-panel div.panel-body').prepend('
'+response.message+'
');}},error:function(request,textStatus,errorThrown){Mautic.processAjaxError(request,textStatus,errorThrown);}});break;} +Mautic.stopPageLoadingBar();}};;Mautic.initiateIntegrationAuthorization=function(){mQuery('#integration_details_in_auth').val(1);Mautic.postForm(mQuery('form[name="integration_details"]'),'loadIntegrationAuthWindow');};Mautic.loadIntegrationAuthWindow=function(response){Mautic.stopPageLoadingBar();Mautic.stopIconSpinPostEvent();mQuery('#integration_details_in_auth').val(0);if(response.authUrl){var generator=window.open(response.authUrl,'integraitonauth','height=400,width=500');if(!generator||generator.closed||typeof generator.closed=='undefined'){alert(response.popupBlockerMessage);}}};;Mautic.clientOnLoad=function(container){if(mQuery(container+' #list-search').length){Mautic.activateSearchAutocomplete('list-search','api.client');}};;Mautic.assetOnLoad=function(container){if(typeof Mautic.renderDownloadChartObject==='undefined'){Mautic.renderDownloadChart();} mQuery("#asset_file").change(function(){Mautic.previewBeforeUpload(this);});};Mautic.assetOnUnload=function(id){if(id==='#app-content'){delete Mautic.renderDownloadChartObject;}};Mautic.getAssetId=function(){return mQuery('input#itemId').val();} Mautic.renderDownloadChart=function(chartData){if(!mQuery('#download-chart').length){return;} if(!chartData){chartData=mQuery.parseJSON(mQuery('#download-chart-data').text());}