Merge branch 'master' of git@github.com:thegrumpys/odop.git

client/public/index.html

@@ -194,6 +194,15 @@
 .form-check-input[type=checkbox] {
   border-color: #767676;
 }
+/**************************************************/
+/* After much work when adding tooltip images we found
+   out that Bootstrap tooltips do not have opacity equals
+   1.0 which was causing the background to bleed through
+   the image and be visible. This change is requires us
+   to force all tooltip opacities to 1.0 */
+.tooltip.show {
+  opacity: 1.0 !important;
+}
 /**************************************************/
     </style>
   </head>

client/src/components/ConstraintsMaxRowDependentVariable.jsx

@@ -112,7 +112,7 @@ export default function ConstraintsMaxRowDependentVariable({ element, index, onC
     <tbody id={'cmxrdv_' + element.name}>
       <tr key={element.name}>
         <td className="align-middle d-lg-none" id={'cmxrdv_name_' + element.name}>
-          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip className="d-lg-none">{element.tooltip}</Tooltip>}>
+          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip className="d-lg-none"><div dangerouslySetInnerHTML={{__html: element.tooltip}}></div></Tooltip>}>
             <span>{element.name}</span>
           </OverlayTrigger>
         </td>

client/src/components/ConstraintsMaxRowIndependentVariable.jsx

@@ -107,7 +107,7 @@ export default function ConstraintsMaxRowIndependentVariable({ element, index, o
     <tbody id={'cmnriv_' + element.name}>
       <tr key={element.name}>
         <td className="align-middle d-lg-none" id={'cmxriv_name_' + element.name}>
-          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip className="d-lg-none">{element.tooltip}</Tooltip>}>
+          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip className="d-lg-none"><div dangerouslySetInnerHTML={{__html: element.tooltip}}></div></Tooltip>}>
             <span>{element.name}</span>
           </OverlayTrigger>
         </td>

client/src/components/ConstraintsMinRowDependentVariable.jsx

@@ -112,7 +112,7 @@ export default function ConstraintsMinRowDependentVariable({ element, index, onC
     <tbody id={'cmnrdv_' + element.name}>
       <tr key={element.name}>
         <td className="align-middle d-lg-none" id={'cmnrdv_name_' + element.name}>
-          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip className="d-lg-none">{element.tooltip}</Tooltip>}>
+          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip className="d-lg-none"><div dangerouslySetInnerHTML={{__html: element.tooltip}}></div></Tooltip>}>
             <span>{element.name}</span>
           </OverlayTrigger>
         </td>

client/src/components/ConstraintsMinRowIndependentVariable.jsx

@@ -108,7 +108,7 @@ export default function ConstraintsMinRowIndependentVariable({ element, index, o
     <tbody id={'cmnriv_' + element.name}>
       <tr key={element.name}>
         <td className="align-middle d-lg-none" id={'cmnriv_name_' + element.name}>
-          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip className="d-lg-none">{element.tooltip}</Tooltip>}>
+          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip className="d-lg-none"><div dangerouslySetInnerHTML={{__html: element.tooltip}}></div></Tooltip>}>
             <span>{element.name}</span>
           </OverlayTrigger>
         </td>

client/src/components/NameValueUnitsRowCalcInput.jsx

@@ -63,7 +63,7 @@ export default function NameValueUnitsRowCalcInput({ element, index, onChangeVal
     <tbody id={'nvurci_' + element.name}>
       <tr key={element.name}>
         <td className="align-middle" colSpan="2" id={'nvurci_name_' + element.name}>
-          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip>{element.tooltip}</Tooltip>}>
+          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip><div dangerouslySetInnerHTML={{__html: element.tooltip}}></div></Tooltip>}>
             <span>{element.name}</span>
           </OverlayTrigger>
         </td>

client/src/components/NameValueUnitsRowDependentVariable.jsx

@@ -64,7 +64,7 @@ export default function NameValueUnitsRowDependentVariable({ element, index, onS
     <tbody id={'nvurdv_' + element.name}>
       <tr key={element.name}>
         <td className="align-middle" colSpan="2" id={'nvurdv_name_' + element.name}>
-          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip>{element.tooltip}</Tooltip>}>
+          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip><div dangerouslySetInnerHTML={{__html: element.tooltip}}></div></Tooltip>}>
             <span>{element.name}</span>
           </OverlayTrigger>
         </td>

client/src/components/NameValueUnitsRowIndependentVariable.jsx

@@ -88,7 +88,7 @@ export default function NameValueUnitsRowIndependentVariable({ element, index, o
     <tbody id={'nvuriv_' + element.name}>
       <tr key={element.name}>
         <td className="align-middle" colSpan="2" id={'nvuriv_name_' + element.name}>
-          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip>{element.tooltip}</Tooltip>}>
+          <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip><div dangerouslySetInnerHTML={{__html: element.tooltip}}></div></Tooltip>}>
             <span>{element.name}</span>
           </OverlayTrigger>
         </td>

client/src/components/SymbolName.jsx

@@ -7,7 +7,7 @@ export default function SymbolName({ className, element, index }) {
 
   return (
     <td className={"align-middle " + (className !== undefined ? className : '')} id={'sn_' + element.name}>
-      <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip>{element.tooltip}</Tooltip>}>
+      <OverlayTrigger placement="top" overlay={element.tooltip !== undefined && <Tooltip><div dangerouslySetInnerHTML={{__html: element.tooltip}}></div></Tooltip>}>
         <span>{element.name}</span>
       </OverlayTrigger>
     </td>

client/src/designtypes/Piston-Cylinder/initialState.js

@@ -13,7 +13,7 @@ export const initialState = {
             "validmin": -Number.MAX_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1.0,
-            "tooltip": "Gas PRESSURE applied to piston AREA",
+            "tooltip": "<Table><tr><td>Gas PRESSURE applied to piston AREA</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/PRESSURE.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -29,7 +29,7 @@ export const initialState = {
             "validmin": Number.MIN_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 0.01,
-            "tooltip": "Piston dimension; creates AREA where PRESSURE is applied",
+            "tooltip": "<Table><tr><td>Piston dimension; creates AREA where PRESSURE is applied</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/RADIUS.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -45,7 +45,7 @@ export const initialState = {
             "validmin": Number.MIN_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 0.001,
-            "tooltip": "Dimension of cylinder wall providing containment for PRESSURE",
+            "tooltip": "<Table><tr><td>Dimension of cylinder wall providing containment for PRESSURE</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/THICKNESS.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -61,7 +61,7 @@ export const initialState = {
             "validmin": -Number.MAX_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Push generated by PRESSURE acting on piston AREA",
+            "tooltip": "<Table><tr><td>Push generated by PRESSURE acting on piston AREA</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/FORCE.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -77,7 +77,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 0.1,
-            "tooltip": "Effective amount of piston surface exposed to PRESSURE",
+            "tooltip": "<Table><tr><td>Effective amount of piston surface exposed to PRESSURE</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/AREA.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -93,7 +93,7 @@ export const initialState = {
             "validmin": -Number.MAX_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 10,
-            "tooltip": "Force per unit area within cylinder wall; created by PRESSURE",
+            "tooltip": "<Table><tr><td>Force per unit area within cylinder wall; created by PRESSURE</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/STRESS.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         }

client/src/designtypes/Piston-Cylinder/initialState_metric_units.js

@@ -13,7 +13,7 @@ export const initialState = {
             "validmin": -Number.MAX_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1.0,
-            "tooltip": "Gas PRESSURE applied to piston AREA",
+            "tooltip": "<Table><tr><td>Gas PRESSURE applied to piston AREA</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/PRESSURE.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -29,7 +29,7 @@ export const initialState = {
             "validmin": Number.MIN_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Piston dimension; creates AREA where PRESSURE is applied",
+            "tooltip": "<Table><tr><td>Piston dimension; creates AREA where PRESSURE is applied</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/RADIUS.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -45,7 +45,7 @@ export const initialState = {
             "validmin": Number.MIN_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 0.1,
-            "tooltip": "Dimension of cylinder wall providing containment for PRESSURE",
+            "tooltip": "<Table><tr><td>Dimension of cylinder wall providing containment for PRESSURE</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/THICKNESS.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -61,7 +61,7 @@ export const initialState = {
             "validmin": -Number.MAX_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1000,
-            "tooltip": "Push generated by PRESSURE acting on piston AREA",
+            "tooltip": "<Table><tr><td>Push generated by PRESSURE acting on piston AREA</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/FORCE.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -77,7 +77,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1000,
-            "tooltip": "Effective amount of piston surface exposed to PRESSURE",
+            "tooltip": "<Table><tr><td>Effective amount of piston surface exposed to PRESSURE</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/AREA.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -93,7 +93,7 @@ export const initialState = {
             "validmin": -Number.MAX_VALUE,
             "validmax": Number.MAX_VALUE,
             "sdlim": 5,
-            "tooltip": "Force per unit area within cylinder wall; created by PRESSURE",
+            "tooltip": "<Table><tr><td>Force per unit area within cylinder wall; created by PRESSURE</td></tr><tr><td><Image fluid src=\"/designtypes/Piston-Cylinder/tooltips/STRESS.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         }

client/src/designtypes/Solid/initialState.js

@@ -13,7 +13,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Longest dimension",
+            "tooltip": "<Table><tr><td>Longest dimension</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Length.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -29,7 +29,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Width dimension",
+            "tooltip": "<Table><tr><td>Width dimension</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Width.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -45,7 +45,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Shortest dimension",
+            "tooltip": "<Table><tr><td>Shortest dimension</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Height.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -141,7 +141,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Perimeter around width and height dimensions",
+            "tooltip": "<Table><tr><td>Perimeter around width and height dimensions</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Girth.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -189,7 +189,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 0.1,
-            "tooltip": "Volume times Density of the selected material. Shippers limit to 70 Lb.",
+            "tooltip": "<Table><tr><td>Volume times Density of the selected material. Shippers limit to 70 Lb.</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Weight.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         }

client/src/designtypes/Solid/initialState_metric_units.js

@@ -13,7 +13,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Longest dimension",
+            "tooltip": "<Table><tr><td>Longest dimension</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Length.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -29,7 +29,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Width dimension",
+            "tooltip": "<Table><tr><td>Width dimension</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Width.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -45,7 +45,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Shortest dimension",
+            "tooltip": "<Table><tr><td>Shortest dimension</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Height.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -141,7 +141,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 1,
-            "tooltip": "Perimeter around width and height dimensions",
+            "tooltip": "<Table><tr><td>Perimeter around width and height dimensions</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Girth.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         },
@@ -189,7 +189,7 @@ export const initialState = {
             "validmin": 0.0,
             "validmax": Number.MAX_VALUE,
             "sdlim": 0.1,
-            "tooltip": "Volume times Density of the selected material. Shippers may limit to 30 kg.",
+            "tooltip": "<Table><tr><td>Volume times Density of the selected material. Shippers may limit to 30 kg.</td></tr><tr><td><Image fluid src=\"/designtypes/Solid/tooltips/Weight.png\"/></td></tr></Table>",
             "type": "equationset",
             "hidden": false
         }