Skip to content

Commit f87789a

Browse files
committedMar 9, 2012
Adds working views
Signed-off-by: Akash Manohar J <akash@akash.im>
1 parent 3698cc0 commit f87789a

10 files changed

+18
-25
lines changed
 

‎app/assets/javascripts/application.js

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// GO AFTER THE REQUIRES BELOW.
1212
//
1313
//= require jquery
14+
//= require jquery-ui
1415
//= require jquery_ujs
1516
//= require ember-dev
1617
//= require lib/ember-rest.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
1-
Kandan.ChannelsController = Ember.ResourceController.create({
1+
Kandan.ChannelsController = Ember.ResourceController.create
22
resourceType: Kandan.Channel
3-
4-
5-
# load: (json)->
6-
# console.log "activity loads..."
7-
# console.log json
8-
# @_super(json)
9-
})
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Kandan.UsersController = Ember.ResourceController.create
2-
resourceType: Kandan.User
2+
resourceType: Kandan.User
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
List activitiy boxes for channels here
1+
List activitiy boxes for channels below:
22
{{#each channels}}
33
{{view Kandan.ListChannelActivitiesView channelBinding="this"}}
44
{{/each}}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
USER:{{activity.user.id}} {{activity.id}} - {{activity.content}}
1+
{{activity.user.first_name}}: {{activity.content}}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Kandan.ListActivitiesView = Ember.View.extend({
22
templateName: 'ember/templates/activities/list_activities'
33
channelsBinding: 'Kandan.ChannelsController'
4+
activitiesBinding: 'Kandan.ActivitiesController'
45
})
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
Kandan.ListChannelActivitiesView = Ember.View.extend({
2-
templateName: 'ember/templates/activities/list_channel_activities'
3-
channelBinding: 'Kandan.ChannelsController'
4-
activitiesBinding: 'Kandan.ActivitiesController'
5-
# userBinding: 'Kandan.UsersController'
6-
7-
})
1+
Kandan.ListChannelActivitiesView = Ember.View.extend
2+
templateName: 'ember/templates/activities/list_channel_activities'
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
Kandan.ListChannelsView = Ember.View.extend({
1+
Kandan.ListChannelsView = Ember.View.extend
22
templateName: 'ember/templates/channels/list'
33
channelsBinding: 'Kandan.ChannelsController'
44

55
refreshList: ()->
66
Kandan.ChannelsController.findAll()
7-
})

‎app/assets/javascripts/init.js.coffee

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
$ ->
2+
$(".channels").tabs()

‎app/views/main/index.html.erb

+7-5
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
</script>
1111

1212
<%= javascript_tag do %>
13-
$(function() {
13+
$(function()
14+
{
1415
var channels_json = <%= @channels.to_json(
15-
:include => {
16-
:activities => {
17-
:include=>:user
18-
}}).html_safe %>
16+
:include => {
17+
:activities => {
18+
:include=>:user
19+
}
20+
}).html_safe %>
1921
Kandan.ChannelsController.loadAll(channels_json);
2022
});
2123
<%- end %>

0 commit comments

Comments
 (0)
Please sign in to comment.