Skip to content

Commit baccde7

Browse files
committed
middle
1 parent fe5a5cf commit baccde7

File tree

6 files changed

+540
-268
lines changed

6 files changed

+540
-268
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module.exports = function (grunt) {
5858
server: {
5959
options: {
6060
protocol: 'https',
61-
hostname: 'localhost',
61+
hostname: '192.168.1.133',
6262
port: 8080,
6363
open: true,
6464
keepalive: true

samples/webrtc/index.html

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css">
1313
<!-- use http://una.im/CSSgram/ for filters -->
14-
<link rel="stylesheet" href="libs/cssgram.min.css">
14+
<link rel="stylesheet" href="https://cdn.rawgit.com/una/CSSgram/master/source/css/cssgram.css">
1515
<!-- app styles -->
1616
<link rel="stylesheet" href="styles.css">
1717
</head>
@@ -116,7 +116,8 @@ <h4>Call from <strong class="j-ic_initiator"></strong></h4>
116116
<!-- TEMPLATES -->
117117
<!-- stateBoard -->
118118
<script type="text/template" id="tpl_default">
119-
Login in as QuickBlox Conversations room. Logged in as <b><%= name %></b>
119+
QuickBlox Conversations room is calling <b><%= tag %></b>.
120+
Logged in as <b><%= name %></b>
120121
<button class='fw-link j-logout'>Logout</button>
121122
</script>
122123

@@ -151,7 +152,7 @@ <h4>Call from <strong class="j-ic_initiator"></strong></h4>
151152
</script>
152153

153154
<script type="text/template" id="p2p_call_stop">
154-
<%=name%> has <%=reason%>. Call is stopped.&emsp;
155+
<b><%=name%> has <%=reason%>.</b> Call is stopped.&emsp;
155156
Login&nbsp;in&nbsp;as&nbsp;<%=currentName%>
156157
<button class='fw-link j-logout'>Logout</button>
157158
</script>
@@ -226,19 +227,13 @@ <h4 class="caller__name">
226227
<div class="caller__frames_fl">
227228
<select class="caller__frames_fl_select j-filter">
228229
<option value="no">No Filter</option>
229-
<option value="aden">Aden</option>
230-
<option value="reyes">Reyes</option>
231-
<option value="perpetua">Perpetua</option>
232-
<option value="inkwell">Inkwell</option>
233-
<option value="toaster">Toaster</option>
234-
<option value="walden">Walden</option>
235-
<option value="hudson">Hudson</option>
236-
<option value="gingham">Gingham</option>
237-
<option value="mayfair">Mayfair</option>
238-
<option value="lofi">Lofi</option>
239-
<option value="xpro2">Xpro2</option>
240230
<option value="_1977">1977</option>
241-
<option value="brooklyn">Brooklyn</option>
231+
<option value="inkwell">inkwell</option>
232+
<option value="moon">moon</option>
233+
<option value="nashville">nashville</option>
234+
<option value="slumber">slumber</option>
235+
<option value="toaster">toaster</option>
236+
<option value="walden">walden</option>
242237
</select>
243238
</div>
244239
</div>
@@ -280,14 +275,14 @@ <h4 class="caller__name">
280275

281276
<script type="text/template" id="callee_video">
282277
<div class="frames_callee callees__callee j-callee">
283-
<div class="frames_callee_inner">
284-
<p class="frames_callee_status j-callee_status_<%=userID%>">Connecting</p>
278+
<div class="frames_callee__inner">
279+
<p class="frames_callee__status j-callee_status_<%=userID%>">Connecting</p>
285280
<div class="qb-video">
286-
<video class="j-callees__callee_video frames_callee_video qb-video_source" id="remote_video_<%=userID%>" data-user="<%=userID%>"></video>
281+
<video class="j-callees__callee__video qb-video_source" id="remote_video_<%=userID%>" data-user="<%=userID%>"></video>
287282
</div>
288283
</div>
289284

290-
<p class="frames_callee_name"><%=name%></p>
285+
<p class="frames_callee__name"><%=name%></p>
291286
</div>
292287
</script>
293288

0 commit comments

Comments
 (0)