Skip to content
Browse files

tweaked css

  • Loading branch information...
1 parent fb5924d commit 3f6199e7c1094e160d8fdd9253235cc92e7bdff6 @chrismatthieu committed Nov 22, 2011
View
4 README
@@ -1,4 +1,6 @@
== Welcome to Twelephone
Hello, 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 fans for free!
+
+Twelephone is powered by Voxeo's Javascript Phone API called Phono (http://phono.com) and Tropo (http://tropo.com) cloud communications platform.
View
8 app/assets/stylesheets/application.css
@@ -84,7 +84,7 @@ html, body {
min-height: 100%;
height: auto !important;
height: 100%;
- margin: 0 auto -4em;
+ margin: 0 auto -4em;
}
@@ -114,7 +114,7 @@ html, body {
/* page */
.page {
padding: 0 90px 0 90px;
- width: 780px;
+/* width: 100%;*/
text-align: left;
/* background: url(/assets/pagetop.gif) 90px 0 no-repeat;*/
}
@@ -517,15 +517,15 @@ color: white;
#notebar {
position:absolute;
- right:5px;
+ right:75px;
margin-top: 100px;
width:200px;
}
#profilecomment {
width:100%;
}
#contentwrap {
- width: 750px;
+ width: 100%;
border: 2px solid gray;
padding: 7px;
padding-bottom: 0;
View
2 app/views/layouts/application.html.erb
@@ -51,7 +51,7 @@
<!div id="leftbar">
<div id="topbar"><a href="/"><img src="/assets/twelephone4blacklogo.png" height="60" align="left"></a></div>
- <% if controller.controller_name == "static" %>
+ <% if false #controller.controller_name == "static" %>
<img src="/assets/coolphone.gif" align="left">
<% end %>
<div id="wrapper" class="page">
View
1 app/views/static/index.html.erb
@@ -2,4 +2,5 @@
<p>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!</p>
<br/>
+<p>Turn up your speakers, sign-in with your Twitter account, and start a conference call.</p>
<!-- <p>You can also place calls to any North American phone numbers for free too!</p> -->
View
4 app/views/users/show.html.erb
@@ -25,9 +25,11 @@
$("#wrapper").append(
$("<div/>")
.css("width","450px")
+ .css("margin-left","auto")
+ .css("margin-right","auto")
.callme({
apiKey: "C17D167F-09C6-4E4C-A3DD-2025D48BA243",
- buttonTextReady: "START TWELEPHONE CALL",
+ buttonTextReady: "CLICK TO CALL",
username: "<%=@username%>",
slideOpen:false,
dialPad: false
View
4 config/environments/development.rb
@@ -39,8 +39,8 @@
OpenID.fetcher.ca_file = "#{Rails.root}/config/ca-bundle.crt"
# providers with id/secret, you need to sign up for their services (see below) and enter the parameters here
- provider :facebook, '214563245242191', '576ba383aaf5335c528c9c603ec74828'
- provider :twitter, 'MirwMXxnomdhnywG6ynag', 'keUu5ggHjmGL40YsRZjgIeIGjeswjA9E4KZJLfP9k'
+ # provider :facebook, '214563245242191', '576ba383aaf5335c528c9c603ec74828'
+ provider :twitter, 'MPXN7K8BZKsOVFQGk2k9g', 'yahzdhxfTibHIkBVyP6Q9twcQ8H9wf1pTG8undOE0'
# generic openid
provider :openid, OpenID::Store::Filesystem.new('./tmp'), :name => 'openid'
View
4 config/environments/production.rb
@@ -79,8 +79,8 @@
OpenID.fetcher.ca_file = "#{Rails.root}/config/ca-bundle.crt"
# providers with id/secret, you need to sign up for their services (see below) and enter the parameters here
- provider :facebook, '214563245242191', '576ba383aaf5335c528c9c603ec74828'
- provider :twitter, 'MirwMXxnomdhnywG6ynag', 'keUu5ggHjmGL40YsRZjgIeIGjeswjA9E4KZJLfP9k'
+ # provider :facebook, '214563245242191', '576ba383aaf5335c528c9c603ec74828'
+ provider :twitter, 'MPXN7K8BZKsOVFQGk2k9g', 'yahzdhxfTibHIkBVyP6Q9twcQ8H9wf1pTG8undOE0'
# generic openid
provider :openid, OpenID::Store::Filesystem.new('./tmp'), :name => 'openid'
View
2 public/javascripts/callme.js
@@ -206,7 +206,7 @@
value: settings.username
}],
onAnswer: function(event) {
- phoneBtn.text("Hangup");
+ phoneBtn.text("CLICK TO HANGUP");
},
onHangup: function() {
hangUpCall(settings, phone);

0 comments on commit 3f6199e

Please sign in to comment.
Something went wrong with that request. Please try again.