Repository: zeppelin Updated Branches: refs/heads/master dfbea2eb9 -> ba5a2d825
[MINOR] ui improvement ### What is this PR for? * configuration sorting * remove tooltip in job menu * change repository infomation icon ### What type of PR is it? Improvement ### Screenshots (if appropriate) * configuration sorting before⨠<img width="1440" alt="f6a547d6-9225-11e6-80ab-7632f1c3d6cb" src="https://cloud.githubusercontent.com/assets/9584854/19631867/d50001f8-99db-11e6-81fc-47de15a3561b.png"> after <img width="1440" alt="2016-10-24 11 21 18" src="https://cloud.githubusercontent.com/assets/9584854/19631896/1688513e-99dc-11e6-8a8a-b87b996858cd.png">  * remove tooltip in job menu before⨠<img width="1049" alt="0da61c8a-9226-11e6-9124-a51d09f11913" src="https://cloud.githubusercontent.com/assets/9584854/19631909/2a5cd90a-99dc-11e6-92dd-9738924de361.png"> after⨠<img width="1051" alt="14d95af8-9226-11e6-852f-142c63f12f3d" src="https://cloud.githubusercontent.com/assets/9584854/19631914/4c4a7216-99dc-11e6-9e39-c08640c49923.png">  * change repository information icon before ⨠<img width="1052" alt="23663618-9226-11e6-9600-cbcb10b9ee1a" src="https://cloud.githubusercontent.com/assets/9584854/19631919/5407de6c-99dc-11e6-8043-a73669695114.png"> after <img width="1038" alt="2016-10-24 11 24 41" src="https://cloud.githubusercontent.com/assets/9584854/19631951/8d6b592c-99dc-11e6-8de1-28e760a16ebf.png">  Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? yes Author: baekhoseok <[email protected]> Closes #1555 from baekhoseok/minor_ui_fix and squashes the following commits: bf98a03 [baekhoseok] minor ui improvement cd4af65 [baekhoseok] minor ui improvement Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ba5a2d82 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ba5a2d82 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ba5a2d82 Branch: refs/heads/master Commit: ba5a2d8251adcd5110f05045b450e8987c0d33dc Parents: dfbea2e Author: baekhoseok <[email protected]> Authored: Mon Oct 24 11:14:41 2016 +0900 Committer: Mina Lee <[email protected]> Committed: Tue Oct 25 12:11:47 2016 +0900 ---------------------------------------------------------------------- .../zeppelin/img/ui-img/configuration_menu.png | Bin 328198 -> 372591 bytes .../zeppelin/img/ui-img/interpreter_menu.png | Bin 203575 -> 286469 bytes .../src/app/configuration/configuration.html | 4 ++-- .../src/app/interpreter/interpreter.html | 10 +++++----- zeppelin-web/src/app/jobmanager/jobmanager.html | 19 ++++++------------- 5 files changed, 13 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ba5a2d82/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png ---------------------------------------------------------------------- diff --git a/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png b/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png index 267de03..8b62cf2 100644 Binary files a/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png and b/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ba5a2d82/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png ---------------------------------------------------------------------- diff --git a/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png b/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png index 31fbcbc..1724bea 100644 Binary files a/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png and b/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ba5a2d82/zeppelin-web/src/app/configuration/configuration.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/configuration/configuration.html b/zeppelin-web/src/app/configuration/configuration.html index 0bee84d..240d77f 100644 --- a/zeppelin-web/src/app/configuration/configuration.html +++ b/zeppelin-web/src/app/configuration/configuration.html @@ -40,11 +40,11 @@ limitations under the License. <th>value</th> </tr> </thead> - <tr ng-repeat="(key, value) in configurations" > + <tr ng-repeat="key in configurations | sortByKey" > <td>{{key}}</td> <td> <div class="hiding_overflow"> - {{value}} + {{configurations[key]}} </div> </td> </tr> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ba5a2d82/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 ce716d5..abb83d8 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.html +++ b/zeppelin-web/src/app/interpreter/interpreter.html @@ -19,11 +19,11 @@ limitations under the License. Interpreters </h3> <div class="pull-right" style="margin-top:10px;"> - <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> + <button class="btn btn-default btn-sm" + ng-click="showRepositoryInfo = !showRepositoryInfo"> + <i class="fa fa-database" ng-style="{color: showRepositoryInfo ? '#3071A9' : 'black' }"></i> + Repository + </button> <button class="btn btn-default btn-sm" ng-click="showAddNewSetting = !showAddNewSetting"> <i class="fa fa-plus"></i> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ba5a2d82/zeppelin-web/src/app/jobmanager/jobmanager.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/jobmanager/jobmanager.html b/zeppelin-web/src/app/jobmanager/jobmanager.html index 598c3f7..2884b85 100644 --- a/zeppelin-web/src/app/jobmanager/jobmanager.html +++ b/zeppelin-web/src/app/jobmanager/jobmanager.html @@ -41,8 +41,7 @@ limitations under the License. <span ng-switch-when="FINISHED"> <i style="color: green; margin-right: 3px;" class="fa fa-circle" - ng-click="" - tooltip="FINISHED"> + ng-click=""> </i> {{jobStatus}} </span> @@ -50,8 +49,7 @@ limitations under the License. ng-switch-when="RUNNING" style="margin-right: 3px;"> <i style="color: blue" class="fa fa-spinner" - ng-click="" - tooltip="RUNNING"> + ng-click=""> </i> {{jobStatus}} </span> @@ -59,8 +57,7 @@ limitations under the License. ng-switch-when="READY" style="margin-right: 3px;"> <i style="color: green" class="fa fa-circle-o" - ng-click="" - tooltip="READY"> + ng-click=""> </i> {{jobStatus}} </span> @@ -68,9 +65,7 @@ limitations under the License. ng-switch-when="PENDING" style="margin-right: 3px;"> <i style="color: gray" class="fa fa-circle" - ng-click="" - tooltip="PENDING" - > + ng-click=""> </i> {{jobStatus}} </span> @@ -78,8 +73,7 @@ limitations under the License. ng-switch-when="ABORT" style="margin-right: 3px;"> <i style="color: orange" class="fa fa-circle" - ng-click="" - tooltip="ABORT"> + ng-click=""> </i> {{jobStatus}} </span> @@ -87,8 +81,7 @@ limitations under the License. ng-switch-when="ERROR" style="margin-right: 3px;"> <i style="color: red" class="fa fa-circle" - ng-click="" - tooltip="ERROR"> + ng-click=""> </i> {{jobStatus}} </span>
