Browse Source

Renamed classroom renderer to auditorium.

pull/156/head
Simon Eisenmann 11 years ago
parent
commit
9d047d68e7
  1. 24
      src/styles/components/_audiovideo.scss
  2. 2
      static/css/main.min.css
  3. 14
      static/js/services/videolayout.js
  4. 8
      static/partials/audiovideo.html

24
src/styles/components/_audiovideo.scss

@ -254,6 +254,25 @@ @@ -254,6 +254,25 @@
text-shadow: 0 0 5px black;
width: 40px;
}
button.renderer-auditorium {
position: relative;
span:before {
position:absolute;
left:50%;
top:50%;
margin-left: -0.8em;
margin-top: -0.5em;
content: "\f183";
}
span:after {
position:absolute;
top:50%;
right:50%;
margin-right: -0.9em;
margin-top: -0.5em;
content: "\f183";
}
}
}
.remoteVideo {
@ -387,7 +406,7 @@ @@ -387,7 +406,7 @@
}
}
.renderer-classroom {
.renderer-auditorium {
.remoteContainer {
border-left: 40px solid black;
}
@ -445,4 +464,5 @@ @@ -445,4 +464,5 @@
bottom: 8%;
}
}
}
}

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long

14
static/js/services/videolayout.js

@ -298,15 +298,15 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern @@ -298,15 +298,15 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
};
// Classroom inherits from ConferenceKiosk
var Classroom = function(container, scope, controller) {
// Auditorium inherits from ConferenceKiosk
var Auditorium = function(container, scope, controller) {
// Call super.
ConferenceKiosk.call(this, container, scope, controller);
}
Classroom.prototype = Object.create(ConferenceKiosk.prototype);
Classroom.prototype.constructor = Classroom;
Classroom.prototype.name = "classroom";
Classroom.prototype.render = function(container, size, scope, videos, streams) {
Auditorium.prototype = Object.create(ConferenceKiosk.prototype);
Auditorium.prototype.constructor = Auditorium;
Auditorium.prototype.name = "auditorium";
Auditorium.prototype.render = function(container, size, scope, videos, streams) {
var big = this.big;
if (big) {
var currentbigpeerid = this.big.data("peerid");
@ -329,7 +329,7 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern @@ -329,7 +329,7 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
renderers[Smally.prototype.name] = Smally;
renderers[Democrazy.prototype.name] = Democrazy;
renderers[ConferenceKiosk.prototype.name] = ConferenceKiosk;
renderers[Classroom.prototype.name] = Classroom;
renderers[Auditorium.prototype.name] = Auditorium;
// Public api.
var current = null;

8
static/partials/audiovideo.html

@ -12,9 +12,9 @@ @@ -12,9 +12,9 @@
</div>
</div>
<div class="overlayActions">
<button class="btn btn-link" title="{{_('Standard view')}}" ng-click="setRenderer('democrazy')"><i class="fa fa-table" ></i></button>
<button class="btn btn-link" title="{{_('Large view')}}" ng-click="setRenderer('onepeople')"><i class="fa fa-plus-square" ></i></button>
<button class="btn btn-link" title="{{_('Kiosk view')}}" ng-click="setRenderer('conferencekiosk')"><i class="fa fa-user"></i></button>
<button class="btn btn-link" title="{{_('Classroom')}}" ng-click="setRenderer('classroom')"><i class="fa fa-graduation-cap"></i></button>
<button class="btn btn-link renderer-democrazy" title="{{_('Standard view')}}" ng-click="setRenderer('democrazy')"><i class="fa fa-table"></i></button>
<button class="btn btn-link renderer-onepeople" title="{{_('Large view')}}" ng-click="setRenderer('onepeople')"><i class="fa fa-plus-square" ></i></button>
<button class="btn btn-link renderer-conferencekiosk" title="{{_('Kiosk view')}}" ng-click="setRenderer('conferencekiosk')"><i class="fa fa-user"></i></button>
<button class="btn btn-link renderer-auditorium" title="{{_('Auditorium')}}" ng-click="setRenderer('auditorium')"><i class="fa fa-male"></i><span class="fa"></span></button>
</div>
</div>
Loading…
Cancel
Save