XNAT-4400: remove egregious padding around form panels in xmodal dialogs;...

XNAT-4400: remove egregious padding around form panels in xmodal dialogs; allow disabling of labels for 'panel.element' widgets (label: false, or label: "")

src/main/webapp/page/admin/style.css

@@ -72,8 +72,9 @@ body.xnat .panel-default { border: 1px solid #c8c8c8; }
     padding: 12px 16px;
     color: #fff; background: #1A75BB;
 }
-/* no border on panels in a dialog box */
-body.xnat .xmodal .panel { padding: 0; margin: 0; border: none; }
+/* special styling for panels in a dialog box */
+body.xnat div.xmodal .panel { padding: 0; margin: 0; border: none; }
+body.xnat div.xmodal .panel-body { padding: 0 ; }
 
 /* hide footer on individual form elements that are part of a multi-form panel */
 .multi-form .panel .footer { display: none; }

src/main/webapp/scripts/xnat/ui/panel.js

@@ -728,7 +728,7 @@ var XNAT = getObject(XNAT || {});
         }
         addClassName(opts.element, 'panel-element');
         addDataObjects(opts.element, { name: (opts.name||'').replace(/^:*/, '') });
-        opts.label = opts.label||opts.title||opts.name||'';
+        opts.label = opts.label||opts.title||'';
 
         // add a help info icon if one is specified
         if (opts.info){
@@ -762,7 +762,7 @@ var XNAT = getObject(XNAT || {});
             // infoContent[infoId++] = {label:opts.label, content:opts.info};
         }
 
-        _inner.push(['div.element-label', [_info, opts.label]]);
+        _inner.push(['div.element-label', [_info, (opts.label ? opts.label : '')]]);
 
         // 'contents' will be inserted into the 'target' element
         _target = spawn('div.element-wrapper');