You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mi...@apache.org on 2016/06/22 05:02:51 UTC
zeppelin git commit: [MINOR] Small ui modification in notebook
actionbar
Repository: zeppelin
Updated Branches:
refs/heads/master 41a7302d8 -> fd715c86a
[MINOR] Small ui modification in notebook actionbar
### What is this PR for?
Small ui improvements
- Change keyboard shortcut icon
- Modify commit container style
- Change table asc/desc icon
- Change interpreter create button font
### What type of PR is it?
Improvement
### Screenshots (if appropriate)
**Before**
<img width="165" alt="screen shot 2016-06-13 at 12 55 41 pm" src="https://cloud.githubusercontent.com/assets/8503346/16021450/aebc14dc-3167-11e6-91d2-32fa8cd607af.png">
**After**
<img width="164" alt="screen shot 2016-06-13 at 12 55 54 pm" src="https://cloud.githubusercontent.com/assets/8503346/16021451/b159c86a-3167-11e6-9311-b59cfffb3f6b.png">
**Before**
<img width="254" alt="screen shot 2016-06-13 at 1 07 15 pm" src="https://cloud.githubusercontent.com/assets/8503346/16021480/d23661e2-3167-11e6-90f9-44340d5efe8f.png">
**After**
<img width="252" alt="screen shot 2016-06-13 at 1 07 26 pm" src="https://cloud.githubusercontent.com/assets/8503346/16021482/d4cf92ac-3167-11e6-95a0-1eb28d0ed325.png">
**Before**
<img width="82" alt="screen shot 2016-06-18 at 11 08 20 am" src="https://cloud.githubusercontent.com/assets/8503346/16172808/03295cec-3545-11e6-953a-c2c9a48ca841.png">
**After**
<img width="82" alt="screen shot 2016-06-21 at 2 17 38 am" src="https://cloud.githubusercontent.com/assets/8503346/16224348/86c3f73e-3756-11e6-8b50-a4654d738d18.png">
**Before**
<img width="383" alt="screen shot 2016-06-14 at 4 43 58 pm" src="https://cloud.githubusercontent.com/assets/8503346/16063627/60bb32de-324f-11e6-88a3-318575dcafc2.png">
**After**
<img width="384" alt="screen shot 2016-06-14 at 4 43 20 pm" src="https://cloud.githubusercontent.com/assets/8503346/16063628/653316ba-324f-11e6-92ca-b559b62e234c.png">
**Before**
<img width="113" alt="screen shot 2016-06-14 at 9 38 05 pm" src="https://cloud.githubusercontent.com/assets/8503346/16068142/54f5f6d6-3278-11e6-977a-1902a274c1f1.png">
**After**
<img width="105" alt="screen shot 2016-06-14 at 9 37 34 pm" src="https://cloud.githubusercontent.com/assets/8503346/16068144/59344c70-3278-11e6-8038-ff3775cc432a.png">
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? Screenshot needs to be updated
Author: Mina Lee <mi...@apache.org>
Closes #1006 from minahlee/minor/ui_improve and squashes the following commits:
dc6dbe8 [Mina Lee] Change interpreter create button font
72ff26e [Mina Lee] Change table asc desc icon
bbca1ba [Mina Lee] Refine version control action UI
68619f8 [Mina Lee] Change keyboard shortcut icon
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/fd715c86
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/fd715c86
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/fd715c86
Branch: refs/heads/master
Commit: fd715c86aef8c128e8db6ce1a4d004826e03897a
Parents: 41a7302
Author: Mina Lee <mi...@apache.org>
Authored: Tue Jun 14 21:36:51 2016 -0700
Committer: Mina Lee <mi...@apache.org>
Committed: Tue Jun 21 22:02:38 2016 -0700
----------------------------------------------------------------------
.../src/app/interpreter/interpreter.html | 10 ++--
.../src/app/notebook/notebook-actionBar.html | 54 ++++++++++----------
zeppelin-web/src/app/notebook/notebook.css | 13 +++++
.../src/app/notebook/paragraph/paragraph.css | 17 ++++++
4 files changed, 63 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fd715c86/zeppelin-web/src/app/interpreter/interpreter.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index aa8dd64..86eef7a 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -19,16 +19,16 @@ limitations under the License.
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>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fd715c86/zeppelin-web/src/app/notebook/notebook-actionBar.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html
index 28dd84e..0466c31 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -61,32 +61,34 @@ limitations under the License.
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 -->
@@ -157,7 +159,7 @@ limitations under the License.
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"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fd715c86/zeppelin-web/src/app/notebook/notebook.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css
index 6cdc407..6c9a190 100644
--- a/zeppelin-web/src/app/notebook/notebook.css
+++ b/zeppelin-web/src/app/notebook/notebook.css
@@ -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;
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fd715c86/zeppelin-web/src/app/notebook/paragraph/paragraph.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
index 3e620b5..cea3ebd 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
@@ -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
*/