Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed admin mute

  • Loading branch information...
commit ca09be26d7744c9e39416f99a4bec9bbfd63fe6b 1 parent aa5c3fa
@chrismatthieu authored
View
BIN  app/assets/.DS_Store
Binary file not shown
View
6 app/assets/stylesheets/application.css
@@ -617,6 +617,8 @@ div#pimped.bubble cite.rounded {
input.telephone_button
{
- font-size:10px;
- height:20px;
+/* font-size:10px;*/
+/* height:20px;*/
+vertical-align: top;
+
}
View
2  app/views/layouts/application.html.erb
@@ -65,7 +65,7 @@
<%= gravatar_image_tag @current_user.email, :class => "gravatar", :width => "50" rescue ""%>
<% end %>
<%= link_to @current_user.username.capitalize, "/" + @current_user.username %> |
- <%= link_to 'Logout', '/logout' %><br/>
+ <%= link_to 'Logout', '/logout' %><br/><br/>
<%= button_to_function "Dialpad", "popitup('/telephone')", :class => "telephone_button" %>
<a href="https://twitter.com/share" class="twitter-share-button" data-count="none"
data-text="Join me now on a social twelephone call!">Tweet</a>
View
4 app/views/static/index.html.erb
@@ -1,8 +1,8 @@
<h2>Hello Twelephone</h2>
Meet the world's first social telephone. Twelephone is integrated with your Twitter account
- and allows you to start group conference calls or party lines to speak to your fans for free!
+ and allows you to start group conference calls or party lines to speak to your friends for free!
<br/><br/>
-Turn up your speakers, sign-in with your Twitter account, and start a conference call.
+Turn up your speakers, sign-in with your Twitter account, and start a twelephone call.
<!-- <p>You can also place calls to any North American phone numbers for free too!</p> -->
<br/><br/>
<% if !@current_user %>
View
4 public/javascripts/callme.js
@@ -121,7 +121,7 @@
$("#" + datausername).append('<div id="' + datausername + 'mute"><input class="phono-user-mute-' + datausername + '" type="checkbox"> mute</div>');
$('.phono-user-mute-' + datausername).bind('click', function() {
- phono.messaging.send( datajid, datausername + '~photo~' + datajid + '~mute');
+ (this.checked)? phono.messaging.send( datajid, datausername + '~photo~' + datajid + '~mute'): phono.messaging.send( datajid, datausername + '~photo~' + datajid + '~unmute');
});
// Add Hangup link/checkbox next to avatar
@@ -142,9 +142,11 @@
try { $("#audio_msg")[0].play(); } catch(e) {}
}
if(datastatus == 'mute'){
+ $(".phono-mute-toggle-hldr").remove();
call.mute(true);
}
if(datastatus == 'unmute'){
+ $(".phono-mute-toggle-hldr").remove();
call.mute(false);
}
if(datastatus == 'hangup'){
Please sign in to comment.
Something went wrong with that request. Please try again.