Author: Date: 2015-07-06 14:46:39 +0000 (Mon, 06 Jul 2015) New Revision: 1759 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1759 Log: Permit utilization of event dispatching for notify the remote control actions to controllers. Manage easier the display of channel information. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-22 11:36:30 UTC (rev 1758) +++ oipf/emulator/view/index.html 2015-07-06 14:46:39 UTC (rev 1759) @@ -14,54 +14,58 @@ <script src="./lib/build/oipf-lib.js" type="text/javascript"></script> <script src="./emulator/node_modules/angular/angular.js"></script> + <script src="./emulator/js/emulator.js"></script> <script src="./emulator/js/filters/VolumeFilter.js"></script> <script src="./emulator/js/utils/Service.js"></script> <script src="./emulator/js/services/OIPFServices.js"></script> - <script src="./emulator/js/contollers/RemoteControlControllers.js"></script> - <script src="./emulator/js/emulator.js"></script> + <script src="./emulator/js/contollers/RemoteControlController.js"></script> + <script src="./emulator/js/contollers/VideoBroadcastController.js"></script> + <script src="./emulator/js/contollers/PowerStateController.js"></script> + <script src="./emulator/js/contollers/PanelChannelController.js"></script> </head> <body> - <div class="container-fluid"> + <div class="container-fluid" ng-controller="RemoteControlController"> <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"/> + <img ng-src="{{chanLogo}}"/> </div> <div class="col-md-6"> <div> - efzefzefzefezfze + Toto TV </div> <div> - four-column layout + SÉRIE </div> </div> </div> - <div id="volumeView" class="text-center" ng-show="volumeViewActive"> - <div> - <h3> - <span class="label label-default"> - {{currentVolume}} - <span class="glyphicon glyphicon-volume-up"></span> - </span> - </h3> - <div class="progress"> - <div class="progress-bar" role="progressbar" aria-valuenow="0" - aria-valuemin="0" aria-valuemax="100" style="width:{{currentVolume}}%"> - </div> - </div> - </div> - </div> <div class="off" id="powerStateView" ng-controller="PowerStateController" ng-class="state"> <div id="imgChannel" ng-show="beforeON"> - <h1>Emulator</h1> + <h1>EMULATOR</h1> </div> </div> - <object class="ready" id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> + <object id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> + <img class="pull-right" ng-src="{{chanLogo}}"/> + <div id="volumeView" class="text-center" ng-show="volumeViewActive"> + <div> + <h3> + <span class="label label-default"> + {{currentVolume}} + <span class="glyphicon {{volumeClass}}"></span> + </span> + </h3> + <div class="progress"> + <div class="progress-bar" role="progressbar" aria-valuenow="0" + aria-valuemin="0" aria-valuemax="100" style="width:{{currentVolume}}%"> + </div> + </div> + </div> + </div> </object> <!-- <div id="imgChannel" class="text-center" ng-show="emulatorON">--> @@ -74,13 +78,13 @@ </div> - <div class="col-sm-2 col-sm-offset-1" ng-controller="RemoteControlController"> + <div class="col-md-2 col-sm-offset-1"> - <div class="panel panel-default"> + <div class="panel panel-default panel2"> <div class="panel-body"> <div class="row"> <div class="col-md-2 col-md-offset-2"> - <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('POWER')"> + <button id="marg" type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('POWER')"> <span class="glyphicon glyphicon-off"></span> </button> </div>