Added place holder text to room input.

src/i18n/messages-de.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: simon@struktur.de\n"
-"POT-Creation-Date: 2014-12-04 12:36+0100\n"
+"POT-Creation-Date: 2014-12-04 13:52+0100\n"
-"PO-Revision-Date: 2014-12-04 12:41+0100\n"
+"PO-Revision-Date: 2014-12-04 13:52+0100\n"
 "Last-Translator: Simon Eisenmann <simon@struktur.de>\n"
 "Language-Team: struktur AG <opensource@struktur.de>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -698,6 +698,9 @@ msgstr "Browsereinstellung"
 msgid "Meet with me here:"
 msgstr "Meeting:"
 
+msgid "Room name"
+msgstr "Raum-Name"
+
 msgid "Unknown URL format. Please make sure to enter a valid YouTube URL."
 msgstr "Unbekanntes URL-Format. Bitte geben Sie eine gültige YouTube URL ein."
 

src/i18n/messages-ja.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: simon@struktur.de\n"
-"POT-Creation-Date: 2014-12-04 12:36+0100\n"
+"POT-Creation-Date: 2014-12-04 13:52+0100\n"
 "PO-Revision-Date: 2014-04-23 22:25+0100\n"
 "Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n"
 "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@@ -679,6 +679,10 @@ msgstr "ブラウザの言語を使用"
 msgid "Meet with me here:"
 msgstr "ここで私と会う:"
 
+#, fuzzy
+msgid "Room name"
+msgstr "あなたの名前"
+
 msgid "Unknown URL format. Please make sure to enter a valid YouTube URL."
 msgstr ""
 

src/i18n/messages-ko.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: simon@struktur.de\n"
-"POT-Creation-Date: 2014-12-04 12:36+0100\n"
+"POT-Creation-Date: 2014-12-04 13:52+0100\n"
 "PO-Revision-Date: 2014-04-13 20:30+0900\n"
 "Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n"
 "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@@ -679,6 +679,10 @@ msgstr "브라우저 언어 사용"
 msgid "Meet with me here:"
 msgstr "나를 여기서 만납니다:"
 
+#, fuzzy
+msgid "Room name"
+msgstr "사용자 이름"
+
 msgid "Unknown URL format. Please make sure to enter a valid YouTube URL."
 msgstr ""
 

src/i18n/messages-zh-cn.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: simon@struktur.de\n"
-"POT-Creation-Date: 2014-12-04 12:36+0100\n"
+"POT-Creation-Date: 2014-12-04 13:52+0100\n"
 "PO-Revision-Date: 2014-05-21 09:54+0800\n"
 "Last-Translator: Michael P.\n"
 "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@@ -678,6 +678,10 @@ msgstr "使用浏览器语言"
 msgid "Meet with me here:"
 msgstr "我们这里见："
 
+#, fuzzy
+msgid "Room name"
+msgstr "您的名字"
+
 msgid "Unknown URL format. Please make sure to enter a valid YouTube URL."
 msgstr ""
 

src/i18n/messages-zh-tw.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: simon@struktur.de\n"
-"POT-Creation-Date: 2014-12-04 12:36+0100\n"
+"POT-Creation-Date: 2014-12-04 13:52+0100\n"
 "PO-Revision-Date: 2014-05-21 09:55+0800\n"
 "Last-Translator: Michael P.\n"
 "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@@ -678,6 +678,10 @@ msgstr "使用瀏覽器語言"
 msgid "Meet with me here:"
 msgstr "我們這裡見："
 
+#, fuzzy
+msgid "Room name"
+msgstr "您的名字"
+
 msgid "Unknown URL format. Please make sure to enter a valid YouTube URL."
 msgstr ""
 

src/i18n/messages.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: simon@struktur.de\n"
-"POT-Creation-Date: 2014-12-04 12:36+0100\n"
+"POT-Creation-Date: 2014-12-04 13:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -668,6 +668,9 @@ msgstr ""
 msgid "Meet with me here:"
 msgstr ""
 
+msgid "Room name"
+msgstr ""
+
 msgid "Unknown URL format. Please make sure to enter a valid YouTube URL."
 msgstr ""
 

static/js/directives/welcome.js

@@ -23,11 +23,13 @@
 define([], function() {
 
 	// welcome
-	return ["rooms", "$timeout", "mediaStream", function(rooms, $timeout, mediaStream) {
+	return ["rooms", "$timeout", "mediaStream", "translation", function(rooms, $timeout, mediaStream, translation) {
 
 		function link($scope, $element) {
 			//console.log("xxx welcome", $scope.$id, $element);
 
+			var placeHolder = translation._("Room name");
+
 			$scope.randomRoom = rooms.randomRoom;
 			$scope.canCreateRooms = rooms.canCreateRooms;
 			$scope.joinRoomByName = function(name) {
@@ -42,9 +44,9 @@ define([], function() {
 
 			var roomdata = rooms.getRandomRoom();
 			if (roomdata) {
-				$scope.roomdata = {name: roomdata.name}
+				$scope.roomdata = {name: roomdata.name, placeholder: roomdata.name ? roomdata.name : placeHolder}
 			} else {
-				$scope.roomdata = {};
+				$scope.roomdata = {placeholder: placeHolder};
 			}
 
 			$scope.roomdataInput = {
@@ -64,7 +66,7 @@ define([], function() {
 			});
 
 			$scope.$on("room.random", function(event, roomdata) {
-				$scope.roomdata = {name: roomdata.name, last: roomdata.name};
+				$scope.roomdata = {name: roomdata.name, last: roomdata.name, placeholder: roomdata.name ? roomdata.name : placeHolder};
 				$scope.roomdataInput.name = "";
 			});
 

static/partials/page/welcome.html

@@ -3,14 +3,14 @@
 	<div class="welcome-container" ng-controller="UsersettingsController as usersettings">
 		<h1>{{_("Enter a room name")}}</h1>
 		<div class="form-group welcome-input" ng-class="{'has-error': welcome.$invalid, 'has-success': welcome.$valid && roomdata.name}">
-			<input type="text" class="form-control roomdata-link-input input-lg" ng-model="roomdataInput.name" ng-maxlength="30" on-enter="joinRoomByName(roomdata.name)" placeholder="{{roomdata.name}}">
+			<input type="text" class="form-control roomdata-link-input input-lg" ng-model="roomdataInput.name" ng-maxlength="30" on-enter="joinRoomByName(roomdata.name)" placeholder="{{roomdata.placeholder}}">
 			<div class="welcome-input-buttons">
 				<a ng-show="roomdata.last" 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 || welcome.$invalid" ng-click="joinRoomByName(roomdata.name)"><i class="fa fa-sign-in"></i></button>
 			</div>
 			<welcome-form-extra></welcome-form-extra>
 		</div>
-		<p class="room-link small" ng-show="roomdata.name"><span><i class="fa fa-link" title="{{_('Room link')}}"></i> <a href="{{roomdata.link}}" ng-click="joinRoomByName(roomdata.name);$event.preventDefault()">{{roomdata.link}}</a></span></p>
+		<p class="room-link small"><span><i class="fa fa-link" title="{{_('Room link')}}"></i> <a ng-show="roomdata.name" href="{{roomdata.link}}" ng-click="joinRoomByName(roomdata.name);$event.preventDefault()">{{roomdata.link}}</a></span></p>
 		<p ng-show="welcome.$invalid" class="welcome-error text-danger">This room name can not be used. Please choose another name.</p>
 		<div class="welcome-login" ng-hide="canCreateRooms()">
 			<p class="h4">{{_("Enter the name of an existing room. You can create new rooms when you are signed in.")}}</p>