From 7be6ee3d690245de6da9ca91620400a7a5fd02b4 Mon Sep 17 00:00:00 2001 From: Skud Date: Wed, 27 Mar 2013 23:53:54 +1100 Subject: [PATCH] a few small tweaks to email notification views --- app/views/devise/registrations/edit.html.haml | 4 +-- app/views/notifier/notify.html.haml | 5 +++- db/schema.rb | 25 ++++++++++++++----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml index d4ed8bb52..e87a814fc 100644 --- a/app/views/devise/registrations/edit.html.haml +++ b/app/views/devise/registrations/edit.html.haml @@ -9,12 +9,12 @@ = f.label :email, :class => 'control-label' .controls = f.email_field :email - %span.help-inline If you change your email address you will have to reconfirm + %span.help-inline If you change your email address you will have to reconfirm. .control-group .controls = f.check_box :send_notification_email - Send email whenever you receive a notification in your Inbox + Receive emailed copies of Inbox notifications. %h2 Profile details diff --git a/app/views/notifier/notify.html.haml b/app/views/notifier/notify.html.haml index 3afcc20fa..1c4c044d2 100644 --- a/app/views/notifier/notify.html.haml +++ b/app/views/notifier/notify.html.haml @@ -13,7 +13,10 @@ :markdown #{strip_tags @notification.body} -%p= link_to "View this message in your inbox", url_for(@notification) +%p + = link_to "View this message in your inbox", url_for(@notification) + %br/ + = link_to "Turn off these notifications", edit_member_registration_url %p The #{site_name} team. diff --git a/db/schema.rb b/db/schema.rb index ee8cd192a..4b23284c5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -45,7 +45,7 @@ ActiveRecord::Schema.define(:version => 20130327120024) do create_table "gardens", :force => true do |t| t.string "name", :null => false - t.integer "owner_id", :null => false + t.integer "owner_id" t.string "slug", :null => false t.datetime "created_at", :null => false t.datetime "updated_at", :null => false @@ -82,6 +82,11 @@ ActiveRecord::Schema.define(:version => 20130327120024) do t.string "location" t.float "latitude" t.float "longitude" + t.text "about_me" + t.string "full_name" + t.string "gardening_since" + t.string "wish_i_could_grow" + t.string "gardening_clothes" t.boolean "send_notification_email", :default => true end @@ -98,14 +103,22 @@ ActiveRecord::Schema.define(:version => 20130327120024) do create_table "notifications", :force => true do |t| t.integer "sender_id" - t.integer "recipient_id", :null => false + t.integer "recipient_id", :null => false t.string "subject" t.text "body" - t.boolean "read", :default => false - t.integer "notification_type" + t.boolean "read", :default => false t.integer "post_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "payments", :force => true do |t| + t.integer "payer_id" + t.decimal "amount" + t.date "paid_period_begins" + t.date "paid_period_ends" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "plantings", :force => true do |t|