From 4c1e63e46a1f6fad470de49d14569a80bcb84d67 Mon Sep 17 00:00:00 2001 From: Arslan Hassan Date: Fri, 24 Dec 2010 14:22:47 +0000 Subject: [PATCH] Added : Remote URL Support Update : File uploader Added : Remoet Upload form Added : new ajax loader --- upload/actions/file_results.php | 7 +- upload/actions/include_functions.php | 130 +++++++++ upload/includes/upload_forms.php | 40 +-- upload/js/functions.js | 261 ++++++++++-------- .../styles/cbv2new/images/ajax-loader-big.gif | Bin 0 -> 2463 bytes upload/styles/cbv2new/images/ajax-loader.gif | Bin 723 -> 1482 bytes upload/styles/cbv2new/images/error.png | Bin 0 -> 4681 bytes upload/styles/cbv2new/images/ok.png | Bin 0 -> 1397 bytes .../styles/cbv2new/images/uploading_bar.png | Bin 0 -> 1089 bytes upload/styles/cbv2new/layout/upload.html | 48 +--- upload/styles/cbv2new/theme/main.css | 24 +- upload/styles/global/head.html | 5 +- 12 files changed, 321 insertions(+), 194 deletions(-) create mode 100644 upload/actions/include_functions.php create mode 100644 upload/styles/cbv2new/images/ajax-loader-big.gif create mode 100644 upload/styles/cbv2new/images/error.png create mode 100644 upload/styles/cbv2new/images/ok.png create mode 100644 upload/styles/cbv2new/images/uploading_bar.png diff --git a/upload/actions/file_results.php b/upload/actions/file_results.php index b511f64f..7cbfbf2f 100644 --- a/upload/actions/file_results.php +++ b/upload/actions/file_results.php @@ -39,11 +39,12 @@ if($_POST['del_log']) $use_crons = config('use_crons'); if($quick_conv=='yes' || $use_crons=='no') { + $targetFileName = $details['file_name']; //exec(php_path()." -q ".BASEDIR."/actions/video_convert.php &> /dev/null &"); if (stristr(PHP_OS, 'WIN')) { - exec(php_path()." -q ".BASEDIR."/actions/video_convert.php"); - } else { - exec(php_path()." -q ".BASEDIR."/actions/video_convert.php &> /dev/null &"); + exec(php_path()." -q ".BASEDIR."/actions/video_convert.php $targetFileName"); + } else { + exec(php_path()." -q ".BASEDIR."/actions/video_convert.php $targetFileName &> /dev/null &"); } } diff --git a/upload/actions/include_functions.php b/upload/actions/include_functions.php new file mode 100644 index 00000000..7bdfb4ab --- /dev/null +++ b/upload/actions/include_functions.php @@ -0,0 +1,130 @@ + 0) + return "$weeks week" . ($weeks > 1 ? "s" : ""); + if ($days > 0) + return "$days day" . ($days > 1 ? "s" : ""); + if ($hours > 0) + return "$hours hour" . ($hours > 1 ? "s" : ""); + if ($mins > 0) + return "$mins min" . ($mins > 1 ? "s" : ""); + return "< 1 min"; + } + + //Function Used TO Get Extensio Of File + function GetExt($file){ + return substr($file, strrpos($file,'.') + 1); + } + + function old_set_time($temps) + { + round($temps); + $heures = floor($temps / 3600); + $minutes = round(floor(($temps - ($heures * 3600)) / 60)); + if ($minutes < 10) + $minutes = "0" . round($minutes); + $secondes = round($temps - ($heures * 3600) - ($minutes * 60)); + if ($secondes < 10) + $secondes = "0" . round($secondes); + return $minutes . ':' . $secondes; + } + function SetTime($sec, $padHours = true) { + + if($sec < 3600) + return old_set_time($sec); + + $hms = ""; + + // there are 3600 seconds in an hour, so if we + // divide total seconds by 3600 and throw away + // the remainder, we've got the number of hours + $hours = intval(intval($sec) / 3600); + + // add to $hms, with a leading 0 if asked for + $hms .= ($padHours) + ? str_pad($hours, 2, "0", STR_PAD_LEFT). ':' + : $hours. ':'; + + // dividing the total seconds by 60 will give us + // the number of minutes, but we're interested in + // minutes past the hour: to get that, we need to + // divide by 60 again and keep the remainder + $minutes = intval(($sec / 60) % 60); + + // then add to $hms (with a leading 0 if needed) + $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT). ':'; + + // seconds are simple - just divide the total + // seconds by 60 and keep the remainder + $seconds = intval($sec % 60); + + // add to $hms, again with a leading 0 if needed + $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT); + + return $hms; + } diff --git a/upload/includes/upload_forms.php b/upload/includes/upload_forms.php index 6939726f..7fd01cc8 100644 --- a/upload/includes/upload_forms.php +++ b/upload/includes/upload_forms.php @@ -17,24 +17,28 @@ global $file_name; if($params['class']) $class = ' '.$params['class']; - echo '
'; - echo ''; - echo ''; - echo ''; - echo '
'; - echo ' -
-
-
-
-
-
-
-
-
- '; - echo '
'; - echo '
'; + echo + '
+ + + + +
+
+
+
+
+
+ '.lang('remoteDownloadStatusDiv').' +
+
+ + +
+
+
'; } ?> \ No newline at end of file diff --git a/upload/js/functions.js b/upload/js/functions.js index f1407e31..f12f6fed 100644 --- a/upload/js/functions.js +++ b/upload/js/functions.js @@ -97,6 +97,21 @@ var loading = loading_img+" Loading..."; // --> + + function randomString() + { + var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz"; + var string_length = 8; + var randomstring = ''; + for (var i=0; i
'+lang.remoteUploadFile+'
'); + $('#remoteFileName').replaceWith('"'+remoteFileName+'"'); }, success: function(data) { @@ -134,6 +157,7 @@ var loading = loading_img+" Loading..."; if(data.error) { force_stop = true; + $('#remoteUploadBttn').attr('disabled',''); alert(data.error); } $("#loading").html(''); @@ -141,10 +165,15 @@ var loading = loading_img+" Loading..."; } ); + $('#remoteUploadBttnStop').click(function() { + ajaxCall.abort(); force_stop=true; $("#loading").html('');$('#remoteDownloadStatus').hide(); $(this).hide();$('#remoteUploadBttn').attr('disabled','').show(); }); + + + } - + var hasLoaded = false; var perc_download = 0; function status_update() { @@ -175,34 +204,61 @@ var loading = loading_img+" Loading..."; var theSpeed = Math.round(speed/ 1024 ) + " Kbps"; perc_download = Math.round(download/total*100); - - $('#prog_bar').width(perc_download+'%'); + $('#remoteDownloadStatus').show(); + //$('#prog_bar').width(perc_download+'%'); + $('#prog_bar').animate({width:perc_download+'%'},1000); $('#prog_bar').html(perc_download+'%'); $('#dspeed').html(theSpeed); - $('#eta').html('Time Left '+eta_fm); + $('#eta').html(eta_fm); $('#status').html(download_fm+' of '+total_fm); } - var intval = status_refesh*1000; - if(perc_download<100 && !force_stop) - setTimeout(function(){status_update()},intval); - else if(perc_download==100 && total>1) - { - $('#time_took').html('Time Took : '+time_took_fm); - //Del the log file - $.ajax({ - url: result_page, - type: "POST", - data: ({del_log:'yes',file_name:file_name}), - success:function(data) - { - submit_upload_form(); - } + var intval = status_refesh*1000; + if(perc_download<100 && !force_stop) + setTimeout(function(){status_update()},intval); + else if(perc_download==100 && total>1) + { + $('#time_took').html('Time Took : '+time_took_fm); + //Del the log file + $.ajax({ + url: result_page, + type: "POST", + data: ({del_log:'yes',file_name:file_name}), + success:function(data) + { + $('#remoteUploadBttnStop').hide(); - }); - } - + $.post(baseurl+'/actions/file_uploader.php', + {"getForm":"get_form","title":$("#remote_file_url").val(),"objId":remoteObjID}, + function(data) + { + $('#remoteForm').append(data); + },'text'); + + $.ajax({ + url: baseurl+'/actions/file_uploader.php', + type: "POST", + data:({"insertVideo":"yes","title":$("#remote_file_url").val(),"file_name":file_name}), + dataType: "json", + success: function(data) + { + + vid = data; + $('#cbSubmitUpload'+remoteObjID) + .before('') + .attr("disabled","") + .attr("value",lang.saveData) + .attr("onClick","doUpdateVideo('#uploadForm"+remoteObjID+"','"+remoteObjID+"')") + .after('') + .after(''); + + } + }); + } + + }); + } } } ); @@ -955,11 +1011,8 @@ function collection_actions(form,mode,objID,result_con,type,cid) } // Simple function to open url with javascript -function openURL(url,newWindow) { - if(newWindow == 'new') - window.open(url,'mywindow'); - else - document.location = url; +function openURL(url) { + document.location = url; } @@ -967,7 +1020,7 @@ function openURL(url,newWindow) { function get_item(obj,ci_id,cid,type,direction) { var btn_text = $(obj).text(); - $(obj).html(loading); + $(obj).text('Working'); $.post(page, { @@ -982,7 +1035,7 @@ function get_item(obj,ci_id,cid,type,direction) if(!data) { alert('No '+type+' returned'); - $(obj).html(btn_text); + $(obj).text(btn_text); } else { var jsArray = new Array(type,data['cid'],data['key']); construct_url(jsArray); @@ -1031,7 +1084,7 @@ function onReload_item() function pagination(object,cid,type,pageNumber) { - var obj = $(object), objID = obj.id, parent = obj.parent(), parentID; + obj = $(object); objID = obj.id; parent = obj.parent(); if(parent.attr('id')) parentID = parent.attr('id') @@ -1094,101 +1147,73 @@ function ajax_add_collection(obj) Child = $("#"+ID).children().filter('div'), total = Child.length, eachObj, AjaxCall; }*/ -var AjaxIteration = 0; -var InputIteration = 0; function callAjax(obj) { - var getArray = getDetails(obj), - TotalItems = getArray.length, AjaxCall, - inputs = getInputs(obj,true), - element = inputs[InputIteration++]; - - if(AjaxIteration == getArray.length) + var getArray = updatePhotos(obj), + TotalItems = getArray.length; + alert(TotalItems); + $.each(getArray,function(i,v) { alert(i+" "+v) }) +} + +function updatePhotos(obj) +{ + var ID = obj.form.id, + Child = $("#"+ID).children().filter('div'), + eachObj, AjaxCall, i = 0, ParamArray = new Array(Child.length); + var err_count = 0; + $.each(Child,function(index,elem){ + eachObj = $(elem); + var inputs = $("#"+elem.id+" :input"), + query = ''; + + inputs.each(function(ind, input) { - $(obj).html(TotalItems+" Photos Saved. Continue").removeAttr('disabled'); - return; - } - else - { - - AjaxCall = - $.ajax - ({ - url: page, - type: "post", - dataType: "json", - data: getArray[AjaxIteration++], - cache: false, - beforeSend: function() { $(obj).html(loading_img+" Saving "+AjaxIteration+" of out "+TotalItems); $(obj).attr('disabled','disabled') }, - success: function(data) { - $('#'+element.id+" div:first-child > div").slideUp('normal'); - $('#'+element.id+" div:first-child").css('padding','10px').html( - "
"+data.photo_title+" is now saved.
" - ).fadeIn(350,function() { callAjax(obj); }); - - } - }); - } -} - -function getInputs(obj,return_array) -{ - var Child = $(obj).parent().children().filter('form'), InputArray = []; - if(return_array == true) - { - $.each(Child,function(index,element){ - InputArray[index] = element; + if(input.type == "text" || input.type == "textarea" || input.type == "hidden") + { + if(input.value == null || input.value == '') + { + err_count++; + input.style.border = '2px solid #ed0000'; + //ShouldContinue = false; + } else { + query += input.id+"="+input.value+"&"; + err_count = 0; + //ShouldContinue = true; + } + } + + if(input.type == "select-one" && input.selected) + query += input.id+"="+input.value+"&"; + if(input.type == "radio" && input.checked) + query += input.id+"="+input.value+"&"; }) - return InputArray; - } else - return Child; -} - -function getDetails(obj) -{ - var forms = getInputs(obj), ParamArray = new Array(forms.length); - - $.each(forms,function(index,form) { - query = $("#"+form.id+" *").serialize(); - query += "&mode=ajaxPhotos"; - ParamArray[index] = query; + query += "mode=ajaxPhotos"; + ParamArray[index] = query; + /* AjaxCall = + $.ajax + ({ + url: page, + type: "post", + dataType: "text", + data: query, + cache: false, + beforeSend: function() { $(obj).html(loading_img+" Saving"); $(obj).attr('disabled','disabled') }, + complete : function() { $(obj).html(Child.length+" photos saved") }, + success: function(data) { $("#"+eachObj.attr('id')).hide() } + }); + saving++; + */ }) - + return ParamArray; } -function viewRatings(object,pid) + + +function getName(File) { - var obj = $(object), innerHTML = obj.html(); - if(document.getElementById('RatingStatContainer')) - $("#RatingStatContainer").toggle(); - else - { - loadAjax = - $.ajax - ({ - url:page, - type: "post", - dataType: "text", - data: { mode:"viewPhotoRating", photoid:pid }, - beforeSend: function() { obj.html(loading); }, - success:function(data) { - obj.html(innerHTML); - if(data) - { - $("
").attr('id','RatingStatContainer') - .addClass('clearfix') - .css({ - "padding" : "8px", - "font" : "normal 11px Tahoma", - "border" : "1px solid #ccc" - }).html(data).fadeIn(350).insertAfter(obj); - } else { - obj.removeAttr('onclick'); - alert("Photo has not recieved any rating yet."); - } - } - }); - } + var url = File; + var filename = url.substring(url.lastIndexOf('/')+1); + return filename; } \ No newline at end of file diff --git a/upload/styles/cbv2new/images/ajax-loader-big.gif b/upload/styles/cbv2new/images/ajax-loader-big.gif new file mode 100644 index 0000000000000000000000000000000000000000..e66abbdb8aa93b3f7a7cbc98df82df7dedeeecaf GIT binary patch literal 2463 zcmeH{`B&2U8ppq1WHS*FH(UdA0k_1c)XD&{K$A4Ju+bUOOlcIYTst;{s3~YSGcChv ztjuNF$TmB53)IjV8_liFC2%P#Gu(IYb>`0P)H(fjf4!eS;B(%u=k>gwt*kAsZd@FI z1Ev80*!u*=`vc8yF*x`Xm(XgQ*lM2KW|7i{Pi?a~++i>1SS{?NWIdziz1Vi5%eSyA zptvXKbPq?;6IG^+E>p!;sNyR75-#^AUg=M~I*@X0AnnGWsOD|4{KMJ$;i{&Q>n)#d zx2x}VsPA=-)^&~7caJypO#JqGqNQ)LwSTJX-AwoUnZZwUAI9fDO)h+zS{R>MoSIvl znO~ZnU($+g)`@E|N@#Tubgs{SzCrZdBlpFY{8y}ku7FeBA!mET&%frLSMn~Y4qYEO za_4RCy&*~6hjWiV+-g(bZC5{fIVO8K*3diAq?~-BoNODIY9E|>F*N;hX!_N=nZA#+ zZ`5<|#^ygx%&Vss#-8%{C%lnxU%WvopyCi$EaeNu6LsI&Gf*hx#98o;feYA z#ibQ7&D#7Hr}R$mf-e74-Mi29?kiWNUK<#hoFAE7n3`RLM*m^^Q^&T#uHcfM;F4Z` zRo|WV(fiLvHGgbgm;Kyb^t@R$IjEj{KQ=!)y}&N&imU2x?46ifSXvhN|M$O4fbcIZ zwpU<)C(X~x#mQL%T>gu&$a)UkH+>Cb8B~Tb`1Mm>oyj$$+j#4mpY?SDD zt$hT*?8QEA3KSj;*oqJGrnJEP#T+BWX6aGamQ5mY5ECDm=Z&IJHf+z`Ra*oGv8=x* z{vK|H%w{bT9p9;x^6bn)&e}92d8a(Xz?dh;+FfiohW8Ykv8u~{J3(AF^`EgrzJ`D- zLkN?yazq*XqoenW^M&?kE*EWgJkupu$S*3ggz%$`ti%U+Ch-trI2RR8!hatUs#Tul z!b78@5+SjXdt!t4-o9;=<6`na{}CkdQShG7klTi$_$a+Nkp%(@{h>#cm>>?eh}g5w z>fmW{f)V07tr&HV1qdvJ49q}=U6orgrZRzsCWM*fCzBjrTmm!G%bN_HElkkW7cHAN z9Q_QD3HdL?mnM)hKm%#Ul$Odf;2LYWSmgP-^et1v1Ex)vSRYNvTZ}Y~KrxC111o{v~(n!wH&4>O_ z$Q+C2<{6o2dc350wpv;v%+p=RYQyq20R<3F;EB?UD^a)*L7?*r@DdPBOoc)+F9LW& zGN-K64%`)dCSax*f2WBdlqTROtwkUb-42taeg{QJ^+*5_N8bH&C}4T)A6X z$O*40%`@<)9*BQJ>szI@o*xozLROrxEz*WVztJ0H4FLOl<^HnsnJT{7${@+68oYU_ z369f!9S>4nWRjc$=C65$qg?MIfJ0Af_lgvtvFrJ6`RUE|Zq^-n#{C31-Q5ZEaJDv! zYNUhE^{ou+3xid#8yYc6%PPQK&y3L~y{&{*gw_;`TFbYcUKe7|5NDP<(6Cy__)&;u z77mW8FU0`18YXT?R!F6Q30TSmrdm1NWR;jHSXEW*%E~yx(l`GM^HqNye4)sq>=wiu zm8Dq$5W*r_^m5=N5R~c4&{Uk}wV^g$*-0z`v4!9__K$)>NW?Hn)UUfOeS1>OJ-s*9 zPqs4B{D>FoZJyu^k;KE)!My_8)I#hKq?QzD>RsjTWf!zPpdv6wJ*xMZC*RDcrX`98 z={Wf2^5W3iA;*kg*(F0MrV3xd*4S6LEL;S$N9$+e{uH$!<77Vhq=Ou*)PX7VsgkwT TQO9&|l221ok?xUHV8g!wwrPPZ literal 0 HcmV?d00001 diff --git a/upload/styles/cbv2new/images/ajax-loader.gif b/upload/styles/cbv2new/images/ajax-loader.gif index ffdbf737fe9fcd590abe482f01875ffae1c7d18f..61e4993f1a20bcd3f516a46e72f6a50e0fd1cba8 100644 GIT binary patch literal 1482 zcmZ?wbhEHb6krfwc+9}SGV9KqTVJlc`}5}8pPXZF{`~u6vhK;3e}A?-`ts%1ACW~* zmfZSs=hL4zzy8#mdSkQciQ<25Ki808XU70nBRvCVMg|53#h)ykYz(XnIzTqiPywK! z=^IYWl<+p5uI9FJ+Le^UNoLayh`dtee5Mp~{lJQQV$X$iC&>CL9u&5av441BQh~s{ zQ~W193tWP?X9am2u3^%Cc;IxEgxu|Lk4*+U#5r1-5_dmkN!!B25D*d~$;4=1T`QCv zSXk^N2(_CFVRsAALoMgt9C`NT$)`U+AGmA-`2gsAkSD(V0s0T<%RP_20DXDp)t@Kd z{s8^zv+c>6dtX4VCjzkME>P<0SK&=wWpie+N1I}&yOqulhSMyMgq7Ix4qlimWar}4 zBB2x{(8A0p!rP@4xJau*ge5YtKPtmSDbZCZP*3F2>v!h1>#UgiK9oIS`0-iOGnBE8 zfw9!X&YP>Yjww62L8-hln~SA7u{2T{LB^Z1QX`QH4On80<%1u4ti)XFt~;|EsfiJo7ee3hTY-IuUaHh zzaIlDI~yvm|+v52p*CjaLi zz6I6=fePIZ97HZKGA$KW-jUEzWOao@{)3JL-&Ycdoj^6ZP>=#*sOae>41 z_FLA~@~L`?3;kM_$JaNMadC3+anv=o#n&ihlr~OKu1+k7Wp2_couz~|fYUad=$ztY zd|FME!RsK4&oK_4M~#P)ZJJCB(t~0f7wQYoN?RMAW8{(H(wNwkW+TSJ*UtY`$ATk5 zYHgLO#Wefn2Ug2ius1DhF`Hu|R#2SSre(zX!Sy!#GTu)`Ms7K(8I4j2S;7Mnyr9&} z(j<_qCATP3%kROGyq8uEcG{h@Z*)5F2}mf)EEmyJSNI!ZF!MxPlNL*B$AQ)jT1vfc zEw6Q3ltb1lESjsfhTrXa#;Pv1?mrG!oYmxngbFLUc}moU*w}GBI?OiG5m}?O|(@my$mactluuvj2%XzNqrYEnYTAUg+3{8Yt85Vqy znaHa8nO&EoQ_E5RFb9WPbL$M_Y6-dflPeSjEM%G*68GI$!_LRVnCI5aDpOgd9v8|~ zohdmWVVj2(w(C|!pV~BI$4Q?%X+}zY!K*}EI?LQb{k}}_kkgvfsbDCfa&g+~sIg9n165A)elNl zm%Jw3>e}%vvv$|MczmwoC699DRN2 z-sg8;elfs+;(u;G*N|Xm#{gF&Jp*P&pt#~cDd(cp#FEq$h4Rdj428t3#EP8!#1y^E zytI4<#h)yk+(1=2AQM22WMI`*Q0Pm^oVR2F*P~NR>l_4{EzX!0T&})%d&hh}_9uev zTOK)_;L$5yca6(+?KCHBCa5GNO0Xu(TahW#K5^fHTZdM@xwO3Z`J273cSq=J%wcV` z7VMN@!luy-Xmxj@&f^XhP9-Ux3x%yi7F0Hviir7ptf`rGlO%cyr0w?eAxRewW>UwfZ>?5nVx6^JjrX7wC ze4)(Pd*ay%*5r9!E3bZ)!s<73h%qXKu`Me$B`wRm*_t>#D{U#8P%XIybny*|K2WBFrE8b f*O6I;tunvjbQw(8oFmsS!5Tm$n_&$~B47XjNj47* diff --git a/upload/styles/cbv2new/images/error.png b/upload/styles/cbv2new/images/error.png new file mode 100644 index 0000000000000000000000000000000000000000..494d66236fa33d0fa37e4b629ac533e59110f625 GIT binary patch literal 4681 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 literal 0 HcmV?d00001 diff --git a/upload/styles/cbv2new/layout/upload.html b/upload/styles/cbv2new/layout/upload.html index 384a9bc7..229c7156 100644 --- a/upload/styles/cbv2new/layout/upload.html +++ b/upload/styles/cbv2new/layout/upload.html @@ -1,9 +1,3 @@ -{assign var='requiredFields' value=$Upload->loadRequiredFields()} -{assign var='optionFields' value=$Upload->loadOptionFields()} -{assign var='locationFields' value=$Upload->loadLocationFields()} -{assign var='cust_fields' value=$Upload->custom_form_fields} - - {lang code='vdo_upload_step2' assign='vdo_upload_step'}
@@ -17,8 +11,7 @@ $(document).ready(function() { show_menu('file_upload_div') }) {/literal} -
- + {assign var=opt_list value=$Upload->load_upload_options()}
    {foreach from=$opt_list item=opt key=divid} @@ -28,14 +21,9 @@
    {foreach from=$opt_list item=opt key=divid}
    - - -
    + {load_form name=$opt.load_func button_class='cb_button_2' class='upload_form'} +
{/foreach} - - - - Upload Files {/if} @@ -43,36 +31,6 @@ - - - - {if $step =="2"} -

{$vdo_upload_step|sprintf:2}

- {literal} - - {/literal} -
- {$Upload->load_post_fields()} - - - {assign var=opt_list value=$Upload->load_upload_options()} -
    - {foreach from=$opt_list item=opt key=divid} -
  • {$opt.title}
    • - {/foreach} -
-
- {foreach from=$opt_list item=opt key=divid} -
- {load_form name=$opt.load_func button_class='cb_button_2' class='upload_form'} -
- {/foreach} -
- {/if} - - {if $step==3}
diff --git a/upload/styles/cbv2new/theme/main.css b/upload/styles/cbv2new/theme/main.css index 17d6ef54..b5657c77 100644 --- a/upload/styles/cbv2new/theme/main.css +++ b/upload/styles/cbv2new/theme/main.css @@ -374,7 +374,7 @@ span.remember { font-size:10px; } .cbSubmitUpload:hover,.cb_button:hover,.cb_button_2:hover{background-position:-0px -31px} .cbSubmitUpload,.cb_button_2{font-size:12px} -input[disabled=disabled].cbSubmitUpload{ background:#f2f2f2; cursor:default; color:#999; border:1px solid #ccc; font:normal 11px Tahoma;} +input[disabled].cbSubmitUpload{ background:#f2f2f2; cursor:default; color:#999; border:1px solid #ccc; font:normal 11px Tahoma;} @@ -779,19 +779,27 @@ ul.upload_opts li.selected { cursor:pointer; background:none; border:1px solid; .remote_main_bar { - width:400px; - height:30px; - border:1px solid #666; + width:100%; + height:20px; + background-image:url(../images/uploading_bar.png); + border-width:0px 1px 0px 1px; border-color:#dedede; border-style:solid; } - +#rempteUploadFormDiv{padding-right:10px;} .remote_prog_bar { - height:30px; - background-color:#53baff; + height:20px; + background-image:url(../images/uploading_bar.png); + background-position:-0px -20px; text-align:center; - line-height:30px; + font:normal 13px "Arial Black", Gadget, sans-serif; + color:#fff; + line-height:20px; width:0px } + +.remoteDownloadStatus{ font-weight:bold; display:none } +#remote_upload_div .remoteUrlInput {width:100%; border-style:solid; border-color:#dedede; border-width:1px 1px 0px 1px; height:20px; color:#999999 } + /* COLLECTION */ .collect_grid { position:relative; } .obj_title { width:110px; display:inline-block; } diff --git a/upload/styles/global/head.html b/upload/styles/global/head.html index e02ec7a3..595a2911 100644 --- a/upload/styles/global/head.html +++ b/upload/styles/global/head.html @@ -11,6 +11,7 @@ var file_name = '{$file_name}'; var lang = new Array(); lang['saveData'] = 'Save Data'; lang['savingData'] = 'Saving...'; +lang['remoteUploadFile'] = '{lang code="remote_upload_file"}'; var fileExt = '{$Cbucket->list_extensions()|replace:",":";"}'; {literal} @@ -21,8 +22,8 @@ var fileExt = '{$Cbucket->list_extensions()|replace:",":";"}'; } function show_message(msg,ID,fade) - { $('#file_uploads'+ID+' .percentage') - .after('
'+msg+'<\/div><\/div>'); + { $('#uploadForm'+ID) + .prepend('
'+msg+'<\/div><\/div>'); if(fade){$('.uploadSuccessDiv').delay(3000).fadeOut('slow');} }