Merge remote-tracking branch 'dialog/master'

Fix for #833

cps/static/css/style.css

@@ -130,3 +130,7 @@ input.pill:not(:checked) + label .glyphicon {
 .editable-cancel { margin-bottom: 0px !important; margin-left: 7px !important;}
 .editable-submit { margin-bottom: 0px !important;}
 
+.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>',
+  moreLink: '<a href="#">READ MORE</a>',    // ToDo: make translateable
-  lessLink: '<a href="#">READ LESS</a>',
+  lessLink: '<a href="#">READ LESS</a>',    // ToDo: make translateable
 });
 /////////////////////////////////
 //     End of Global Work     //

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>" +