Browse Source

Cleanups.

pull/16/head
Simon Eisenmann 12 years ago
parent
commit
4988edcd36
  1. 3
      html/main.html
  2. 17
      static/js/directives/statusmessage.js

3
html/main.html

@ -11,7 +11,7 @@
<div class="left"> <div class="left">
<%template "logo" .%> <%template "logo" .%>
</div> </div>
<status-message ng-controller="StatusmessageController"></status-message> <status-message></status-message>
<div class="ng-cloak right"> <div class="ng-cloak right">
<button title="{{_('Share your screen')}}" class="btn aenablebtn" ng-show="master.settings.screensharingMedia && (status=='connected' || status=='conference' || enabledScreenshare)" ng-model="layout.screenshare" btn-checkbox><i class="fa fa-desktop"></i></button> <button title="{{_('Share your screen')}}" class="btn aenablebtn" ng-show="master.settings.screensharingMedia && (status=='connected' || status=='conference' || enabledScreenshare)" ng-model="layout.screenshare" btn-checkbox><i class="fa fa-desktop"></i></button>
<button title="{{_('Chat')}}" ng-show="roomstatus" class="btn" ng-class="{messagesunseen: chatMessagesUnseen>0}" ng-model="layout.chat" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-comments-o"></i><span class="badge" ng-show="chatMessagesUnseen">{{chatMessagesUnseen}}</span></button> <button title="{{_('Chat')}}" ng-show="roomstatus" class="btn" ng-class="{messagesunseen: chatMessagesUnseen>0}" ng-model="layout.chat" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-comments-o"></i><span class="badge" ng-show="chatMessagesUnseen">{{chatMessagesUnseen}}</span></button>
@ -42,7 +42,6 @@
</div> </div>
<div class="ng-cloak" id="settings" ng-class="{show: layout.settings}"><settings/></div> <div class="ng-cloak" id="settings" ng-class="{show: layout.settings}"><settings/></div>
<script data-main="<%.Cfg.S%>/js/<%.App%>" data-plugin="<%.Cfg.Plugin%>" src="<%.Cfg.S%>/js/libs/require/require.js"></script> <script data-main="<%.Cfg.S%>/js/<%.App%>" data-plugin="<%.Cfg.Plugin%>" src="<%.Cfg.S%>/js/libs/require/require.js"></script>
<div class="ng-cloak" id="details">{{id}}</div>
<%template "extra-body" .%> <%template "extra-body" .%>
</body> </body>
</html><%end%> </html><%end%>

17
static/js/directives/statusmessage.js

@ -20,15 +20,16 @@
*/ */
define(['text!partials/statusmessage.html'], function(template) { define(['text!partials/statusmessage.html'], function(template) {
// statusMessage // statusMessage
return ["$compile", function($compile) { return [function() {
return { return {
restrict: 'E', restrict: 'E',
replace: true, replace: true,
template: template template: template,
} controller: "StatusmessageController"
}
}]; }];
}); });

Loading…
Cancel
Save