Skip to content

Issue #SB-0000 feat: Added player build of version 2.4.0 #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AmiableAnil merged 2 commits into from
Sep 27, 2019
Merged

Issue #SB-0000 feat: Added player build of version 2.4.0 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a96603c
Issue #SB-0000 feat: Added player build of version 2.4.0
itsvick Sep 27, 2019
4a6e7c2
Merge branch 'release-2.4.0' of github.com:Sunbird-Ed/SunbirdEd-mobil…
itsvick Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added content-player/assets/icons/arrow-pointing-to-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content-player/assets/icons/down-arrow.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content-player/assets/icons/menu.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 13 additions & 16 deletions content-player/coreplugins.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions content-player/coreplugins/org.ekstep.nextnavigation-1.0/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"id": "org.ekstep.nextnavigation",
"ver": "1.0",
"shortId": "org.eskstep.nextnavigation",
"author": "Akash Gupta",
"description": "",
"publishedDate": "",
"renderer": {
"main": "renderer/plugin.js"
}
}
72 changes: 72 additions & 0 deletions content-player/coreplugins/org.ekstep.nextnavigation-1.0/renderer/plugin.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions content-player/coreplugins/org.ekstep.nextnavigation-1.0/renderer/templates/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<div>
<a class="nav-icon nav-next" ng-show="showOverlayNext !==state_off" href="javascript:void(0);">
<img ng-src="{{imageBasePath}}next.png" ng-click="navigate('next')">
</a>
</div>
32 changes: 32 additions & 0 deletions content-player/coreplugins/org.ekstep.nextnavigation-1.0/renderer/templates/top.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<style>
.nav-btn-top {
position: absolute;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 6px;
height: 8%;
color: #000000;
width: 5%;
margin-top: 0.6%;
padding: 5px;
background-color: #FFFFFF;
border: solid #DDDDDD 2px;
justify-content: center;
display: flex;
cursor: pointer;
}
.nav-btn-top.next {
right: 2%;
}

.nav-btn-top:hover {
background: #005391;
text-decoration: none;
}
.nav-btn-top img {
width: 50%;
}
</style>
<a href="#" class="sb-btn-arrows next" ng-click="navigate('next')">
<span class="chevron right" style="display: flex;align-items: center;"></span>
</a>
10 changes: 9 additions & 1 deletion content-player/coreplugins/org.ekstep.overlay-1.0/renderer/controller/overlay.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion content-player/coreplugins/org.ekstep.overlay-1.0/renderer/plugin.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions content-player/coreplugins/org.ekstep.overlay-1.0/renderer/templates/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
<!-- Menu container -->
<div class="gc-menu">
<a ng-if="!showUser" class="gc-menu-btn old_menu" href="javascript:void(0)" ng-click="openMenu()">
<img class="menu-icon icon" ng-src="{{imageBasePath}}menu_icon_old.png" ng-hide="menuOpened"/>
<img ng-if="!navigationTop" class="menu-icon icon" ng-src="{{imageBasePath}}menu_icon_old.png" ng-hide="menuOpened"/>
<div><img ng-if="navigationTop" class="menu-icon icon nav-top hamberger-menu" ng-src="{{imageBasePath}}menu.png" ng-hide="menuOpened"/></div>
</a>
<a ng-if="showUser" class="gc-menu-btn" href="javascript:void(0)" ng-click="openMenu()">
<img class="menu-icon icon" ng-src="{{imageBasePath}}menu_icon.png" ng-hide="menuOpened"/>
<img class="menu-icon user" ng-src="{{imageBasePath}}avatar_anonymous.png" ng-hide="menuOpened"/>
<a ng-if="showUser" class="gc-menu-btn hamberger-menu" href="javascript:void(0)" ng-click="openMenu()">
<img ng-if="!navigationTop" class="menu-icon icon" ng-src="{{imageBasePath}}menu_icon.png" ng-hide="menuOpened"/>
<img ng-if="navigationTop" class="menu-icon icon nav-top hamberger-menu" ng-src="{{imageBasePath}}menu.png" ng-hide="menuOpened"/>
<!-- <img class="menu-icon user" ng-src="{{imageBasePath}}avatar_anonymous.png" ng-hide="menuOpened"/> -->
</a>
<div class=" gc-menu-cont" ng-show="menuOpened">
<div class="gc-menu-title-cont">
Expand Down Expand Up @@ -37,4 +39,4 @@
<img class="inst-done" ng-src="{{imageBasePath}}icn_done.png" ng-click="closeInstructions()" />
</div>
</div>
</div>
</div>
Loading