Author: ygrego Date: 2015-06-17 15:18:28 +0000 (Wed, 17 Jun 2015) New Revision: 1737 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1737 Log: Manage emulator power transition and channel switch info view. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-17 15:16:21 UTC (rev 1736) +++ oipf/emulator/view/index.html 2015-06-17 15:18:28 UTC (rev 1737) @@ -9,22 +9,34 @@ <title>TV Emulator</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" type="text/css" href="./emulator/node_modules/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="./emulator/css/main.css"> - <link rel="stylesheet" type="text/css" href="./emulator/node_modules/bootstrap/dist/css/bootstrap.min.css"> <script src="./lib/build/oipf-lib.js" type="text/javascript"></script> <script src="./emulator/node_modules/angular/angular.js"></script> <script src="./emulator/js/filters/VolumeFilter.js"></script> + <script src="./emulator/js/services/OIPFServices.js"></script> <script src="./emulator/js/contollers/RemoteControlControllers.js"></script> - <script src="./emulator/js/services/OIPFServices.js"></script> <script src="./emulator/js/emulator.js"></script> </head> <body> - - <div class="container-fluid" ng-controller="RemoteControlController"> + <div class="container-fluid"> <div class="row"> <div id="emulator" class="col-md-9"> + <div id="panelSwitching" ng-controller="PanelChannelController" ng-show="isRequired"> + <div class="col-md-2"> + <img src="http://telepoche.guidetele.com/medias/chaines/tf1.png"/> + </div> + <div class="col-md-6"> + <div> + efzefzefzefezfze + </div> + <div> + four-column layout + </div> + </div> + </div> <div id="volumeView" class="text-center" ng-show="volumeViewActive"> <div> @@ -41,8 +53,16 @@ </div> </div> </div> - <object is="video-broadcast"></object> + <div class="off" id="powerStateView" ng-controller="PowerStateController" ng-class="state"> + <div id="imgChannel" ng-show="beforeON"> + <h1>Emulator</h1> + </div> + </div> + + <object class="ready" id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> + </object> + <!-- <div id="imgChannel" class="text-center" ng-show="emulatorON">--> <!-- <h1>{{channel}}</h1>--> <!-- </div>--> @@ -53,7 +73,7 @@ </div> - <div class="col-sm-2 col-sm-offset-1"> + <div class="col-sm-2 col-sm-offset-1" ng-controller="RemoteControlController"> <div class="panel panel-default"> <div class="panel-body">