You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2017/05/25 06:43:55 UTC
zeppelin git commit: [ZEPPELIN-2575] Improve `rename note` dialog
style
Repository: zeppelin
Updated Branches:
refs/heads/master 336d86cdd -> 5deb53f97
[ZEPPELIN-2575] Improve `rename note` dialog style
### What is this PR for?
Improve `rename notebook` dialog style. See the attached screenshots.
### What type of PR is it?
[Improvement]
### Todos
DONE
### What is the Jira issue?
[ZEPPELIN-2575](https://issues.apache.org/jira/browse/ZEPPELIN-2575)
### How should this be tested?
1. Build: `mvn clean package -DskipTests; ./bin/zeppelin-daemon.sh restart`
2. Run Zeppelin and open browser: `localhost:8080`
3. `rename notebook` functionality should work as like before.
### Screenshots (if appropriate)
#### Before
#### After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1a...@gmail.com>
Closes #2359 from 1ambda/improve-rename-dialog and squashes the following commits:
0e863d7 [1ambda] fix: Use ng-enter
0fa0caa [1ambda] fix: RAT issue
d310174 [1ambda] feat: Style rename dialog body
ff9721a [1ambda] style: Reformat html
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5deb53f9
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5deb53f9
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5deb53f9
Branch: refs/heads/master
Commit: 5deb53f97847493c4fbb8beb827ce78c99b91b2f
Parents: 336d86c
Author: 1ambda <1a...@gmail.com>
Authored: Mon May 22 18:11:42 2017 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Thu May 25 15:43:51 2017 +0900
----------------------------------------------------------------------
.../src/components/rename/rename.controller.js | 2 ++
zeppelin-web/src/components/rename/rename.css | 38 ++++++++++++++++++++
zeppelin-web/src/components/rename/rename.html | 19 +++++-----
3 files changed, 50 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5deb53f9/zeppelin-web/src/components/rename/rename.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/rename/rename.controller.js b/zeppelin-web/src/components/rename/rename.controller.js
index 305c519..2682b6e 100644
--- a/zeppelin-web/src/components/rename/rename.controller.js
+++ b/zeppelin-web/src/components/rename/rename.controller.js
@@ -12,6 +12,8 @@
* limitations under the License.
*/
+import './rename.css'
+
angular.module('zeppelinWebApp').controller('RenameCtrl', RenameCtrl)
function RenameCtrl ($scope) {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5deb53f9/zeppelin-web/src/components/rename/rename.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/rename/rename.css b/zeppelin-web/src/components/rename/rename.css
new file mode 100644
index 0000000..45d4710
--- /dev/null
+++ b/zeppelin-web/src/components/rename/rename.css
@@ -0,0 +1,38 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.modal-header-rename {
+ background-color: #3071a9;
+ border: 2px solid #3071a9;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
+.modal-header-rename .close {
+ color: #cfcfcf;
+ opacity: 1;
+}
+
+.modal-header-rename .modal-title {
+ color: white;
+ font-size: 20px;
+ font-weight: 300;
+}
+
+.modal-body-rename label {
+ font-size: 17px;
+ font-weight: 400;
+ margin-top: 5px;
+ margin-bottom: 15px;
+}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5deb53f9/zeppelin-web/src/components/rename/rename.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/rename/rename.html b/zeppelin-web/src/components/rename/rename.html
index 723c6aa..71caa76 100644
--- a/zeppelin-web/src/components/rename/rename.html
+++ b/zeppelin-web/src/components/rename/rename.html
@@ -11,28 +11,29 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div id="renameModal" class="modal fade" role="dialog"
- tabindex="-1">
+<div id="renameModal" class="modal fade" role="dialog" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
- <div class="modal-header">
+ <!-- modal-header -->
+ <div class="modal-header modal-header-rename">
<button type="button" class="close" data-dismiss="modal">×</button>
<h4 class="modal-title">{{title}}</h4>
</div>
- <div class="modal-body">
+
+ <!-- modal-body -->
+ <div class="modal-body modal-body-rename">
<label ng-if="isValid">Please enter a new name</label>
- <label class="text-danger" ng-if="!isValid">Please enter a valid name</label>
+ <label ng-if="!isValid" class="text-danger">Please enter a valid name</label>
<div class="form-group" ng-class="{'has-error': !isValid}">
<input type="text" class="form-control"
- ng-model="params.newName" ng-change="validate()"
- ng-keyup="$event.keyCode == 13 && isValid && rename()" />
+ ng-model="params.newName" ng-change="validate()"
+ ng-enter="isValid && rename()" />
</div>
-
</div>
<div class="modal-footer">
<div>
<button type="button" class="btn btn-default btn-primary"
- ng-click="rename()" ng-class="{'disabled': !isValid}">
+ ng-click="rename()" ng-class="{'disabled': !isValid}">
Rename
</button>
</div>