Browse Source

Merge pull request #1050 from blink1073/delete-notebook-behavior

Clean up the running console content
Brian E. Granger 8 years ago
parent
commit
f7de95f7dd
2 changed files with 13 additions and 12 deletions
  1. 7 0
      src/running/index.css
  2. 6 12
      src/running/index.ts

+ 7 - 0
src/running/index.css

@@ -94,6 +94,7 @@
   display: flex;
   flex-direction: row;
   padding: 3px 12px;
+  padding-left: 0px;
   font-size: 13px;
   font-weight: 500;
   color: var(--jp-ui-font-color1);
@@ -130,11 +131,17 @@
   content: '\f120';
 }
 
+
 .jp-RunningSessions-itemLabel {
   flex: 1 1 auto;
   padding: 1px;
+  margin-right: 4px;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  direction: rtl;
 }
 
+
 .jp-RunningSessions-itemKernelName {
   flex: 0 0 auto;
   padding: 1px;

+ 6 - 12
src/running/index.ts

@@ -86,11 +86,6 @@ const ITEM_ICON_CLASS = 'jp-RunningSessions-itemIcon';
  */
 const ITEM_LABEL_CLASS = 'jp-RunningSessions-itemLabel';
 
-/**
- * The class name added to a running session item kernel name.
- */
-const KERNEL_NAME_CLASS = 'jp-RunningSessions-itemKernelName';
-
 /**
  * The class name added to a running session item shutdown button.
  */
@@ -606,15 +601,12 @@ namespace RunningSessions {
       icon.className = ITEM_ICON_CLASS;
       let label = document.createElement('span');
       label.className = ITEM_LABEL_CLASS;
-      let kernel = document.createElement('span');
-      kernel.className = KERNEL_NAME_CLASS;
       let shutdown = document.createElement('span');
       shutdown.className = SHUTDOWN_BUTTON_CLASS;
       shutdown.textContent = 'SHUTDOWN';
 
       node.appendChild(icon);
       node.appendChild(label);
-      node.appendChild(kernel);
       node.appendChild(shutdown);
       return node;
     }
@@ -686,10 +678,12 @@ namespace RunningSessions {
         icon.className = `${ITEM_ICON_CLASS} ${FILE_ICON_CLASS}`;
       }
       let label = findElement(node, ITEM_LABEL_CLASS);
-      label.textContent = model.notebook.path.split('/').pop();
-      label.title = model.notebook.path;
-      let kernel = findElement(node, KERNEL_NAME_CLASS);
-      kernel.textContent = kernelName;
+      label.textContent = model.notebook.path;
+      let title = (
+        `Path: ${model.notebook.path}\n` +
+        `Kernel: ${kernelName}`
+      );
+      label.title = title;
     }
   }