Commit 9a7f66b6 authored by frankie's avatar frankie 💬

server backup

parent 3124325c

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

*.sublime-project
*.sublime-workspace
nodejs/sisyphus.inventory/log_*
nodejs/sisyphus.persistent/lasttime
nodejs/sisyphus.persistent/shape
models/sisyphus_*
server/node_modules/*
models/generated/log_*
rangeSlider-master/*
slider.html
......@@ -248,7 +248,7 @@ a {
.goto_gallery,
.goto_share,
#toggle_camera {
position: absolute;
position: fixed;
top: 20px;
left: 20px;
white-space: nowrap;
......@@ -731,37 +731,34 @@ a {
visibility: hidden;
}
#model_info {
position: absolute;
right: 0px;
margin: -65px 10px 0 0;
text-align: right;
text-shadow:
-1px -1px 0 #000,
1px -1px 0 #000,
-1px 1px 0 #000,
1px 1px 0 #000;
}
#range_area {
margin: 20px 100px 20px 15px;
margin: 44px 85px 20px 15px;
}
#duration {
position: absolute;
right: 0;
margin: -30px 10px 0 0;
margin: -29px 15px 0 0;
padding: 0;
height: 20px;
overflow: hidden;
vertical-align: middle;
visibility: hidden;
font-size: 0.7em;
}
#model_info {
position: absolute;
right: 0px;
margin: -57px 15px 0 0;
text-align: right;
font-size: 0.7em;
}
#display_info {
position: absolute;
right: 0;
margin: -75px 10px 0 0;
margin: -57px 15px 0 0;
width: 24px;
height: 24px;
}
......@@ -778,23 +775,23 @@ a {
width: 50px;
}
#model_shortcuts a {
text-decoration: none;
padding: 3px;
color: #f00;
font-weight: bold;
display: block;
float:left;
margin: -10px -6px;
text-decoration: none;
padding: 3px;
color: #f00;
font-weight: bold;
display: block;
float:left;
margin: -10px -6px;
}
#model_shortcuts a div {
z-index: 9999;
position: absolute;
display:none;
font-size: 12px;
color: #000;
background: #0ff;
padding: 5px 10px;
margin-top: -25px;
z-index: 9999;
position: absolute;
display:none;
font-size: 12px;
color: #000;
background: #0ff;
padding: 5px 10px;
margin-top: -25px;
}
#model_shortcuts a:hover div {
display:block;
......
......@@ -24,7 +24,7 @@
<div id="container"></div>
<div id="splash">
<div class="splash_bg" style="background-image: url('textures/splash_bg.png');">
<div class="splash_bg" style="background-image: url('textures/splash_bg_fullhd.jpg');">
<div class="splash_title">
<h1>Sisyphus</h1>
</div>
......
......@@ -801,6 +801,10 @@ function hide_timeline() {
document.getElementById( 'timeline' ).style.visibility = 'hidden';
}
function shorten_duration( txt ) {
return txt.replace( ' day,', 'd' ).replace( ' hours,', 'hrs' ).replace( ' minutes,', 'min' ).replace( ' seconds,', 'sec' )
}
function gallery_item_out() {
document.getElementById( 'inventory_info' ).className = '';
console.log( 'gallery_item_out' );
......@@ -816,7 +820,7 @@ function gallery_item_hover( id ) {
}
text += n + ",</span> <span>produced on ";
var c = sisyphus_cubes_library[id];
text += c.date + ' in ' + c.duration_r;
text += c.date + ' in ' + shorten_duration( c.duration_r );
text += '</span>';
text += '</div>';
document.getElementById( 'inventory_info' ).innerHTML = text;
......@@ -859,7 +863,7 @@ function gallery_item_click( id ) {
document.getElementById( 'inventory_info' ).className = '';
document.getElementById( 'model_info' ).innerHTML =
'<span class="info_name">chair ' + n + '</span>, ' +
'<span class="info_date">produced on ' + cube.date + ' in ' + cube.duration_r + '</span>';
'<span class="info_date">produced on ' + cube.date + ' in ' + shorten_duration( cube.duration_r ) + '</span>';
info_panel_pivot.visible = false;
......
This diff is collapsed.
......@@ -3,9 +3,9 @@ import os, shutil
overwrite_icon = False
overwrite_morph = False
overwrite_diff = False
overwrite_legs = True
overwrite_legs = False
inventory = '../../private/server/sisyphus.inventory'
inventory = '../server/sisyphus.inventory'
models = '../../private/models/generator/generated'
model_needles = [ '_icon.png', '_morph.json', '_diffuse.png', '_legs.json' ]
deploy = '../models/generated'
......
server.modules = (
"mod_access",
"mod_alias",
"mod_compress",
"mod_redirect",
"mod_proxy",
# "mod_rewrite",
)