Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: TapIn/Web-Frontend
base: 7a6f2bb3c6
...
head fork: TapIn/Web-Frontend
compare: e9accfaf23
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 15, 2012
Vu Tran add comment scroll bad4a31
Vu Tran add shit' e9accfa
36 html/assets/css/tapin.css
View
@@ -180,9 +180,13 @@ body {
left: 0;
top: 40px;
bottom: 0;
- width: 480px;
+ width: 495px;
padding: 10px 25px 10px 25px;
background: url('../img/tire.png');
+ -moz-box-shadow: 0px 2px 4px #000;
+ -webkit-box-shadow: 0px 2px 4px #000;
+ box-shadow: 0px 2px 4px #000;
+ overflow: auto;
}
#sidebar h2 {
@@ -193,24 +197,42 @@ body {
}
#comments #more {
+ height: 20px;
+ width: 100%;
+ bottom: 0px;
+ position:absolute;
+}
+
+#more-button {
+ cursor:pointer;
+ color: #999;
+ width: 40px;
+ padding-bottom: 20px;
+ height: 4px;
margin: 0 auto;
- margin-left: 210px;
- height: 10px;
- width: 30px;
+ margin-top: -8px;
+ text-align: center;
+ background: #1e1e1e;
+ border-radius: 5px;
+ border: solid 1px black;
}
#comments {
+ position:relative;
overflow:hidden;
width: 464px;
background: #181818;
- height: 180px;
- padding: 8px 8px 8px 8px;
+ padding: 8px 8px 24px 8px;
border-radius: 5px;
margin-top: -15px;
-moz-box-shadow: inset 1px 1px 1px #000;
-webkit-box-shadow: inset 1px 1px 1px #000;
box-shadow: inset 1px 1px 1px #000;
background: url('../img/commentsbg.png');
+ transition: height .4s;
+ -moz-transition: height .4s; /* Firefox 4 */
+ -webkit-transition: height .4s; /* Safari and Chrome */
+ -o-transition: height .4s; /* Opera */
}
.badge {
@@ -330,7 +352,7 @@ body {
#map {
position: absolute;
top: 40px;
- left: 0;
+ left: 545px;
bottom: 0;
right: 0;
}
1  html/assets/js/tapin/api.js
View
@@ -18,7 +18,6 @@ define(['tapin/util/log', 'tapin/util/event', 'jquery', 'tapin/config', 'tapin/u
*/
this.call = function(endpoint, params, lambda, error_lambda, type)
{
- alert();
if (typeof(params) === 'string') {
params += '&token=' + token + '&';
} else if(typeof(params) === 'object') {
21 html/assets/js/tapin/frontend.js
View
@@ -235,7 +235,7 @@ define([
});
$('#comment-form').click(function(){
- document.getElementById('comment-form').style.height = '60px';
+ $('#comment-form').height(60);
});
//Handles what happens when you click 'lastweek' button
@@ -298,6 +298,25 @@ define([
$('a#stream').click(function(){
alert();
});
+
+ $('#more').click(function(){
+ var comment = $("div id='comments'><div class='comment'><div class='user-icon'></div><div class='body'>Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non!<div class='time'>about 20 minutes ago</div></div></div>");
+ var comment2 = $("div id='comments'><div class='comment'><div class='user-icon'></div><div class='body'>Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non!<div class='time'>about 20 minutes ago</div></div></div>");
+
+ $('#comments').append(comment);
+ $('#comments').append(comment2);
+ });
+
+ //Comment submission
+
+ $('#submit-comment').click(function(){
+ var comment = $('#comment-form').val();
+ var params = 'cookie=banana&cheese=taco';
+
+ _this.api.update_object_by_key('comment', '23432', params, function(data) {
+ alert(data);
+ });
+ });
// Bind to volume change events
this.volume.onVolumeChange.register(function(newVolume)
9 html/index.html
View
@@ -116,8 +116,8 @@ <h2 id='currently-playing'>Currently Playing</h2>
<h2>Comment</h2>
<form>
<div class='user-icon'></div>
- <textarea id='comment-form' class='span4' rows="10" cols="30"></textarea>
- <input class="btn btn-danger" type="submit" value="Submit">
+ <textarea id='comment-form' class='span4' rows="10" cols="30" placeholder='Leave a comment...'></textarea>
+ <input id='submit-comment' class="btn btn-danger" type="button" value="Submit">
</form>
<div id='comments'>
<div class='comment'>
@@ -141,12 +141,9 @@ <h2 id='currently-playing'>Currently Playing</h2>
<div class='time'>about 20 minutes ago</div>
</div>
</div>
-
- <div id='more'>...</div>
+ <div id='more'><div id='more-button'>...</div></div>
</div>
-
-
</div>
<script src="http://maps.googleapis.com/maps/api/js?key=AIzaSyCT6d3KrGPRmnP-Z1asHB6MuC9Ed0idEXg&amp;sensor=false"></script>

No commit comments for this range

Something went wrong with that request. Please try again.