Browse Source

Improved welcome screen and added rooms history.

pull/156/head
Simon Eisenmann 11 years ago
parent
commit
4cbc2adcd1
  1. 15
      src/styles/global/_pages.scss
  2. 2
      static/css/main.min.css
  3. 13
      static/js/controllers/mediastreamcontroller.js
  4. 21
      static/partials/page/welcome.html

15
src/styles/global/_pages.scss

@ -58,10 +58,10 @@ @@ -58,10 +58,10 @@
.welcome-logo {
position: absolute;
left: 0px;
top: 0px;
top: 20px;
bottom: 0px;
width: 140px;
background: $scalable-logo no-repeat left;
background: $scalable-logo no-repeat left top;
background-size: contain;
@include breakpt($breakpoint-medium) {
position: relative;
@ -91,4 +91,15 @@ @@ -91,4 +91,15 @@
}
}
.rooms-history {
margin-top: 2.5em;
a {
&:hover {
text-decoration: none;
}
margin-right: .5em;
display: inline-block;
}
}
}

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long

13
static/js/controllers/mediastreamcontroller.js

@ -126,6 +126,7 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder @@ -126,6 +126,7 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder
$scope.chatMessagesUnseen = 0;
$scope.autoAccept = null;
$scope.isCollapsed = true;
$scope.roomsHistory = [];
$scope.defaults = {
displayName: null,
buddyPicture: null,
@ -275,6 +276,7 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder @@ -275,6 +276,7 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder
} else {
$scope.loadedUser = false;
}
$scope.roomsHistory = [];
appData.e.triggerHandler("userSettingsLoaded", [$scope.loadedUser, $scope.user]);
$scope.reset();
};
@ -755,6 +757,17 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder @@ -755,6 +757,17 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder
$scope.chatMessagesUnseen = $scope.chatMessagesUnseen - count;
});
$scope.$on("room.joined", function(event, roomName) {
if (roomName) {
_.pull($scope.roomsHistory, roomName);
$scope.roomsHistory.unshift(roomName);
if ($scope.roomsHistory.length > 15) {
// Limit the history.
$scope.roomsHistory = $scope.roomsHistory.splice(0, 15);
}
}
});
_.defer(function() {
if (!Modernizr.websockets) {
alertify.dialog.alert(translation._("Your browser is not supported. Please upgrade to a current version."));

21
static/partials/page/welcome.html

@ -3,14 +3,17 @@ @@ -3,14 +3,17 @@
<div class="welcome-container">
<h1>{{_("Enter a room name")}}</h1>
<p>
<div class="form-group welcome-input">
<input type="text" class="form-control roomdata-link-input input-lg" ng-model="roomdataInput.name" placeholder="{{roomdata.name||_('Creating room ...')}}">
<div class="welcome-input-buttons">
<a class="fa fa-refresh" title="{{_('Random room name')}}" ng-click="randomRoom()"></a>
<button class="btn btn-success btn-roomcreate" title="{{_('Enter room')}}" type="button" ng-disabled="!roomdata.link" ng-click="joinRoomByName(roomdata.name)"><i class="fa fa-sign-in"></i></button>
</div>
</div>
<div class="form-group welcome-input">
<input type="text" class="form-control roomdata-link-input input-lg" ng-model="roomdataInput.name" placeholder="{{roomdata.name||_('Creating room ...')}}">
<div class="welcome-input-buttons">
<a class="fa fa-refresh" title="{{_('Random room name')}}" ng-click="randomRoom()"></a>
<button class="btn btn-success btn-roomcreate" title="{{_('Enter room')}}" type="button" ng-disabled="!roomdata.link" ng-click="joinRoomByName(roomdata.name)"><i class="fa fa-sign-in"></i></button>
</div>
</div>
</p>
<p ng-show="roomdata.name"><i class="fa fa-link" title="{{_('Room link')}}"></i> <a href="{{roomdata.link}}" ng-click="joinRoomByName(roomdata.name);$event.preventDefault()">{{roomdata.link}}</a></p>
<p class="rooms-history">
<a ng-repeat="room in roomsHistory" ng-click="joinRoomByName(room)"><span class="label label-default">{{room}}</span></a>
</p>
<p ng-show="roomdata.name"><i class="fa fa-link" title="{{_('Room link')}}"></i> <a href="{{roomdata.link}}" ng-click="joinRoomByName(roomdata.name);$event.preventDefault()">{{roomdata.link}}</a></p>
</div>
</div>
</div>
Loading…
Cancel
Save