Merge branch '401-pin-popup-window-too-narrow' into 'master'

Resolve "Pin popup window too narrow"

Closes #401

See merge request piotr.gawron/minerva!307

frontend-js/src/main/css/global.css

@@ -722,6 +722,7 @@ a.adminLink:hover {
 
 .popover {
     max-width: 600px;
+    min-width: 390px;
 }
 
 /*

frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js

@@ -212,6 +212,7 @@ OverlayPanel.prototype.createTableHeader = function (edit) {
  *
  * @param {DataOverlay} overlay
  * @param {boolean} checked
+ * @param {boolean} disabled
  * @returns {HTMLElement}
  */
 OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled) {
@@ -279,9 +280,10 @@ OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled)
  *
  * @param {DataOverlay} overlay
  * @param {boolean} checked
+ * @param {boolean} disabled
  * @returns {Array}
  */
-OverlayPanel.prototype.overlayToDataRow = function (overlay, checked) {
+OverlayPanel.prototype.overlayToDataRow = function (overlay, checked, disabled) {
   var result = [];
   result[0] = overlay.getOrder();
   result[1] = overlay.getName();
@@ -291,7 +293,11 @@ OverlayPanel.prototype.overlayToDataRow = function (overlay, checked) {
     if (checked) {
       checkedString = " checked ";
     }
-    result[2] = "<input type='checkbox' " + checkedString + " data='" + overlay.getId() + "' name='overlayToggle'/>";
+    var disabledString = "";
+    if (disabled) {
+      disabledString = " disabled "
+    }
+    result[2] = "<input type='checkbox' " + checkedString + disabledString + " data='" + overlay.getId() + "' name='overlayToggle'/>";
     result[3] = "<button data='" + overlay.getId() + "' name='download-overlay'><span class='ui-icon ui-icon-arrowthickstop-1-s'></span></button>";
   } else {
     result[2] = "<a href='#' data='" + overlay.getId() + "' name='overlayLink'><img src='" + GuiConnector.getImgPrefix() + "icons/search.png' style='float: left' hspace='5'/></a>";

rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java

@@ -99,6 +99,7 @@ public class OverlayRestImpl extends BaseRestImpl {
     result.put("description", overlay.getDescription());
     result.put("publicOverlay", overlay.isPublicLayout());
     result.put("defaultOverlay", overlay.isDefaultOverlay());
+    result.put("googleLicenseConsent", overlay.isGoogleLicenseConsent());
     List<Map<String, Object>> images = new ArrayList<>();
     List<Layout> childLayouts = new ArrayList<>();
     childLayouts.add(overlay);
@@ -411,8 +412,8 @@ public class OverlayRestImpl extends BaseRestImpl {
       String column = string.toLowerCase();
       Object value = null;
       if (column.equals("id") || column.equals("idobject") || column.equals("uniqueid")) {
-        //casting to string is only to provide the same results as before refactoring
-        value = bioEntity.getId()+"";
+        // casting to string is only to provide the same results as before refactoring
+        value = bioEntity.getId() + "";
       } else if (column.equals("modelid")) {
         value = bioEntity.getModel().getId();
       } else if (column.equals("value")) {