Skip to content

[MINOR] Small ui modification in notebook actionbar #1006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
minahlee wants to merge 4 commits into from
Closed

[MINOR] Small ui modification in notebook actionbar #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68619f8
Change keyboard shortcut icon
minahlee Jun 21, 2016
bbca1ba
Refine version control action UI
minahlee Jun 21, 2016
72ff26e
Change table asc desc icon
minahlee Jun 14, 2016
dc6dbe8
Change interpreter create button font
minahlee Jun 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions zeppelin-web/src/app/interpreter/interpreter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ <h3 class="new_h3">
Interpreters
</h3>
<div class="pull-right" style="margin-top:10px;">
<span style="cursor:pointer;margin-right:8px;"
<span style="cursor:pointer;margin-right:4px;"
ng-click="showRepositoryInfo = !showRepositoryInfo"
tooltip-placement="bottom" tooltip="Repository information">
<i class="fa fa-cog" ng-style="{color: showRepositoryInfo ? '#3071A9' : 'black' }"></i>
</span>
<span class="btn btn-default fa fa-plus"
ng-click="showAddNewSetting = !showAddNewSetting"
style="margin-right:6px;">
<button class="btn btn-default btn-sm"
ng-click="showAddNewSetting = !showAddNewSetting">
<i class="fa fa-plus"></i>
Create
</span>
</button>
</div>
</div>
</div>
Expand Down
54 changes: 28 additions & 26 deletions zeppelin-web/src/app/notebook/notebook-actionBar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,32 +61,34 @@ <h3>
tooltip-placement="bottom" tooltip="Export the notebook">
<i class="fa fa-download"></i>
</button>
<ul class="dropdown-menu" role="menu" style="width:250px">
<li>
<div class="cron-preset-container">
<div>
<input type="text"
dropdown-input
placeholder="commit message"
id="note.checkpoint.message"
ng-model="note.checkpoint.message"/>
<button type="button"
class="btn btn-default btn-xs"
ng-hide="viewOnly"
ng-click="checkpointNotebook(note.checkpoint.message)"
tooltip-placement="bottom" tooltip="Commit the notebook">Commit
</button>
</div>
<button type="button"
class="btn btn-default btn-xs dropdown-toggle"
ng-hide="viewOnly"
data-toggle="dropdown"
tooltip-placement="bottom" tooltip="Version control">
<i class="fa fa-file-code-o"></i>
</button>
<ul class="dropdown-menu" role="menu" style="width:250px">
<li>
<div class="commit-container">
<div>
<input type="text"
dropdown-input
placeholder="commit message"
id="note.checkpoint.message"
style="width: 145px;"
ng-model="note.checkpoint.message"/>
<button type="button"
class="btn btn-default btn-xs"
ng-hide="viewOnly"
ng-click="checkpointNotebook(note.checkpoint.message)"
style="margin-left: 4px;"
tooltip-placement="bottom" tooltip="Commit the notebook">Commit
</button>
</div>
</li>
</ul>
<button type="button"
class="btn btn-default btn-xs dropdown-toggle"
ng-hide="viewOnly"
data-toggle="dropdown"
tooltip-placement="bottom" tooltip="Version control">
<i class="fa fa-file-code-o"></i>
</button>
</div>
</li>
</ul>
</span>

<!-- put the delete action by itself for your protection -->
Expand Down Expand Up @@ -157,7 +159,7 @@ <h3>
data-toggle="modal"
data-target="#shortcutModal"
tooltip-placement="bottom" tooltip="List of shortcut">
<i class="icon-question"></i>
<i class="fa fa-keyboard-o"></i>
</button>
<button type="button"
class="btn btn-default btn-xs"
Expand Down
13 changes: 13 additions & 0 deletions zeppelin-web/src/app/notebook/notebook.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,19 @@
border: 0;
}

.commit-container {
padding: 10px 20px 6px 20px;
font-weight: normal;
word-wrap: break-word;
white-space: initial;
}

/* overwrite bootstrap css for version control button */
.btn-group > .btn + .dropdown-toggle {
padding-right: 5px;
padding-left: 5px;
}

.cron-preset-container {
padding: 10px 20px 0 20px;
font-weight: normal;
Expand Down
17 changes: 17 additions & 0 deletions zeppelin-web/src/app/notebook/paragraph/paragraph.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,23 @@ table.dataTable.table-condensed .sorting_desc:after {
border-bottom: 2px solid #CCC;
}

.handsontable .columnSorting.ascending::after {
content: '\f160';
margin-left: 3px;
font-size: 12px;
font-family: FontAwesome;
line-height: 2;
}

.handsontable .columnSorting.descending::after {
content: '\f161';
margin-left: 3px;
font-size: 12px;
margin-left: 3px;
font-family: FontAwesome;
line-height: 2;
}

/*
Pivot CSS
*/
Expand Down