diff options
Diffstat (limited to 'templates/nutrinoweb/main.html')
| -rw-r--r-- | templates/nutrinoweb/main.html | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/templates/nutrinoweb/main.html b/templates/nutrinoweb/main.html index 20a8c9a..77806b8 100644 --- a/templates/nutrinoweb/main.html +++ b/templates/nutrinoweb/main.html @@ -2,8 +2,7 @@ {% block head %} {% endblock %} {% block content %} - <h1>{{ title }}</h1> - <div class=sun><img class=sun src='../../static/images/journal/sun.png'></img></div> + <div class=sun><img class=sun src='../../static/images/journal/sun.png'></img><div style="color:#808080;float:right">{{positionSun.timeString}}</div></div> <div class="main"> <div class="water-wrap"><div class="water-value"></div></div> <div class="energie-wrap"><div class="energie-value"></div></div> @@ -11,7 +10,7 @@ <div class="construction-wrap"><div class="construction-value"</div></div> </div> - {% for cont in content %} + {% for cont in progressbar %} <div class=alimentimages><img class=alimentimages src="{{cont.pathimg}}"></img></div> <script type="text/javascript"> var images = $("img.alimentimages").hide(); @@ -23,29 +22,14 @@ $(".vitamine-value").css({ height:'{{cont.vitaminestart}}%'}); $(".vitamine-value").animate({height: '{{cont.vitamine}}%'}, {duration: 2500, easing: "linear"}) $(".construction-value").css({ height:'{{cont.constructionstart}}%'}); - $(".construction-value").animate({height:'{{cont.construction}}%'}, {duration: 2500, easing: "linear"}) - $("img.sun").animate({marginTop: '{{ position[0] }}', marginLeft: '{{ position[1] }}'}, {duration: 2500, easing: "swing"}) + $(".construction-value").animate({height:'{{cont.construction}}%'}, {duration: 2500, easing: "linear"}); + $("img.sun").css({marginTop: '{{positionSun.positionstartX}}px', marginLeft: '{{positionSun.positionstartY}}px'}); + $("img.sun").animate({marginTop:'{{positionSun.positionX}}px', marginLeft: '{{positionSun.positionY}}px'}, {duration: 2500, easing: "linear"}); </script> {% endfor %} </div> - <div class=reset><form action="/main" method=post> <input type=submit value='reset' name=reset> </form></div> -<!--{% for cont in content %} -title: {{cont.title}}</br> -waterstart: {{cont.waterstart}}</br> -water: {{cont.water}}</br> -energiestart: {{cont.energiestart}}</br> -energie: {{cont.energie}}</br> -vitaminestart: {{cont.vitaminestart}}</br> -vitamine: {{cont.vitamine}}</br> -constructionstart: {{cont.constructionstart}}</br> -construction: {{cont.construction}}</br></br> -{% endfor %}--> - {% endblock %} - - -<!--{ 'background-image': 'url({{cont.pathimg}})'}--> |