Merge branch 'master' into Develop

# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot

cps/static/css/style.css

@@ -36,6 +36,11 @@ a{color: #45b29d}a:hover{color: #444;}
 .container-fluid .book .meta .title{font-weight:bold;font-size:15px;color:#444}
 .container-fluid .book .meta .author{font-size:12px;color:#999}
 .container-fluid .book .meta .rating{margin-top:5px}.rating .glyphicon-star{color:#999}.rating .glyphicon-star.good{color:#45b29d}
+
+.container-fluid .author .author-hidden, .container-fluid .author .author-hidden-divider {
+  display: none;
+}
+
 .navbar-brand{font-family: 'Grand Hotel', cursive; font-size: 35px; color: #45b29d !important;}
 .more-stuff{margin-top: 20px; padding-top: 20px; border-top: 1px solid #ccc}
 .more-stuff>li{margin-bottom: 10px;}
@@ -52,6 +57,7 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te
     -moz-box-shadow: 0 5px 8px -6px #777;
     box-shadow: 0 5px 8px -6px #777;
 }
+
 .navbar-default .navbar-toggle .icon-bar {background-color: #000;}
 .navbar-default .navbar-toggle {border-color: #000;}
 .cover { margin-bottom: 10px;}
@@ -131,3 +137,8 @@ input.pill:not(:checked) + label .glyphicon {
 .editable-submit { margin-bottom: 0px !important;}
 
 .filterheader { margin-bottom: 20px; }
+
+.modal-body .comments {
+    max-height:300px;
+    overflow-y: auto;
+}

cps/static/css/upload.css

@@ -1,5 +1,5 @@
 @media (min-device-width: 768px) {
-    .modal-dialog {
+    .upload-modal-dialog {
         position: absolute;
         top: 45%;
         left: 50%;

cps/static/js/caliBlur.js

@@ -411,8 +411,8 @@ $( 'div.comments' ).readmore( {
   collapsedHeight: 134,
   heightMargin: 45,
   speed: 300,
-  moreLink: '<a href="#">READ MORE</a>',
-  lessLink: '<a href="#">READ LESS</a>',
+  moreLink: '<a href="#">READ MORE</a>',    // ToDo: make translateable
+  lessLink: '<a href="#">READ LESS</a>',    // ToDo: make translateable
 });
 /////////////////////////////////
 //     End of Global Work     //

cps/static/js/main.js

@@ -230,4 +230,12 @@ $(function() {
     $(window).resize(function() {
         $(".discover .row").isotope("layout");
     });
+	
+    $(".author-expand").click(function() {
+        $(this).parent().find("a.author-name").slice($(this).data("authors-max")).toggle();
+        $(this).parent().find("span.author-hidden-divider").toggle();
+        $(this).html() === $(this).data("collapse-caption") ? $(this).html("(...)") : $(this).html($(this).data("collapse-caption"));
+        $(".discover .row").isotope("layout");
+    });
+	
 });

cps/static/js/uploadprogress.js

@@ -19,7 +19,7 @@
     }
 
     var template = "<div class=\"modal fade\" id=\"file-progress-modal\">" +
-    "<div class=\"modal-dialog\">" +
+    "<div class=\"modal-dialog upload-modal-dialog\">" +
     "  <div class=\"modal-content\">" +
     "    <div class=\"modal-header\">" +
     "      <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><span aria-hidden=\"true\">&times;</span></button>" +
@@ -170,7 +170,7 @@
         replaceForm: function(html) {
             var newForm;
             var formId = this.$form.attr("id");
-            if (typeof formId !== "undefined") {
+            if ( typeof formId !== "undefined") {
                 newForm = $(html).find("#" + formId);
             } else {
                 newForm = $(html).find("form");