You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2020/01/03 06:23:56 UTC
[zeppelin] branch web_angular updated: [ZEPPELIN-4530] Support
versions switch
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch web_angular
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/web_angular by this push:
new 1aa5ab4 [ZEPPELIN-4530] Support versions switch
1aa5ab4 is described below
commit 1aa5ab48547bad337e57b15290cfaf607f0bb70a
Author: Hsuan Lee <hs...@gmail.com>
AuthorDate: Fri Jan 3 09:44:06 2020 +0800
[ZEPPELIN-4530] Support versions switch
### What is this PR for?
Add the versions switch button in the top drop-down menu
### What type of PR is it?
[Feature]
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-4530
### How should this be tested?
N/A
### Screenshots (if appropriate)
![image](https://user-images.githubusercontent.com/22736418/71655910-192c2080-2d74-11ea-85da-295521d5e919.png)
---
![image](https://user-images.githubusercontent.com/22736418/71655912-1d583e00-2d74-11ea-9663-90a86c32f85a.png)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Hsuan Lee <hs...@gmail.com>
Closes #3584 from hsuanxyz/feat/version-switch and squashes the following commits:
215dc2c5b [Hsuan Lee] chore: hidden the helium link
3af3f53fa [Hsuan Lee] feat: add support switch versions
---
zeppelin-web-angular/src/app/share/header/header.component.html | 8 +++++---
zeppelin-web/src/components/navbar/navbar.html | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zeppelin-web-angular/src/app/share/header/header.component.html b/zeppelin-web-angular/src/app/share/header/header.component.html
index 645da9a..33d8ecd 100644
--- a/zeppelin-web-angular/src/app/share/header/header.component.html
+++ b/zeppelin-web-angular/src/app/share/header/header.component.html
@@ -56,9 +56,9 @@
[routerLink]="['/credential']">Credential
</a>
</li>
- <li nz-menu-item routerLinkActive="ant-dropdown-menu-item-selected">
- <a [routerLink]="['/helium']">Helium</a>
- </li>
+<!-- <li nz-menu-item routerLinkActive="ant-dropdown-menu-item-selected">-->
+<!-- <a [routerLink]="['/helium']">Helium</a>-->
+<!-- </li>-->
<li nz-menu-item routerLinkActive="ant-dropdown-menu-item-selected">
<a [routerLink]="['/configuration']">Configuration</a>
</li>
@@ -66,6 +66,8 @@
<li nz-menu-divider></li>
<li nz-menu-item (click)="logout()">Logout</li>
</ng-container>
+ <li nz-menu-divider></li>
+ <li nz-menu-item><a href="/">Old Version</a></li>
</ul>
</nz-dropdown-menu>
</div>
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index 263ff06..8182585 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -105,6 +105,8 @@ limitations under the License.
<li ng-if="clusterAddr !== ''"><a href="#/cluster">Cluster</a> </li>
<li ng-if="ticket.principal && ticket.principal !== 'anonymous'" role="separator" style="margin: 5px 0;" class="divider"></li>
<li ng-if="ticket.principal && ticket.principal !== 'anonymous'"><a ng-click="navbar.logout()">Logout</a></li>
+ <li role="separator" style="margin: 5px 0;" class="divider"></li>
+ <li><a href="/next">Try the new Zeppelin</a></li>
</ul>
</div>
</li>