Browse Source

Cleaned up welcome screen of all the fuzz.

pull/66/head
Simon Eisenmann 12 years ago
parent
commit
7f0b305e0f
  1. 11
      src/styles/global/_base.scss
  2. 2
      static/css/main.min.css
  3. 2
      static/js/controllers/roomchangecontroller.js
  4. 35
      static/partials/page/welcome.html

11
src/styles/global/_base.scss

@ -135,7 +135,16 @@ a {
font-size: 1.1em; font-size: 1.1em;
margin-top: 80px; margin-top: 80px;
text-shadow: 0 0 5px black; text-shadow: 0 0 5px black;
max-width:500px; max-width:600px;
h1 {
text-align: center;
}
.welcome-container {
max-width: 450px;
margin: 0 auto;
}
.welcome-input { .welcome-input {
position: relative; position: relative;

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long

2
static/js/controllers/roomchangecontroller.js

@ -73,7 +73,7 @@ define([], function() {
console.log("roomdata.name changed", n); console.log("roomdata.name changed", n);
var u = encodeURIComponent(n); var u = encodeURIComponent(n);
$scope.roomdata.url = "/" + u; $scope.roomdata.url = "/" + u;
$scope.roomdata.link = $scope.roomlink = mediaStream.url.room(n); $scope.roomdata.link = mediaStream.url.room(n);
}); });
var roomDataLinkInput = $element.find(".roomdata-link-input"); var roomDataLinkInput = $element.find(".roomdata-link-input");

35
static/partials/page/welcome.html

@ -1,22 +1,17 @@
<div class="welcome container-fluid" ng-controller="RoomchangeController"> <div class="welcome container-fluid" ng-controller="RoomchangeController">
<h3>{{_("Create a room")}}</h3> <h1>{{_("Create a room and talk together")}}</h1>
<p> <div class="welcome-container">
<div class="form-group welcome-input"> <p>
<input type="text" class="form-control roomdata-link-input input-lg" ng-model="roomdata.name" placeholder="{{_('Creating room ...')}}"> <div class="form-group welcome-input">
<div class="welcome-input-buttons"> <input type="text" class="form-control roomdata-link-input input-lg" ng-model="roomdata.name" placeholder="{{_('Creating room ...')}}">
<a class="fa fa-refresh" ng-click="refreshRoom()"></a> <div class="welcome-input-buttons">
<button class="btn btn-primary" type="button" ng-disabled="!roomdata.link" ng-click="changeRoomToId(roomdata.name)">{{_("Create")}}</button> <a class="fa fa-refresh" ng-click="refreshRoom()"></a>
</div> <button class="btn btn-primary" type="button" ng-disabled="!roomdata.link" ng-click="changeRoomToId(roomdata.name)">{{_("Create")}}</button>
</div> </div>
</p> </div>
<small> </p>
<ul class="fa-ul"> <center>
<li><i class="fa-li fa fa-external-link"></i>{{roomdata.link}}</li> <p ng-show="roomdata.name"><i class="fa fa-external-link"></i> <a href="{{roomdata.link}}" ng-click="changeRoomToId(roomdata.name);$event.preventDefault()">{{roomdata.link}}</a></p>
</ul> </center>
<ul class="fa-ul"> </div>
<li><i class="fa-li fa fa-share-square"></i>{{_("Share this URL with the people you want to meet.")}}</li>
<li><i class="fa-li fa fa-repeat"></i>{{_("You can use and re-use this room as many times as you want.")}}</li>
</ul>
</small>
<social-share/>
</div> </div>
Loading…
Cancel
Save