Skip to content

Commit bea3441

Browse files
chandermanichandermani
committed
Replaced Angular1 ui-bootstrap with angular-modal. Removed ui-bootstrap.
1 parent 7cdd0bb commit bea3441

32 files changed

+666
-143
lines changed

‎trainer/app/index.html‎

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,10 @@
1414
<link rel="stylesheet" href="css/app.css" />
1515
</head>
1616
<!--<body ng-app="appe2e" ng-controller="RootController">-->
17-
<body ng-controller="RootController">
18-
<div class="navbar navbar-default navbar-fixed-top top-navbar">
19-
<div class="container-fluid">
20-
<div class="navbar-header">
21-
<div class="navbar-brand">Personal Trainer</div>
22-
</div>
23-
<ul class="nav navbar-nav navbar-right">
24-
<li><a ng-click="setLanguage('en')" title="{{'TOPNAV.ENGLISH'|ng2Translate}}" ng-class="{'btn-primary':language==='en'}"><img src="img/flag-usa.gif" alt="English"/></a></li>
25-
<li><a ng-click="setLanguage('de')" title="{{'TOPNAV.GERMAN'|ng2Translate}}" ng-class="{'btn-primary':language==='de'}"><img src="img/flag-germany.gif" alt="German"/></a></li>
26-
<li><a ng-click="showWorkoutHistory()" title="{{'TOPNAV.HISTORYTITLE'|ng2Translate}}">{{'TOPNAV.HISTORY'|ng2Translate}}</a></li>
27-
</ul>
28-
</div>
29-
<div id="top-nav-container" class="second-top-nav">
30-
<div id="top-nav" ng-include="currentRoute.topNav">
31-
</div>
32-
</div>
33-
</div>
34-
<div class="container-fluid">
35-
<div id="content-container" class="row">
36-
<div class="col-sm-2 left-nav-bar" ng-if="currentRoute.leftNav">
37-
<div id="left-nav" ng-include="currentRoute.leftNav">
38-
</div>
39-
</div>
40-
<div class="col-sm-10 col-sm-offset-2">
41-
<label ng-if="routeHasError" class="alert alert-danger">{{routeError}}</label>
42-
<div id="page-content" ng-view></div>
43-
</div>
44-
</div>
45-
</div>
17+
<body>
18+
<ng2-root #ng2Root>
19+
<ng1-root></ng1-root>
20+
</ng2-root>
4621
<script src="node_modules/jquery/dist/jquery.min.js"></script>
4722
<script src="node_modules/angular/angular.js"></script>
4823
<script src="node_modules/angular-route/angular-route.js"></script>
@@ -52,7 +27,6 @@
5227
<script src="node_modules/angular-messages/angular-messages.js"></script>
5328
<!--Script required for E2E testing. Comment it in production use-->
5429
<!--<script src="node_modules/angular-mocks/angular-mocks.js"></script>-->
55-
<script src="node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
5630
<script src="//cdnjs.cloudflare.com/ajax/libs/owl-carousel/1.3.2/owl.carousel.js"></script>
5731
<script src="js/vendor/angular-media-player.js"></script>
5832
<script src="js/vendor/angular-local-storage.js"></script>
@@ -67,6 +41,7 @@
6741
<script src="node_modules/angular2/bundles/http.dev.js"></script>
6842
<script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
6943
<script src="node_modules/ng2-translate/bundles/ng2-translate.js"></script>
44+
<script src="node_modules/angular2-modal/dist/systemjs/angular2-modal-0.1.1.js"></script>
7045

7146
<script>
7247
System.config({

‎trainer/app/js/7MinWorkout/video-panel-component.js‎

Lines changed: 82 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎trainer/app/js/7MinWorkout/video-panel-component.tpl.html‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<div class="panel panel-info">
2+
<div class="panel-heading">
3+
<h3 class="panel-title">{{'RUNNER.VIDEOS'|translate}}</h3>
4+
</div>
5+
<div class="panel-body">
6+
<div class="row">
7+
<div class="col-sm-12">
8+
<div *ngFor="#video of videos" (click)="playVideo(video)" class="row video-image">
9+
<div class="col-sm-12">
10+
<div id="play-video-overlay">
11+
<span class="glyphicon glyphicon-play-circle video absolute-center"></span>
12+
</div>
13+
<img height="220" [src]="'//i.ytimg.com/vi/'+video+'/hqdefault.jpg'" />
14+
</div>
15+
</div>
16+
</div>
17+
</div>
18+
</div>
19+
</div>

‎trainer/app/js/7MinWorkout/video-panel-component.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import { Component, EventEmitter, Input, Injector, provide, Output} from 'angular2/core';
2+
import {VideoPlayerComponent} from './video-player-component';
3+
import {Modal, ModalConfig} from 'angular2-modal';
4+
import { upgradeAdapter } from '../upgrade-adapter';
5+
import {rootElement} from '../shared/root-element';
6+
import {TranslatePipe} from 'ng2-translate';
7+
8+
@Component({
9+
selector: 'video-panel',
10+
templateUrl: `/js/7MinWorkout/video-panel-component.tpl.html`,
11+
providers: [Modal],
12+
directives: [VideoPlayerComponent],
13+
pipes: [TranslatePipe]
14+
})
15+
export class VideoPanelComponent {
16+
@Input() videos: Array<string>;
17+
@Output() playbackStarted: EventEmitter<any> = new EventEmitter<any>();
18+
@Output() playbackEnded: EventEmitter<any> = new EventEmitter<any>();
19+
constructor(private _modal: Modal) { }
20+
21+
playVideo(videoId) {
22+
this.playbackStarted.emit(null);
23+
let resolvedBindings = Injector.resolve([provide('videoId', { useValue: videoId })]);
24+
var dialog = this._modal.open(VideoPlayerComponent,
25+
resolvedBindings,
26+
new ModalConfig('lg', true, 27),
27+
rootElement());
28+
dialog
29+
.then((d) => d.result)
30+
.then(() => { this.playbackEnded.emit(null); }, (error) => { this.playbackEnded.emit(null); });
31+
};
32+
}
33+
angular.module('7minWorkout').directive('videoPanel', <angular.IDirectiveFactory>upgradeAdapter.downgradeNg2Component(VideoPanelComponent));

‎trainer/app/js/7MinWorkout/video-player-component.js‎

Lines changed: 54 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎trainer/app/js/7MinWorkout/video-player-component.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { Component, Inject} from 'angular2/core';
2+
import { upgradeAdapter } from '../upgrade-adapter';
3+
import {TranslateService, TranslatePipe} from 'ng2-translate';
4+
import {ModalDialogInstance} from 'angular2-modal';
5+
import {Ng2RootComponent} from '../ng2-root-component';
6+
import {rootElement} from '../shared/root-element';
7+
8+
@Component({
9+
selector: 'video-player',
10+
template: `<div class="modal-header">
11+
<h3 class="modal-title">Workout Video</h3>
12+
</div>
13+
<div class="modal-body">
14+
<iframe width="100%" height="480" [src]="'//www.youtube.com/embed/' + videoId" frameborder="0" allowfullscreen></iframe>
15+
</div>
16+
<div class="modal-footer">
17+
<button class="btn btn-primary" (click)="ok()">OK</button>
18+
</div>`,
19+
})
20+
export class VideoPlayerComponent {
21+
constructor( @Inject('videoId') private videoId: string, private _dialog: ModalDialogInstance) { }
22+
23+
ok() {
24+
this._dialog.close();
25+
}
26+
}
27+
angular.module('7minWorkout').directive('videoPlayer', <angular.IDirectiveFactory>upgradeAdapter.downgradeNg2Component(VideoPlayerComponent));

‎trainer/app/js/7MinWorkout/workout-videos-component.js‎

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎trainer/app/js/7MinWorkout/workoutvideos.js‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎trainer/app/js/7MinWorkout/workoutvideos.spec.js‎

Whitespace-only changes.

0 commit comments

Comments
 (0)