diff --git a/whoosh/Book/MAIN_WRITELOCK b/176_Tilo_Arens_Rolf_Busam_Frank_Hettlich_Christianb-ok.xyz.txt
old mode 100755
new mode 100644
similarity index 100%
rename from whoosh/Book/MAIN_WRITELOCK
rename to 176_Tilo_Arens_Rolf_Busam_Frank_Hettlich_Christianb-ok.xyz.txt
diff --git a/app/static/css/style.css b/app/static/css/style.css
index 5573e85..f6d64ec 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -242,7 +242,7 @@ div.marquee > div.marquee-text {
position: fixed;
bottom: 0;
right: 0;
- width: 30%;
+ width: 25%;
height: 100%;
}
@@ -254,7 +254,7 @@ div.marquee > div.marquee-text {
padding: 10px;
margin: 0px;
height: 100%;
- background-color: #b4b9be;
+ /*background-color: #b4b9be;*/
overflow-y: scroll;
overflow-x: hidden;
color: white;
@@ -265,6 +265,43 @@ div.marquee > div.marquee-text {
z-index: -100000;
}
+.messageback1{
+
+position: absolute;
+bottom: 40px;
+display: block;
+width:100%;
+padding: 0px;
+margin: 0px;
+height: 100%;
+background-color: #b4b9be;
+overflow-y: scroll;
+overflow-x: hidden;
+color: white;
+word-wrap:break-word;
+box-sizing: border-box;
+-webkit-box-sizing: border-box;
+-moz-box-sizing: border-box;
+z-index: -100000;}
+
+.messageback2{
+position: absolute;
+bottom: 40px;
+display: block;
+width:100%;
+padding: 0px;
+margin: 0px;
+height: 100%;
+background-color: #b4b9be;
+overflow-y: scroll;
+overflow-x: hidden;
+color: white;
+word-wrap:break-word;
+box-sizing: border-box;
+-webkit-box-sizing: border-box;
+-moz-box-sizing: border-box;
+z-index: -100000;}
+
.new-message {
position: absolute;
bottom: 0;
@@ -273,6 +310,7 @@ width:100%;
margin:0;
padding:0;
z-index: 100000;
+opacity: 1!important;
}
.control{
display: block;
diff --git a/app/templates/add_book.html b/app/templates/add_book.html
index 6326174..2c95484 100755
--- a/app/templates/add_book.html
+++ b/app/templates/add_book.html
@@ -36,7 +36,7 @@ function outputUpdate3(gender) {
- Author(s):*
+ Author(s):*
|
diff --git a/app/templates/base.html b/app/templates/base.html
index f407b49..fcf238d 100755
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -99,6 +99,31 @@ socket.on('connect', function() {
});
socket.on('channel-' + app.channel, function(msg) {
+ console.log("new: "+msg.text)
+
+
+ $(".messageback1").each(function() {
+ var oldColor = $(this).css("background-color");
+ var randomColor = colorHash(msg.text).rgb;
+ console.log("old: "+oldColor)
+ console.log("new: "+randomColor)
+ $(this).css({
+ background: "-webkit-gradient(linear, left top, left bottom, from("+oldColor+"), to("+randomColor+"))",
+ backgroundColor: randomColor
+ });
+
+ $('.messageback2').animate({
+ opacity: 0
+ }, 1000, function() {
+ $('.messageback2').css({background: "-webkit-gradient(linear, left top, left bottom, from("+oldColor+"), to("+randomColor+"))", opacity: 1})
+ });
+
+
+});
+
+
+
+
// Add new message to HTML
let my_messages = app.messages;
my_messages.push({
diff --git a/app/templates/home.html b/app/templates/home.html
index 089c2ba..78e8c8b 100755
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -25,7 +25,10 @@ This might only be one interface to this library:
+
+
+
@@ -38,6 +41,7 @@ This might only be one interface to this library:
+
diff --git a/app/templates/scape.html b/app/templates/scape.html
index 3adea7a..9309669 100644
--- a/app/templates/scape.html
+++ b/app/templates/scape.html
@@ -74,7 +74,7 @@
-
+
{{ book.title }}
{% set got = {} %}
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index 06690c1..7d9b622 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -62,30 +62,28 @@
How much time has been spent with this item?
|
{{ book.time or '?' }} |
+
+ Instances: |
+ {% set got = {} %}
+ {% set all = 1 %}
+ {% for instance in book.instances %}
-
- |
+ {% if instance.name in got %}
+ {% set x=got.__setitem__(instance.name, got[instance.name]+1) %}
+ {% else %}
+ {% set x=got.__setitem__(instance.name, 1) %}
+ {% endif %}
+ {% set all = loop.index %}
+ {% endfor %}
-
download {{ book.fileformat }}
-
-
-
Instances:
- {% set got = {} %}
- {% set all = 1 %}
- {% for instance in book.instances %}
+ {% for instance, value in got.items() %}
+ {% set result = value/(book.instances|length) %}
+ {{ instance }}: {{ (result*100)|round|int }}%
+ {% endfor %}
- {% if instance.name in got %}
- {% set x=got.__setitem__(instance.name, got[instance.name]+1) %}
- {% else %}
- {% set x=got.__setitem__(instance.name, 1) %}
- {% endif %}
- {% set all = loop.index %}
- {% endfor %}
+
+
- {% for instance, value in got.items() %}
- {% set result = value/(book.instances|length) %}
- {{ instance }}: {{ (result*100)|round|int }}%
- {% endfor %}
diff --git a/app/views.py b/app/views.py
index b8b4447..f28a01c 100755
--- a/app/views.py
+++ b/app/views.py
@@ -258,7 +258,9 @@ def add_book():
sameness = upload_form.sameness.data
gender = upload_form.gender.data
diversity = upload_form.diversity.data
- time = upload_form.time.data
+ time = None
+ if time:
+ time = upload_form.time.data
who = upload_form.who.data
if year_published=="":
@@ -677,9 +679,11 @@ def import_csv():
year_published = int(row['year_published'])
else:
year_published = None;
- book = Book(row['title'], row['file'], cover, row['fileformat'], row['category'],year_published, None, None, None, None, None, None)
- book.scapeX = float(row['scapeX'])
- book.scapeY = float(row['scapeY'])
+ book = Book(row['title'], row['file'], cover, row['fileformat'], row['category'], year_published, None, None, None, None, None, None)
+ if row['scapeX']:
+ book.scapeX = float(row['scapeX'])
+ if row['scapeY']:
+ book.scapeY = float(row['scapeY'])
db.session.add(book)
numberadded = numberadded+1
diff --git a/init_db.sh b/init_db.sh
index c90baea..bf72ab5 100644
--- a/init_db.sh
+++ b/init_db.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-rm app/mydatabase.db
+#rm app/mydatabase.db
mkdir -p app/uploads/cover
chmod 777 app/uploads/
chmod 777 app/uploads/cover
diff --git a/whoosh/Book/MAIN_071mbyqoitijmyv4.seg b/whoosh/Book/MAIN_071mbyqoitijmyv4.seg
deleted file mode 100644
index 93716a0..0000000
Binary files a/whoosh/Book/MAIN_071mbyqoitijmyv4.seg and /dev/null differ
diff --git a/whoosh/Book/MAIN_2a7vygakwdvdefoe.seg b/whoosh/Book/MAIN_2a7vygakwdvdefoe.seg
deleted file mode 100644
index b928bfb..0000000
Binary files a/whoosh/Book/MAIN_2a7vygakwdvdefoe.seg and /dev/null differ
diff --git a/whoosh/Book/MAIN_5id3ip2mvmsu2mbl.seg b/whoosh/Book/MAIN_5id3ip2mvmsu2mbl.seg
deleted file mode 100644
index 99e6446..0000000
Binary files a/whoosh/Book/MAIN_5id3ip2mvmsu2mbl.seg and /dev/null differ
diff --git a/whoosh/Book/MAIN_6bsjkp9xdes7zrrx.seg b/whoosh/Book/MAIN_6bsjkp9xdes7zrrx.seg
deleted file mode 100644
index 6764b53..0000000
Binary files a/whoosh/Book/MAIN_6bsjkp9xdes7zrrx.seg and /dev/null differ
diff --git a/whoosh/Book/MAIN_es8t5xyup7nfqm7j.seg b/whoosh/Book/MAIN_es8t5xyup7nfqm7j.seg
deleted file mode 100644
index 30a931a..0000000
Binary files a/whoosh/Book/MAIN_es8t5xyup7nfqm7j.seg and /dev/null differ
diff --git a/whoosh/Book/MAIN_hljrpqpa46dk3vgc.seg b/whoosh/Book/MAIN_hljrpqpa46dk3vgc.seg
deleted file mode 100644
index ee33184..0000000
Binary files a/whoosh/Book/MAIN_hljrpqpa46dk3vgc.seg and /dev/null differ
diff --git a/whoosh/Book/MAIN_p6r8oedtat7ay25v.seg b/whoosh/Book/MAIN_p6r8oedtat7ay25v.seg
deleted file mode 100644
index 6105580..0000000
Binary files a/whoosh/Book/MAIN_p6r8oedtat7ay25v.seg and /dev/null differ
diff --git a/whoosh/Book/MAIN_q0ohjvxyt5ufv1vl.seg b/whoosh/Book/MAIN_q0ohjvxyt5ufv1vl.seg
deleted file mode 100644
index 386444d..0000000
Binary files a/whoosh/Book/MAIN_q0ohjvxyt5ufv1vl.seg and /dev/null differ
diff --git a/whoosh/Book/_MAIN_293.toc b/whoosh/Book/_MAIN_293.toc
deleted file mode 100644
index 85f8b84..0000000
Binary files a/whoosh/Book/_MAIN_293.toc and /dev/null differ