Adds working views

Signed-off-by: Akash Manohar J <akash@akash.im>
kandanapp · Mar 9, 2012 · f87789a · f87789a
1 parent 3698cc0
commit f87789a
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 25 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -11,6 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
+//= require jquery-ui
 //= require jquery_ujs
 //= require ember-dev
 //= require lib/ember-rest.js

diff --git a/app/assets/javascripts/ember/controllers/channels_controller.js.coffee b/app/assets/javascripts/ember/controllers/channels_controller.js.coffee
@@ -1,9 +1,2 @@
-Kandan.ChannelsController = Ember.ResourceController.create({
+Kandan.ChannelsController = Ember.ResourceController.create
   resourceType: Kandan.Channel
-
-
-  # load: (json)->
-  #   console.log "activity loads..."
-  #   console.log json
-  #   @_super(json)
-})
diff --git a/app/assets/javascripts/ember/controllers/users_controller.js.coffee b/app/assets/javascripts/ember/controllers/users_controller.js.coffee
@@ -1,2 +1,2 @@
 Kandan.UsersController = Ember.ResourceController.create
-  resourceType: Kandan.User
+  resourceType: Kandan.User
diff --git a/app/assets/javascripts/ember/templates/activities/list_activities.handlebars b/app/assets/javascripts/ember/templates/activities/list_activities.handlebars
@@ -1,4 +1,4 @@
-List activitiy boxes for channels here
+List activitiy boxes for channels below:
 {{#each channels}}
   {{view Kandan.ListChannelActivitiesView channelBinding="this"}}
 {{/each}}
diff --git a/app/assets/javascripts/ember/templates/activities/show.handlebars b/app/assets/javascripts/ember/templates/activities/show.handlebars
@@ -1 +1 @@
-USER:{{activity.user.id}} {{activity.id}} - {{activity.content}}
+{{activity.user.first_name}}: {{activity.content}}
diff --git a/app/assets/javascripts/ember/views/activities/list_activities.js.coffee b/app/assets/javascripts/ember/views/activities/list_activities.js.coffee
@@ -1,4 +1,5 @@
 Kandan.ListActivitiesView = Ember.View.extend({
   templateName: 'ember/templates/activities/list_activities'
   channelsBinding: 'Kandan.ChannelsController'
+  activitiesBinding: 'Kandan.ActivitiesController'
 })
diff --git a/app/assets/javascripts/ember/views/activities/list_channel_activities.js.coffee b/app/assets/javascripts/ember/views/activities/list_channel_activities.js.coffee
@@ -1,7 +1,2 @@
-Kandan.ListChannelActivitiesView = Ember.View.extend({
-  templateName: 'ember/templates/activities/list_channel_activities'
-  channelBinding: 'Kandan.ChannelsController'
-  activitiesBinding: 'Kandan.ActivitiesController'
-  # userBinding: 'Kandan.UsersController'
-
-})
+Kandan.ListChannelActivitiesView = Ember.View.extend
+  templateName: 'ember/templates/activities/list_channel_activities'
diff --git a/app/assets/javascripts/ember/views/channels/list.js.coffee b/app/assets/javascripts/ember/views/channels/list.js.coffee
@@ -1,7 +1,6 @@
-Kandan.ListChannelsView = Ember.View.extend({
+Kandan.ListChannelsView = Ember.View.extend
   templateName: 'ember/templates/channels/list'
   channelsBinding: 'Kandan.ChannelsController'
 
   refreshList: ()->
     Kandan.ChannelsController.findAll()
-})
diff --git a/app/assets/javascripts/init.js.coffee b/app/assets/javascripts/init.js.coffee
@@ -0,0 +1,2 @@
+$ ->
+  $(".channels").tabs()
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
@@ -10,12 +10,14 @@
   </script>
 
   <%= javascript_tag do %>
-    $(function() {
+    $(function()
+    {
       var channels_json = <%= @channels.to_json(
-                            :include => {
-                              :activities => {
-                                :include=>:user
-                              }}).html_safe %>
+                                :include => {
+                                  :activities => {
+                                    :include=>:user
+                                  }
+                                }).html_safe %>
       Kandan.ChannelsController.loadAll(channels_json);
     });
   <%- end %>