diff --git a/lib/imp.js b/lib/imp.js index 05c901959f74d8e923e9a65f6ef0a84a38d90d52..885f8f956fb154ae1f26a946005671560a9aea55 100644 --- a/lib/imp.js +++ b/lib/imp.js @@ -253,12 +253,11 @@ $('#but-variant').on('change', function(){ // set last tab in cookie $('#tabs a[data-toggle="tab"]').on('shown.bs.tab', function (e) { - Cookies.set('tab', '#' + e.target.id); - e.target + $.cookie('tab', $(e.target).attr('href')); }) // show lat iopenned tab or first one -if(Cookie.get('tab')){ - $(Cookie.get('tab')).tab('show'); +if($.cookie('tab')){ + $('#tabs li > a[href=' + $.cookie('tab') + ']').tab('show') } else { $('#tabs li:first > a').tab('show'); } diff --git a/rules/Util.rules b/rules/Util.rules index 2d3d291a3765c114f2445ea71a46ec99fb50ad35..25049e18eb22fb1a41095036e48cb6b3262f63af 100644 --- a/rules/Util.rules +++ b/rules/Util.rules @@ -42,7 +42,6 @@ rule REPORT: "lib/bootstrap.min.css", "lib/bootstrap.min.js", "lib/imp.js", - ] + expand(["{dir}/workflow.png", "{dir}/workflow.pdf"], dir=OUTPUTDIR) output: @@ -56,7 +55,12 @@ rule REPORT: towrite = json.dumps(config) whandle.write("IMP_CONFIG = %s;" % towrite) shell("cp {input[0]} {params.outdir}/REPORT.html") - shell("cp {input[1:]} {params.outdir}") + shell("cp -f {input[1]} {params.outdir}") + shell("cp -f {input[2]} {params.outdir}") + shell("cp -f {input[3]} {params.outdir}") + shell("cp -f {input[4]} {params.outdir}") + shell("cp -f {input[5]} {params.outdir}") + shell("cp -f {input[6]} {params.outdir}") rule REPORT2: