borders for tabs and other minor details #715

iVis-at-Bilkent · Jun 26, 2024 · 2eb448f · 2eb448f
1 parent 5b5d0aa
commit 2eb448f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/app/css/chise.css b/app/css/chise.css
@@ -702,11 +702,6 @@ hr.inspector-divider {
     padding: 3px;
 }
 
-.element-palette div {
-    /*width: 36px;*/
-    /*height: 30px;*/
-}
-
 .selected-mode.inactive-palette-element {
     border-style: dotted;
     border-width: 1px;
@@ -718,9 +713,12 @@ hr.inspector-divider {
 
 .chise-network-tab {
     margin-right: 2px;
-    border-radius: 0 0 8px 8px !important;
+    border-radius: 0 0 8px 2px !important;
     background: transparent !important;
     border-top: 0px !important;
+    border: 1px solid #777;
+    border-left-width: 0px !important;
+    box-shadow: 1px 1px 2px #777;
 }
 
 .map-tab-type {
@@ -739,9 +737,11 @@ hr.inspector-divider {
 .chise-network-tab a {
     color: #555;
     padding-top: 10px !important;
-    padding-bottom: 11px !important;
+    padding-bottom: 12px !important;
     padding-left: 5px !important;
     padding-right: 5px !important;
+    border-bottom-right-radius: 8px !important;
+    border-bottom-left-radius: 2px !important;
     font-size: 11px;
     width: 86px;
     white-space: nowrap;
@@ -774,7 +774,6 @@ hr.inspector-divider {
     border-width: 1px !important;
     border-radius: calc !important;
     font-size: 12px;
-    align: center;
 }
 
 #sbgn-toolbar img {
@@ -832,11 +831,6 @@ img#template-reversible-output-add-button:hover {
     width: 300px;
 }
 
-.paletteCont
-{
-
-}
-
 .paletteCol {
   position: relative;
   display: inline-block;

diff --git a/app/js/app-menu.js b/app/js/app-menu.js
@@ -858,8 +858,7 @@ module.exports = function() {
       appUtilities.setScratch(cy, 'currentGeneralProperties', currentGeneralProperties);
 
       var activeChiseId = appUtilities.networkIdsStack[appUtilities.networkIdsStack.length-1];
-      $('#' + appUtilities.getMapTypeDivId(activeChiseId)).text(appUtilities.getDisplayMapName(chiseInstance.getMapType()));
-      console.log("Finished loading " + appUtilities.getDisplayMapName(chiseInstance.getMapType()));
+      $('#' + appUtilities.getMapTypeDivId(activeChiseId)).text(appUtilities.getTabLabelName(chiseInstance.getMapType()));
 
       cy.fit( cy.elements(":visible"), 20 );
     });

diff --git a/app/js/app-utilities.js b/app/js/app-utilities.js
@@ -26,8 +26,8 @@ appUtilities.mapTypesToViewableText = {
   'AF': 'AF',
   'SIF': 'SIF',
   'SBML': 'SBML',
-  'HybridSbgn' : 'Hybrid (PD,AF)' ,
-  'HybridAny' : 'Hybrid (PD,AF,SIF, SBML)'   
+  'HybridSbgn' : 'PD+AF' ,
+  'HybridAny' : 'PD+AF+SIF+SBML'   
 };
 // Set a single property on scratchpad of an element or the core
 appUtilities.setScratch = function (cyOrEle, name, val) {
@@ -345,12 +345,10 @@ appUtilities.adjustVisibilityOfNetworkTabs = function () {
 
 // returns the display name of map types to align with issue #715.
 // see https://github.com/iVis-at-Bilkent/newt/issues/715
-appUtilities.getDisplayMapName = function(mapName) {
-  if(mapName == "HybridSbgn")
-    return "PD+AF";
-  else if(mapName == "HybridAny")
+appUtilities.getTabLabelName = function(mapName) {
+  if(mapName == "HybridAny")
     return "ALL";
-  return mapName;
+  return appUtilities.mapTypesToViewableText[mapName];
 }
 
 // creates a new network and returns the new chise.js instance that is created for this network
@@ -489,7 +487,7 @@ appUtilities.createNewNetwork = function (networkName, networkDescription) {
 
   // update the map type descriptor
   var mapType = appUtilities.getActiveChiseInstance().getMapType();
-  $('#' + mapTypeDivId).text(appUtilities.getDisplayMapName(mapType));
+  $('#' + mapTypeDivId).text(appUtilities.getTabLabelName(mapType));
 
   // return the new instance
   return newInst;

diff --git a/app/js/backbone-views.js b/app/js/backbone-views.js
@@ -727,7 +727,7 @@ var MapTabGeneralPanel = GeneralPropertiesParentView.extend({
       var callback = function () {
         $("#map-type").val(chiseInstance.getMapType());
         var activeChiseId = appUtilities.networkIdsStack[appUtilities.networkIdsStack.length-1];
-        $('#' + appUtilities.getMapTypeDivId(activeChiseId)).text(appUtilities.getDisplayMapName(chiseInstance.getMapType()));
+        $('#' + appUtilities.getMapTypeDivId(activeChiseId)).text(appUtilities.getTabLabelName(chiseInstance.getMapType()));
       };
       // use active cy instance
       var cy = appUtilities.getActiveCy();