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 2016/03/18 17:27:07 UTC
incubator-zeppelin git commit: Change icon color when permission
setting is open
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 554e78c88 -> 2befbb455
Change icon color when permission setting is open
### What is this PR for?
* Set note action icon color to be changed properly
* Switch location of _Settings_ and _Note permissions_
### What type of PR is it?
Hot Fix
### What is the Jira issue?
There is no jira issue
### Screenshots (if appropriate)
**Before**
**After**
**Before**
**After**
**Before(Permissions comes first)**
**After(Settings comes first)**
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Mina Lee <mi...@nflabs.com>
Closes #770 from minahlee/fix/permissionActiveIconColor and squashes the following commits:
d164713 [Mina Lee] Change icon color when permission setting is open Switch location of bind setting and permission
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/2befbb45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/2befbb45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/2befbb45
Branch: refs/heads/master
Commit: 2befbb455430753dcdb411b191e80fcfefc20253
Parents: 554e78c
Author: Mina Lee <mi...@nflabs.com>
Authored: Wed Mar 9 15:08:48 2016 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Fri Mar 18 09:27:08 2016 -0700
----------------------------------------------------------------------
.../src/app/notebook/notebook-actionBar.html | 2 +-
zeppelin-web/src/app/notebook/notebook.html | 49 ++++++++++----------
2 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/2befbb45/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 66e497b..f371bd3 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -158,7 +158,7 @@ limitations under the License.
<span style="position:relative; top:2px; margin-right:4px; cursor:pointer;"
ng-click="togglePermissions()"
tooltip-placement="bottom" tooltip="Note permissions">
- <i class="fa fa-lock" ng-style="{color: showSetting ? '#3071A9' : 'black' }"></i>
+ <i class="fa fa-lock" ng-style="{color: showPermissions ? '#3071A9' : 'black' }"></i>
</span>
<span class="btn-group">
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/2befbb45/zeppelin-web/src/app/notebook/notebook.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html
index 8c114dd..f2e2bb4 100644
--- a/zeppelin-web/src/app/notebook/notebook.html
+++ b/zeppelin-web/src/app/notebook/notebook.html
@@ -14,30 +14,6 @@ limitations under the License.
<!-- Here the controller <NotebookCtrl> is not needed because explicitly set in the app.js (route) -->
<div ng-include src="'app/notebook/notebook-actionBar.html'"></div>
<div style="padding-top: 36px;">
- <!-- permissions -->
- <div ng-if="showPermissions" class="permissions">
- <div>
- <h4>Note Permissions (Only note owners can change)</h4>
- </div>
- <hr />
- <div>
- <p>
- Enter comma separated users and groups in the fields. <br />
- Empty field (*) implies anyone can do the operation.
- </p>
- <div class="permissionsForm"
- data-ng-model="permissions">
- <p>Owners : <input ng-list ng-model="permissions.owners" placeholder="*"> Owners can change permissions, read and write the note. </p>
- <p>Readers : <input ng-list ng-model="permissions.readers" placeholder="*"> Readers can only read the note.</p>
- <p>Writers : <input ng-list ng-model="permissions.writers" placeholder="*"> Writers can read and write the note.</p>
- </div>
- </div>
- <br />
- <div>
- <button class="btn btn-primary" ng-click="savePermissions()">Save</button>
- <button class="btn btn-default" ng-click="closePermissions()">Cancel</button>
- </div>
- </div>
<!-- settings -->
<div ng-if="showSetting" class="setting">
<div>
@@ -81,6 +57,31 @@ limitations under the License.
</div>
</div>
+ <!-- permissions -->
+ <div ng-if="showPermissions" class="permissions">
+ <div>
+ <h4>Note Permissions (Only note owners can change)</h4>
+ </div>
+ <hr />
+ <div>
+ <p>
+ Enter comma separated users and groups in the fields. <br />
+ Empty field (*) implies anyone can do the operation.
+ </p>
+ <div class="permissionsForm"
+ data-ng-model="permissions">
+ <p>Owners : <input ng-list ng-model="permissions.owners" placeholder="*"> Owners can change permissions, read and write the note. </p>
+ <p>Readers : <input ng-list ng-model="permissions.readers" placeholder="*"> Readers can only read the note.</p>
+ <p>Writers : <input ng-list ng-model="permissions.writers" placeholder="*"> Writers can read and write the note.</p>
+ </div>
+ </div>
+ <br />
+ <div>
+ <button class="btn btn-primary" ng-click="savePermissions()">Save</button>
+ <button class="btn btn-default" ng-click="closePermissions()">Cancel</button>
+ </div>
+ </div>
+
<div class="note-jump"></div>
<!-- Include the paragraphs according to the note -->