From e1fb72c2dfff5d14f9f3db9d81792e03755f3531 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Tue, 12 Aug 2014 11:09:53 -0400 Subject: [PATCH] fixed user model and map models up --- .../javascripts/metamaps/Metamaps.Backbone.js | 10 +++++----- .../javascripts/metamaps/Metamaps.GlobalUI.js | 4 ---- app/assets/stylesheets/application.css | 7 +------ app/models/map.rb | 16 ++++++++++++++++ app/models/user.rb | 7 +++++++ app/views/layouts/_account.html.erb | 7 ++++--- app/views/users/edit.html.erb | 4 +++- app/views/users/passwords/edit.html.erb | 5 ++--- app/views/users/passwords/new.html.erb | 4 ++-- app/views/users/registrations/new.html.erb | 7 +++---- app/views/users/sessions/new.html.erb | 10 +++++----- public/famous/main.js | 10 ++++++---- 12 files changed, 54 insertions(+), 37 deletions(-) diff --git a/app/assets/javascripts/metamaps/Metamaps.Backbone.js b/app/assets/javascripts/metamaps/Metamaps.Backbone.js index 61921ffb..f322ef9f 100644 --- a/app/assets/javascripts/metamaps/Metamaps.Backbone.js +++ b/app/assets/javascripts/metamaps/Metamaps.Backbone.js @@ -1,7 +1,7 @@ Metamaps.Backbone = {}; Metamaps.Backbone.Map = Backbone.Model.extend({ urlRoot: '/maps', - blacklist: ['created_at', 'updated_at', 'topics', 'synapses', 'mappings', 'mappers'], + blacklist: ['created_at', 'updated_at', 'user_name', 'topic_count', 'synapse_count', 'topics', 'synapses', 'mappings', 'mappers'], toJSON: function (options) { return _.omit(this.attributes, this.blacklist); }, @@ -57,11 +57,11 @@ Metamaps.Backbone.Map = Backbone.Model.extend({ id: this.id, name: this.get('name'), desc: this.get('desc'), - username: this.getUser().get('name'), - mkPermission: this.get("permission") ? this.get("permission").substring(0, 2) : "commons", + username: this.get('user_name'), + mkPermission: this.get("permission") ? this.get("permission").substring(0, 2) : "co", editPermission: this.authorizeToEdit(Metamaps.Active.Mapper) ? 'canEdit' : 'cannotEdit', - topicCount: this.getTopics().length, - synapseCount: this.getSynapses().length, + topicCount: this.get('topic_count'), + synapseCount: this.get('synapse_count'), createdAt: this.get('created_at') }; return obj; diff --git a/app/assets/javascripts/metamaps/Metamaps.GlobalUI.js b/app/assets/javascripts/metamaps/Metamaps.GlobalUI.js index 4ecec60b..dccd5b29 100644 --- a/app/assets/javascripts/metamaps/Metamaps.GlobalUI.js +++ b/app/assets/javascripts/metamaps/Metamaps.GlobalUI.js @@ -75,10 +75,6 @@ Metamaps.GlobalUI = { }); $('#lightbox_screen, #lightbox_close').click(self.closeLightbox); - - // hide notices after 10 seconds - $('.notice.metamaps').delay(10000).fadeOut('fast'); - $('.alert.metamaps').delay(10000).fadeOut('fast'); // initialize global backbone models and collections if (Metamaps.Active.Mapper) Metamaps.Active.Mapper = new Metamaps.Backbone.Mapper(Metamaps.Active.Mapper); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 148c20c2..6a8411ce 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -201,15 +201,10 @@ input[type="submit"]:hover { .forgotPassword { display: block; width: 250px; - position: absolute; - left: 50%; - top: 0; - margin: 100px 0 0 -145px; - background: url(bg.png); + background-color: #E0E0E0; padding: 20px; border-radius: 5px; color: black; - border: 1px solid #000; box-shadow: 6px 6px 8px rgba(0, 0, 0, 0.4); } .centerGreyForm input[type="text"], diff --git a/app/models/map.rb b/app/models/map.rb index abac522f..2bfcd663 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -32,6 +32,22 @@ end return contributors end + + def topic_count + self.topics.length + end + + def synapse_count + self.synapses.length + end + + def user_name + self.user.name + end + + def as_json(options={}) + super(:methods =>[:user_name, :topic_count, :synapse_count]) + end ##### PERMISSIONS ###### diff --git a/app/models/user.rb b/app/models/user.rb index b5921fa2..c5bb0969 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -38,6 +38,13 @@ has_many :mappings trans << '( +clone -flop ) -compose multiply -composite ' trans << ') -alpha off -compose copy_opacity -composite ' end + + def as_json(options={}) + { :name =>self.name, + :email => self.email, + :image => self.image.url + } + end if ActiveRecord::Base.connection.table_exists? 'users' codes = ActiveRecord::Base.connection.execute("SELECT code FROM users").map {|user| user["code"] } diff --git a/app/views/layouts/_account.html.erb b/app/views/layouts/_account.html.erb index d4912682..c44f0a78 100644 --- a/app/views/layouts/_account.html.erb +++ b/app/views/layouts/_account.html.erb @@ -5,7 +5,7 @@ <% if authenticated? %> <% account = current_user %> -

Hello <%= account.name.split[0...1][0] %>!

+

<%= account.name.split[0...1][0] %>