Change button label from 'Save' to 'Save to block'

minjk-bl · minjk-bl · commit cbcf98aee0a4 · 2022-01-17T17:26:11.000+09:00
diff --git a/css/popupComponent.css b/css/popupComponent.css
@@ -115,29 +115,29 @@
     height: 50px;
 }
 .vp-popup-button[data-type="code"] {
-    position: absolute;
-    left: 15px;
-    top: 9px;
+    float: left;
+    margin-top: 9px;
+    margin-left: 10px;
 }
 .vp-popup-button[data-type="data"] {
-    position: absolute;
-    left: 102px;
-    top: 9px;
+    float: left;
+    margin-top: 9px;
+    margin-left: 10px;
 }
 .vp-popup-button[data-type="cancel"] {
-    position: absolute;
+    float: right;
     background-color: #E4E4E4;
-    top: 9px;
-    right: 106px;
+    margin-top: 9px;
+    margin-right: 10px;
 }
 .vp-popup-runadd-box {
-    position: absolute;
-    top: 9px;
-    right: 15px;
+    float: right;
     width: fit-content;
     height: 30px;
     background: #F38504;
     border-radius: 2px;
+    margin-top: 9px;
+    margin-right: 10px;
 }
 .vp-popup-button[data-type="run"] {
     display: inline-block;
@@ -157,8 +157,8 @@
     background: white;
     border: 0.25px solid var(--border-gray-color);
     position: absolute;
-    bottom: 35px;
-    right: 0px;
+    bottom: 45px;
+    right: 10px;
     width: 120px;
     text-align: center;
     line-height: 30px;
@@ -172,10 +172,11 @@
     background: var(--light-gray-color);
 }
 .vp-popup-save-button {
-    position: absolute;
-    top: 9px;
-    right: 15px;
+    float: right;
     height: 30px;
+    width: 100px;
+    margin-top: 9px;
+    margin-right: 10px;
 }
 /* writable codemirror style*/
 /* Code Option Codemirror */
diff --git a/html/popupComponent.html b/html/popupComponent.html
@@ -51,7 +51,6 @@
                 <button type="button" class="vp-button vp-popup-button" data-type="code">Code view</button>
                 <button type="button" class="vp-button vp-popup-button" data-type="data">Data view</button>
 
-                <button type="button" class="vp-button vp-popup-button" data-type="cancel">Cancel</button>
                 <div class="vp-popup-runadd-box">
                     <button type="button" class="vp-button activated vp-popup-button" data-type="run" title="Save to block & Run cell">Run</button>
                     <button type="button" class="vp-button activated vp-popup-button" data-type="show-detail"><img src="/nbextensions/visualpython/img/arrow_short_up.svg"/></button>
@@ -60,7 +59,8 @@
                         <div class="vp-popup-detail-button" data-type="add" title="Save to block & Add cell">Code to cell</div>
                     </div>
                 </div>
-                <button type="button" class="vp-button activated vp-popup-button vp-popup-save-button" data-type="save" title="Save to block" style="display:none;">Save</button>
+                <button type="button" class="vp-button activated vp-popup-button vp-popup-save-button" data-type="save" title="Save to block" style="display:none;">Save to block</button>
+                <button type="button" class="vp-button vp-popup-button" data-type="cancel">Cancel</button>
             </div>
         </div>
     </div>
diff --git a/js/board/BlockMenu.js b/js/board/BlockMenu.js
@@ -74,7 +74,7 @@ define([
             // run button
             sbBlockMenu.appendLine('<div id="vp_block_menu_run" class="vp-block-menu-item">Run</div>');
             // add button
-            sbBlockMenu.appendLine('<div id="vp_block_menu_add" class="vp-block-menu-item">Add</div>');
+            sbBlockMenu.appendLine('<div id="vp_block_menu_add" class="vp-block-menu-item">Code to cell</div>');
             // duplicate button
             sbBlockMenu.appendLine('<div id="vp_block_menu_duplicate" class="vp-block-menu-item">Duplicate</div>');
             // delete button
diff --git a/js/com/component/PopupComponent.js b/js/com/component/PopupComponent.js
@@ -435,10 +435,6 @@ define([
             } 
             if (!dataview) {
                 $(this.wrapSelector('.vp-popup-button[data-type="data"]')).hide();
-            } else {
-                if (!codeview) {
-                    $(this.wrapSelector('.vp-popup-button[data-type="data"]')).css({left: '15px', top: '9px'});
-                }
             }
 
             // footer

Original file line number	Diff line number	Diff line change
`@@ -435,10 +435,6 @@ define([`
`435`	`435`	`}`
`436`	`436`	`if (!dataview) {`
`437`	`437`	`$(this.wrapSelector('.vp-popup-button[data-type="data"]')).hide();`
`438`		`- } else {`
`439`		`- if (!codeview) {`
`440`		`- $(this.wrapSelector('.vp-popup-button[data-type="data"]')).css({left: '15px', top: '9px'});`
`441`		`- }`
`442`	`438`	`}`
`443`	`439`
`444`	`440`	`// footer`