diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 42d3ef34..cd638588 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -56,7 +56,7 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null, sliding1 = true; if (userid != null) { $('.footer .menu').animate({ - height: '252px' + height: '272px' }, 300, function() { sliding1 = false; }); diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c0adfec1..73a15553 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -24,8 +24,11 @@ class UsersController < ApplicationController # GET /user def show @user = User.find(params[:id]) + @topics = @user.topics.order("created_at").limit(3) + @synapses = @user.synapses.order("created_at").limit(3) + @maps = @user.maps.order("created_at").limit(3) - respond_with(@user) + respond_with(@user, @topics, @synapses, @maps) end # POST /user diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6ba778a6..a6f9dc2e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -46,6 +46,7 @@
<%= map.desc %>
# of Topics: <%= map.topics.count %>
# of Synapses: <%= map.synapses.count %>
Map
+ <%= image_tag 'map.png', :class => 'icon', :size => '50x50' %> + + <%=map.name %> + + + + + +<%= map.topics.count %> topics and <%= map.synapses.count %> synapses
+<%= map.desc %>
+Permissions:<%= map.permission %>