##// END OF EJS Templates
Backport PR #7933: Move dynamic buttons to the left and upload button to the right....
Min RK -
Show More
@@ -8621,10 +8621,8 b' span#login_widget > .button .badge,'
8621 width: 12ex;
8621 width: 12ex;
8622 margin-right: -12ex;
8622 margin-right: -12ex;
8623 }
8623 }
8624 .alternate_upload .input-overlay {
8624 .alternate_upload .btn-upload {
8625 display: inline-block;
8625 height: 22px;
8626 font-weight: bold;
8627 line-height: 1em;
8628 }
8626 }
8629 /**
8627 /**
8630 * Primary styles
8628 * Primary styles
@@ -8657,6 +8655,7 b' ul.breadcrumb span {'
8657 padding-top: 1px;
8655 padding-top: 1px;
8658 }
8656 }
8659 .dynamic-buttons {
8657 .dynamic-buttons {
8658 padding-top: 3px;
8660 display: inline-block;
8659 display: inline-block;
8661 }
8660 }
8662 .list_toolbar [class*="span"] {
8661 .list_toolbar [class*="span"] {
@@ -8940,6 +8939,10 b' ul#new-menu {'
8940 .shutdown-button {
8939 .shutdown-button {
8941 display: none;
8940 display: none;
8942 }
8941 }
8942 .dynamic-instructions {
8943 display: inline-block;
8944 padding-top: 4px;
8945 }
8943 /*!
8946 /*!
8944 *
8947 *
8945 * IPython text editor webapp
8948 * IPython text editor webapp
@@ -493,6 +493,13 b' define(['
493 }
493 }
494 // Update total counter
494 // Update total counter
495 $('#counter-select-all').html(checked===0 ? ' ' : checked);
495 $('#counter-select-all').html(checked===0 ? ' ' : checked);
496
497 // If at aleast on item is selected, hide the selection instructions.
498 if (checked > 0) {
499 $('.dynamic-instructions').hide();
500 } else {
501 $('.dynamic-instructions').show();
502 }
496 };
503 };
497
504
498 NotebookList.prototype.add_link = function (model, item) {
505 NotebookList.prototype.add_link = function (model, item) {
@@ -1,29 +1,26 b''
1 /* We need an invisible input field on top of the sentense*/
1 /* We need an invisible input field on top of the sentense*/
2 /* "Drag file onto the list ..." */
2 /* "Drag file onto the list ..." */
3
3
4 .alternate_upload
4 .alternate_upload {
5 {
6 background-color:none;
5 background-color:none;
7 display: inline;
6 display: inline;
8 }
9
7
10 .alternate_upload.form
8 &.form
11 {
9 {
12 padding: 0;
10 padding: 0;
13 margin:0;
11 margin:0;
14 }
12 }
15
13
16 .alternate_upload input.fileinput
14 input.fileinput
17 {
15 {
18 display: inline;
16 display: inline;
19 opacity: 0;
17 opacity: 0;
20 z-index: 2;
18 z-index: 2;
21 width: 12ex;
19 width: 12ex;
22 margin-right: -12ex;
20 margin-right: -12ex;
23 }
21 }
24
22
25 .alternate_upload .input-overlay {
23 .btn-upload {
26 display: inline-block;
24 height: @btn_mini_height;
27 font-weight: bold;
25 }
28 line-height:1em;
29 }
26 }
@@ -49,6 +49,7 b' ul.breadcrumb {'
49 }
49 }
50
50
51 .dynamic-buttons {
51 .dynamic-buttons {
52 padding-top: @dashboard_tb_pad - 1px;
52 display: inline-block;
53 display: inline-block;
53 }
54 }
54
55
@@ -321,3 +322,8 b' ul#new-menu {'
321 .shutdown-button {
322 .shutdown-button {
322 display: none;
323 display: none;
323 }
324 }
325
326 .dynamic-instructions {
327 display: inline-block;
328 padding-top: @dashboard_tb_pad;
329 }
@@ -25,24 +25,26 b' data-terminals-available="{{terminals_available}}"'
25 <div id="notebooks" class="tab-pane active">
25 <div id="notebooks" class="tab-pane active">
26 <div id="notebook_toolbar" class="row">
26 <div id="notebook_toolbar" class="row">
27 <div class="col-sm-8 no-padding">
27 <div class="col-sm-8 no-padding">
28 <form id='alternate_upload' class='alternate_upload'>
28 <div class="dynamic-instructions">
29 <span id="notebook_list_info">
29 Select items to perform actions on them.
30 To import a notebook, drag the file onto the listing below or
30 </div>
31 <span class="input-overlay">
31 <div class="dynamic-buttons">
32 <input type="file" name="datafile" class="fileinput" multiple='multiple'>
32 <button title="Duplicate selected" class="duplicate-button btn btn-default btn-xs">Duplicate</button>
33 click here.
33 <button title="Rename selected" class="rename-button btn btn-default btn-xs">Rename</button>
34 </span>
34 <button title="Shutdown selected notebook(s)" class="shutdown-button btn btn-default btn-xs btn-warning">Shutdown</button>
35 </span>
35 <button title="Deleted selected" class="delete-button btn btn-default btn-xs btn-danger"><i class="fa fa-trash"></i></button>
36 </form>
36 </div>
37 </div>
37 </div>
38 <div class="col-sm-4 no-padding tree-buttons">
38 <div class="col-sm-4 no-padding tree-buttons">
39 <div class="pull-right">
39 <div class="pull-right">
40 <div class="dynamic-buttons">
40 <form id='alternate_upload' class='alternate_upload'>
41 <button title="Duplicate selected" class="duplicate-button btn btn-default btn-xs">Duplicate</button>
41 <span id="notebook_list_info">
42 <button title="Rename selected" class="rename-button btn btn-default btn-xs">Rename</button>
42 <span class="btn btn-xs btn-default btn-upload">
43 <button title="Shutdown selected notebook(s)" class="shutdown-button btn btn-default btn-xs btn-warning">Shutdown</button>
43 <input title="Click to browse for a file to upload." type="file" name="datafile" class="fileinput" multiple='multiple'>
44 <button title="Deleted selected" class="delete-button btn btn-default btn-xs btn-danger"><i class="fa fa-trash"></i></button>
44 Upload
45 </div>
45 </span>
46 </span>
47 </form>
46 <div id="new-buttons" class="btn-group">
48 <div id="new-buttons" class="btn-group">
47 <button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">
49 <button class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown">
48 <span>New</span>
50 <span>New</span>
General Comments 0
You need to be logged in to leave comments. Login now