diff --git a/data/getBlockInfo.php b/data/getBlockInfo.php index c837b30..ba9e4d2 100644 --- a/data/getBlockInfo.php +++ b/data/getBlockInfo.php @@ -45,7 +45,7 @@ if (isset($_REQUEST['block_hash'])) header('Content-Type: application/json'); } -$message = '{"hash":"'.$the_block->hash.'", "block_index":"'.$the_block->block_index.'", "time":"'.date('Y/m/d H:i:s', $the_block->time).'", "height":"'.$the_block->height.'", "topisto_outputs":"'.$the_block->topisto_outputs.'", "prev":"'.$the_block->prev_block.'", "topisto_inputs":"'.$the_block->topisto_inputs.'", "topisto_fees":"'.$the_block->topisto_fees.'", "topisto_reward":"'.$the_block->topisto_reward.'", "nonce":"'.$the_block->nonce.'", "n_tx":"'.$the_block->n_tx.'"}'; +$message = '{"hash":"'.$the_block->hash.'", "block_index":"'.$the_block->block_index.'", "time":"'.$the_block->time.'", "height":"'.$the_block->height.'", "topisto_outputs":"'.$the_block->topisto_outputs.'", "prev":"'.$the_block->prev_block.'", "topisto_inputs":"'.$the_block->topisto_inputs.'", "topisto_fees":"'.$the_block->topisto_fees.'", "topisto_reward":"'.$the_block->topisto_reward.'", "nonce":"'.$the_block->nonce.'", "n_tx":"'.$the_block->n_tx.'"}'; if ($_REQUEST['FULL'] == 'OK') $message = json_encode($the_block); diff --git a/images/logo/monochrome/monochrome.sh b/images/logo/monochrome/monochrome.sh new file mode 100755 index 0000000..2947d1f --- /dev/null +++ b/images/logo/monochrome/monochrome.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +rm -f *.png + +# monochrome +convert ../../topisto_vert.png -monochrome topisto_tmp1.png +composite -compose copy_opacity ../topisto_mask.png topisto_tmp1.png topisto_tmp2.png +rm -f topisto_tmp?.png + +# grayscale +convert ../../topisto_vert.png -type Grayscale topisto_tmp1.png +composite -compose copy_opacity ../topisto_mask.png topisto_tmp1.png topisto_tmp2.png +convert topisto_tmp2.png -negate topisto_grayscale.png +rm -f topisto_tmp?.png + +exit 0 diff --git a/images/logo/monochrome/topisto_grayscale.png b/images/logo/monochrome/topisto_grayscale.png new file mode 100644 index 0000000..453485b Binary files /dev/null and b/images/logo/monochrome/topisto_grayscale.png differ diff --git a/images/logo/tr (copie)/gmic.sh b/images/logo/tr (copie)/gmic.sh deleted file mode 100755 index 3289282..0000000 --- a/images/logo/tr (copie)/gmic.sh +++ /dev/null @@ -1,6 +0,0 @@ -toto=$1 -gmic ../../topisto_vert_tr.png $@ -output topisto_tmp_$toto.png - -convert topisto_tmp_$toto.png -fuzz 10% -transparent white topisto_$toto.png - -rm -f topisto_tmp_$toto.png diff --git a/images/logo/tr (copie)/go.sh b/images/logo/tr (copie)/go.sh deleted file mode 100644 index d30feb5..0000000 --- a/images/logo/tr (copie)/go.sh +++ /dev/null @@ -1,32 +0,0 @@ - source gmic.sh endgrave fx_engrave 0.5,4,0,7.68,15.2,0,0,1,10,1,0,0,0,1,0 gui_merge_layers - source gmic.sh bokeh fx_bokeh 3,8,0,30,8,4,0.3,0.2,210,210,80,160,0.7,30,20,20,1,2,170,130,20,110,0.15,0 - source gmic.sh 8bits fx_8bits 25,800,16,0 - source gmic.sh 8bits fx_8bits 25,800,16,0 - source gmic.sh - source gmic.sh fire_edges 0.7,0.25,0.5,25,20 - source gmic.sh fire_edges fire_edges 0.7,0.25,0.5,25,20 - source gmic.sh diffusiontensors fx_diffusiontensors 10,5,3,1,0.15,1,0,3,0 - source gmic.sh feltpen fx_feltpen 300,50,1,0.1,20,5,0 - source gmic.sh gtutor_fpaint 0.5,0.5,0,0,45,0.5,0.5,0.5,0 - source gmic.sh fx_graphic_novelfxl 0,2,6,5,20,0,0.62,14,0,1,0.5,0.78,1.92,0,0,0,1,1,1,0.5,0.8,1.28 - source gmic.sh fx_illustration_look 100,0,0,0,0 - source gmic.sh fx_lylejk_painting 10,2,4,10,0 - source gmic.sh fx_painting 5,2.5,1.5,50,1,0 - source gmic.sh fx_posterize 150,30,1,6,0,0,1,0 - source gmic.sh fx_quadtree 2,1024,1.05,0,2.33,0.68,0.39,1,0 - source gmic.sh fx_vector_painting 9.37,0 - source gmic.sh boxfitting - source gmic.sh boxfitting , - source gmic.sh cartoon 3,80,15 - source gmic.sh cubism , - source gmic.sh halftone , - source gmic.sh blur 2 light_relief 0.3,4,0.1,0 - source gmic.sh +sketchbw 1 reverse blur[-1] 3 blend[-2,-1] overlay - source gmic.sh mosaic , - source gmic.sh linify 40 - source gmic.sh polygonize 300,1%,0.1%,3%,3% - source gmic.sh poster_hope , - source gmic.sh rodilius 12,10,300,10 normalize_local 10,6 - source gmic.sh stained_glass 20%,0.1 - source gmic.sh fx_shapes 1,16,10,2,5,106.8,2,0,0,1,0 - source gmic.sh fx_shapeism 2,7,0.38,0,1,5,32,8,3,1,5,0.5,1,0,0,0,255 diff --git a/images/logo/tr (copie)/topisto_8bits.png b/images/logo/tr (copie)/topisto_8bits.png deleted file mode 100644 index e9f1e57..0000000 Binary files a/images/logo/tr (copie)/topisto_8bits.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_blur.png b/images/logo/tr (copie)/topisto_blur.png deleted file mode 100644 index ff20189..0000000 Binary files a/images/logo/tr (copie)/topisto_blur.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_bokeh.png b/images/logo/tr (copie)/topisto_bokeh.png deleted file mode 100644 index 16ab1ae..0000000 Binary files a/images/logo/tr (copie)/topisto_bokeh.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_boxfitting.png b/images/logo/tr (copie)/topisto_boxfitting.png deleted file mode 100644 index d051941..0000000 Binary files a/images/logo/tr (copie)/topisto_boxfitting.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_cartoon.png b/images/logo/tr (copie)/topisto_cartoon.png deleted file mode 100644 index 2865683..0000000 Binary files a/images/logo/tr (copie)/topisto_cartoon.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_cubism.png b/images/logo/tr (copie)/topisto_cubism.png deleted file mode 100644 index 7bc1970..0000000 Binary files a/images/logo/tr (copie)/topisto_cubism.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_diffusiontensors.png b/images/logo/tr (copie)/topisto_diffusiontensors.png deleted file mode 100644 index 0b11d75..0000000 Binary files a/images/logo/tr (copie)/topisto_diffusiontensors.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_dreamsmooth.png b/images/logo/tr (copie)/topisto_dreamsmooth.png deleted file mode 100644 index 9deb13f..0000000 Binary files a/images/logo/tr (copie)/topisto_dreamsmooth.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_endgrave.png b/images/logo/tr (copie)/topisto_endgrave.png deleted file mode 100644 index c8adc16..0000000 Binary files a/images/logo/tr (copie)/topisto_endgrave.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_feltpen.png b/images/logo/tr (copie)/topisto_feltpen.png deleted file mode 100644 index 5fa0084..0000000 Binary files a/images/logo/tr (copie)/topisto_feltpen.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_graphic_novelfxl.png b/images/logo/tr (copie)/topisto_fx_graphic_novelfxl.png deleted file mode 100644 index 5b8901d..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_graphic_novelfxl.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_illustration_look.png b/images/logo/tr (copie)/topisto_fx_illustration_look.png deleted file mode 100644 index ab6dd14..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_illustration_look.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_lylejk_painting.png b/images/logo/tr (copie)/topisto_fx_lylejk_painting.png deleted file mode 100644 index 44ca31d..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_lylejk_painting.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_painting.png b/images/logo/tr (copie)/topisto_fx_painting.png deleted file mode 100644 index 893c897..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_painting.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_posterize.png b/images/logo/tr (copie)/topisto_fx_posterize.png deleted file mode 100644 index b3cf31b..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_posterize.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_quadtree.png b/images/logo/tr (copie)/topisto_fx_quadtree.png deleted file mode 100644 index 8f8486e..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_quadtree.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_shapeism.png b/images/logo/tr (copie)/topisto_fx_shapeism.png deleted file mode 100644 index 577880e..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_shapeism.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_shapes.png b/images/logo/tr (copie)/topisto_fx_shapes.png deleted file mode 100644 index 85b2199..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_shapes.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_fx_vector_painting.png b/images/logo/tr (copie)/topisto_fx_vector_painting.png deleted file mode 100644 index cda3b22..0000000 Binary files a/images/logo/tr (copie)/topisto_fx_vector_painting.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_gtutor_fpaint.png b/images/logo/tr (copie)/topisto_gtutor_fpaint.png deleted file mode 100644 index 38bf196..0000000 Binary files a/images/logo/tr (copie)/topisto_gtutor_fpaint.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_halftone.png b/images/logo/tr (copie)/topisto_halftone.png deleted file mode 100644 index afdd119..0000000 Binary files a/images/logo/tr (copie)/topisto_halftone.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_linify.png b/images/logo/tr (copie)/topisto_linify.png deleted file mode 100644 index 0b8dd8e..0000000 Binary files a/images/logo/tr (copie)/topisto_linify.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_mosaic.png b/images/logo/tr (copie)/topisto_mosaic.png deleted file mode 100644 index 30ac893..0000000 Binary files a/images/logo/tr (copie)/topisto_mosaic.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_polygonize.png b/images/logo/tr (copie)/topisto_polygonize.png deleted file mode 100644 index abd986c..0000000 Binary files a/images/logo/tr (copie)/topisto_polygonize.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_poster_hope.png b/images/logo/tr (copie)/topisto_poster_hope.png deleted file mode 100644 index 96aefb6..0000000 Binary files a/images/logo/tr (copie)/topisto_poster_hope.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_rodilius.png b/images/logo/tr (copie)/topisto_rodilius.png deleted file mode 100644 index 2c970ac..0000000 Binary files a/images/logo/tr (copie)/topisto_rodilius.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_sketchbw.png b/images/logo/tr (copie)/topisto_sketchbw.png deleted file mode 100644 index bea4ad8..0000000 Binary files a/images/logo/tr (copie)/topisto_sketchbw.png and /dev/null differ diff --git a/images/logo/tr (copie)/topisto_stained_glass.png b/images/logo/tr (copie)/topisto_stained_glass.png deleted file mode 100644 index 349a7a1..0000000 Binary files a/images/logo/tr (copie)/topisto_stained_glass.png and /dev/null differ diff --git a/images/topisto_vert_tr.gif b/images/topisto_vert_tr.gif new file mode 100644 index 0000000..0110881 Binary files /dev/null and b/images/topisto_vert_tr.gif differ diff --git a/js/blockexplorer.js b/js/blockexplorer.js index 43bd32c..2f0b42f 100644 --- a/js/blockexplorer.js +++ b/js/blockexplorer.js @@ -34,6 +34,34 @@ blockchainExplorer = function(){ return retour; } + function _convertUTCDateToLocalDate(date) { + var newDate = new Date(date.getTime()+date.getTimezoneOffset()*60*1000); + + var offset = date.getTimezoneOffset() / 60; + var hours = date.getHours(); + + newDate.setHours(hours - offset); + + return newDate; + } + + function _formatDate(unixtime) + { + var ladate = new Date(unixtime*1000); + var ladateStr = ""; + + ladate = _convertUTCDateToLocalDate(ladate); + + ladateStr += ladate.getFullYear(); + ladateStr += "/" +("00"+(ladate.getMonth()+1)).slice(-2); + ladateStr += "/" +("00" + ladate.getDate()).slice(-2); + ladateStr += " " +("00" + ladate.getHours()).slice(-2); + ladateStr += ":" +("00" + ladate.getMinutes()).slice(-2); + ladateStr += ":" +("00" + ladate.getSeconds()).slice(-2); + + return ladateStr; + } + function _addInfoForBlock(block) { var contenu = ''; @@ -62,7 +90,7 @@ blockchainExplorer = function(){ //contenu += ' index'+block.block_index+''; if (_mode == 3 ) contenu += ' name'+blockName+''; contenu += ' height'+block.height+''; - contenu += ' timestamp'+block.time+''; + contenu += ' timestamp'+_formatDate(block.time)+''; contenu += ' nonce'+block.nonce+''; contenu += ' nb tx'+block.n_tx+''; contenu += ' outputs'+_precisionRound(block.topisto_outputs).toFixed(4)+'';