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 7fc3444..6007a9f 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -246,7 +246,7 @@ div.marquee > div.marquee-text {
position: fixed;
bottom: 0;
right: 0;
- width: 30%;
+ width: 25%;
height: 100%;
}
@@ -258,7 +258,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;
@@ -269,6 +269,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;
@@ -277,6 +314,7 @@ width:100%;
margin:0;
padding:0;
z-index: 100000;
+opacity: 1!important;
}
.control{
display: block;
@@ -357,7 +395,7 @@ box-sizing: border-box;
justify-items: center;
}
-@media screen and (max-width: 900px) {
+@media screen and (max-width: 1000px) {
.grid{
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
@@ -366,11 +404,13 @@ box-sizing: border-box;
justify-items: center;
}
}
-@media screen and (max-width: 400px) {
+
+@media screen and (max-width: 600px) {
.grid{
display: grid;
- grid-template-columns: 1fr;
- align-items: center;
+ grid-template-columns: 1fr 1fr 1fr;
+ grid-gap: 2px;
+ align-items: top;
justify-items: center;
}
}
@@ -381,6 +421,7 @@ box-sizing: border-box;
align-items: center;
justify-items: center;
}
+
.gridbox:hover{
opacity: 0.5;
}
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 e36b2ed..80eb66d 100755
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -25,7 +25,10 @@ Feel free to browse our catalogue, interfaced in many different ways.
+
+
+
@@ -38,6 +41,7 @@ Feel free to browse our catalogue, interfaced in many different ways.
+
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 056d5b0..de90bb0 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -1,9 +1,8 @@
{% extends 'base.html' %}
{% block main %}
-
-
+
@@ -61,44 +60,43 @@
{{ book.who or '?' }}
-
-
-
Add book to Stack ===>
+
+ Instances:
+ {% set got = {} %}
+ {% set all = 1 %}
+ {% for instance in book.instances %}
- download {{ book.fileformat }}
-
-
- 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 %}
- {% 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 %}
- {% for instance, value in got.items() %}
- {% set result = value/(book.instances|length) %}
- {{ instance }}: {{ (result*100)|round|int }}%
- {% endfor %}
+
+
+
+Add book to Stack ===>
-
- {% if book.file %}
- Download this {{ book.fileformat }}
-
-
-
×
-
A message from the uploading librarian:
-
"{{book.message or '...'}}"
-
-
- {% else %}
- {% endif %}
+{% if book.file %}
+ Download this {{ book.fileformat }}
+
+
+
×
+
A message from the uploading librarian:
+
"{{book.message or '...'}}"
+
+
+
+{% else %}
+{% endif %}
edit
delete
diff --git a/app/views.py b/app/views.py
index cb0f4bd..0ec3a98 100755
--- a/app/views.py
+++ b/app/views.py
@@ -688,7 +688,6 @@ def import_csv():
html_string = render_template('potential_pdf.html', pbooks = pbooks)
html = HTML(string=html_string)
html.write_pdf(target='app/uploads/potential.pdf')
- print ('writing to potential_pdf')
else:
fullpath = os.path.join(app.config['UPLOAD_FOLDER'], row['file'])
@@ -702,8 +701,10 @@ def import_csv():
else:
year_published = None;
book = Book(row['title'], file, cover, row['fileformat'], row['category'],year_published, None, None, None, None, None)
- book.scapeX = float(row['scapeX'])
- book.scapeY = float(row['scapeY'])
+ 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