diff --git a/cps/static/css/style.css b/cps/static/css/style.css index d1bbc605..fc0d1390 100644 --- a/cps/static/css/style.css +++ b/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; +} diff --git a/cps/static/css/upload.css b/cps/static/css/upload.css index 8192bd39..a56dde2c 100644 --- a/cps/static/css/upload.css +++ b/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%; diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js index b1c3ffa3..9dbcee62 100644 --- a/cps/static/js/caliBlur.js +++ b/cps/static/js/caliBlur.js @@ -411,8 +411,8 @@ $( 'div.comments' ).readmore( { collapsedHeight: 134, heightMargin: 45, speed: 300, - moreLink: 'READ MORE', - lessLink: 'READ LESS', + moreLink: 'READ MORE', // ToDo: make translateable + lessLink: 'READ LESS', // ToDo: make translateable }); ///////////////////////////////// // End of Global Work // diff --git a/cps/static/js/main.js b/cps/static/js/main.js index 63caf4bf..1ed98266 100644 --- a/cps/static/js/main.js +++ b/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"); + }); + }); diff --git a/cps/static/js/uploadprogress.js b/cps/static/js/uploadprogress.js index b734c9a3..f7a26571 100644 --- a/cps/static/js/uploadprogress.js +++ b/cps/static/js/uploadprogress.js @@ -19,7 +19,7 @@ } var template = "
" + - "
" + + "
" + "
" + "
" + " " + @@ -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"); diff --git a/cps/templates/author.html b/cps/templates/author.html index 6d888845..3135b0d2 100644 --- a/cps/templates/author.html +++ b/cps/templates/author.html @@ -41,10 +41,20 @@

{% for author in entry.authors %} - {{author.name.replace('|',',')}} - {% if not loop.last %} - & - {% endif %} + {% if loop.index > config_authors_max and config_authors_max != 0 %} + {% if not loop.first %} + & + {% endif %} + {{author.name.replace('|',',')|shortentitle(30)}} + {% if loop.last %} + (...) + {% endif %} + {% else %} + {% if not loop.first %} + & + {% endif %} + {{author.name.replace('|',',')|shortentitle(30)}} + {% endif %} {% endfor %}

{% if entry.ratings.__len__() > 0 %} @@ -80,13 +90,15 @@

{{entry.title|shortentitle}}

- {% for author in entry.authors %} - - {{author.name.replace('|',',')}} - - {% if not loop.last %} - & - {% endif %} + {% for author in entry.authors %} + {% if loop.index > config_authors_max and config_authors_max != 0 %} + {{author.name.replace('|',',')}} + {% if loop.last %} + (...) + {% endif %} + {% else %} + {{author.name.replace('|',',')}} + {% endif %} {% endfor %}

diff --git a/cps/templates/config_view_edit.html b/cps/templates/config_view_edit.html index d0719d64..c92f888a 100644 --- a/cps/templates/config_view_edit.html +++ b/cps/templates/config_view_edit.html @@ -27,6 +27,10 @@
+
+ + +