Merge branch 'master' of github.com:fredwu/angel_nest

app/assets/stylesheets/style.css.scss

@@ -202,7 +202,7 @@ form {
   }
 
   .input {
-    margin-bottom: 10px;
+    margin-bottom: $viewport_padding;
   }
 
   input.string,
@@ -635,6 +635,19 @@ form.multistage {
   }
 }
 
+form.read_only {
+  input.string, input.numeric, textarea {
+    border: none;
+    background: none;
+    resize: none;
+  }
+
+  .attribute {
+    display: table;
+    margin-bottom: $viewport_padding;
+  }
+}
+
 /* ------------------------------
   footer
 ------------------------------ */

app/controllers/application_controller.rb

@@ -5,8 +5,9 @@ class ApplicationController < ActionController::Base
 
   layout proc { |controller| controller.request.xhr? ? nil : 'application' }
 
-  before_filter :require_login,    :unless => :devise_controller?
-  before_filter :ensure_ownership, :unless => :devise_controller?, :except => [:index, :show]
+  before_filter :require_login,            :unless => :devise_controller?
+  before_filter :ensure_ownership,         :unless => :devise_controller?, :except => [:index, :show]
+  after_filter  :record_last_visited_page, :unless => :devise_controller?, :if => Proc.new { request.get? && !request.xhr? }
 
   protected
 
@@ -24,6 +25,10 @@ def ensure_ownership
     end
   end
 
+  def record_last_visited_page
+    session[:user_return_to] = request.path
+  end
+
   def deny_access
     render :text => t('system.access_denied'), :status => 403
   end

app/controllers/users_controller.rb

@@ -21,7 +21,9 @@ def show
   end
 
   def message_inboxes
-    @messages = case params[:type].try(:to_sym)
+    message_type = params[:type].try(:to_sym)
+
+    @messages = case message_type
       when :inbox_messages     then current_user.inbox_messages
       when :sent_messages      then current_user.sent_messages
       when :archived_messages  then current_user.archived_messages
@@ -30,6 +32,11 @@ def message_inboxes
       when :archived_proposals then current_user.archived_proposals
       else redirect_to my_message_inbox_path(:inbox_messages)
     end
+
+    case message_type
+      when /_messages/  then render 'message_inboxes'
+      when /_proposals/ then render 'proposal_inboxes'
+    end
   end
 
   def add_micro_post

app/models/user.rb

@@ -83,6 +83,14 @@ def archived_proposals
     incoming_messages.with_proposal.archived
   end
 
+  def has_new_messages?
+    inbox_messages.unread.any?
+  end
+
+  def has_new_proposals?
+    inbox_proposals.unread.any?
+  end
+
   def is_admin?
     !!is_admin
   end
@@ -103,10 +111,6 @@ def avatar(size = 80)
     "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email)}?s=#{size}"
   end
 
-  def has_new_messages?
-    incoming_messages.unread.any?
-  end
-
   def send_private_message(target_user, content, extras = {})
     messages.create!({
       :content     => content,
@@ -221,9 +225,3 @@ def email_nomarlisation
     self.email = email.strip.downcase
   end
 end
-
-class Array
-  def for_auto_suggest
-    map { |r| { :id => r.id, :name => r.name } }
-  end
-end

app/views/layouts/application.html.slim

@@ -25,6 +25,7 @@ body
       h1= link_to t('site.name'), root_path
       nav
         ul
+          li= link_to_current t('label.home'), root_path
           li= link_to_current t('label.startups'), startups_path
           li= link_to_current t('label.entrepreneurs'), entrepreneurs_path
           li= link_to_current t('label.investors'), investors_path

app/views/layouts/userbars/_topnav.html.slim

@@ -4,9 +4,14 @@ h3
   | ! (
   = link_to t('label.edit'), edit_registration_path(current_user)
   ' ) |
+  - if current_user.has_new_proposals?
+    = link_to "#{pluralize(current_user.inbox_proposals.unread.count, t('label.new_proposal'))}!", my_message_inbox_path(:inbox_proposals), :class => 'new'
+  - else
+    = link_to t('label.proposals_inbox'), my_message_inbox_path(:inbox_proposals)
+  '  |
   - if current_user.has_new_messages?
     = link_to "#{pluralize(current_user.inbox_messages.unread.count, t('label.new_message'))}!", my_message_inbox_path(:inbox_messages), :class => 'new'
   - else
-    = link_to "#{t('label.messages')} (#{current_user.inbox_messages.count})", my_message_inbox_path(:inbox_messages)
+    = link_to t('label.messages_inbox'), my_message_inbox_path(:inbox_messages)
   '  |
   = link_to t('label.sign_out'), destroy_user_session_path

app/views/messages/show_private_message.html.slim

@@ -1,10 +1,16 @@
 .grid_3
-  = render 'users/message_inboxes'
+  - if @topic.is_with_proposal?
+    = render 'users/proposal_inboxes'
+  - else
+    = render 'users/message_inboxes'
 .grid_9
   - if @topic.is_with_proposal?
-    hr
     h1= t('label.business_proposal')
-    .read_only= render 'proposals/form', :resource => @topic.proposal, :submit_path => '/'
+    ul
+      li= "#{t('label.submitted_by')}: #{link_to @topic.user.name, user_path(@topic.user)} (#{link_to @topic.proposal.startup.name, startup_path(@topic.proposal.startup)})".html_safe
+      li= "#{t('label.submitted_to')}: #{link_to @topic.target.name, user_path(@topic.target)}".html_safe
+    hr
+    .read_only= render 'proposals/read_only', :resource => @topic.proposal
 
   h2= t('label.comments')
   ul#messages

app/views/proposals/_form.html.slim

@@ -1,27 +1,29 @@
 ul#proposal_section_selector.multistage_selector
-  li= link_to t('label.investors'), '#investors'
+  - unless meta[:hide_investors]
+    li= link_to t('label.investors'), '#investors'
   li= link_to t('label.product'), '#product'
   li= link_to t('label.market'), '#market'
   li= link_to t('label.competition'), '#competition'
   li= link_to t('label.investment'), '#investment', :class => 'last'
   .clear
 
 = simple_form_for resource, :url => submit_path, :validate => true, :html => { :class => 'multistage' } do |f|
-  fieldset#investors
-    legend= t('label.investors')
-    .multi_add.input.string data-target="investors" data-start_text="#{t('text.enter_investor_names')}" data-selection_limit="#{Settings.recipient_limit.proposals}"
-      = label_tag :investors, t('label.investors')
-      = text_field_tag :investors, resource.investors.map(&:id).join(','), :class => 'string required', :'data-source' => resource.investors.for_auto_suggest.to_json
-    .grouped_buttons
-      = submit_tag t('label.next'), :class => 'navigation next'
+  - unless meta[:hide_investors]
+    fieldset#investors
+      legend= t('label.investors')
+      .multi_add.input.string data-target="investors" data-start_text="#{t('text.enter_investor_names')}" data-selection_limit="#{Settings.recipient_limit.proposals}"
+        = label_tag :investors, t('label.investors')
+        = text_field_tag :investors, resource.investors.map(&:id).join(','), :class => 'string required', :'data-source' => resource.investors.for_auto_suggest.to_json
+      .grouped_buttons
+        = submit_tag t('label.next'), :class => 'navigation next'
   fieldset#product
     legend= t('label.product')
     = f.input :new_business_model
     = f.input :new_product
     = f.input :pitch
     = f.input :introduction
     .grouped_buttons
-      = submit_tag t('label.prev'), :class => 'navigation prev'
+      = submit_tag t('label.prev'), :class => 'navigation prev' unless meta[:hide_investors]
       = submit_tag t('label.next'), :class => 'navigation next'
   fieldset#market
     legend= t('label.market')

app/views/proposals/_read_only.html.slim

@@ -0,0 +1,69 @@
+ul#proposal_section_selector.multistage_selector
+  li= link_to t('label.product'), '#product'
+  li= link_to t('label.market'), '#market'
+  li= link_to t('label.competition'), '#competition'
+  li= link_to t('label.investment'), '#investment', :class => 'last'
+  .clear
+
+= simple_form_for resource, :url => '/', :html => { :class => 'multistage read_only' } do |f|
+  fieldset#product
+    legend= t('label.product')
+    = f.input :new_business_model if resource.new_business_model
+    = f.input :new_product if resource.new_product
+    = f.label :pitch
+    .attribute= resource.pitch
+    = f.label :introduction
+    .attribute= resource.introduction
+    .grouped_buttons
+      = submit_tag t('label.next'), :class => 'navigation next'
+  fieldset#market
+    legend= t('label.market')
+    h2= t('label.one_year_market')
+    = f.label :one_year_target_audience
+    .attribute= resource.one_year_target_audience
+    = f.input :one_year_per_capita_annual_spending
+    = f.input :one_year_number_of_users
+    = f.input :one_year_market_cap
+    = f.input :one_year_penetration_rate
+    = f.label :one_year_marketing_strategy
+    .attribute= resource.one_year_marketing_strategy
+    = f.input :one_year_gross_profit_margin
+    br
+    h2= t('label.five_year_market')
+    = f.label :five_year_target_audience
+    .attribute= resource.five_year_target_audience
+    = f.input :five_year_per_capita_annual_spending
+    = f.input :five_year_number_of_users
+    = f.input :five_year_market_cap
+    = f.input :five_year_penetration_rate
+    = f.label :five_year_marketing_strategy
+    .attribute= resource.five_year_marketing_strategy
+    = f.input :five_year_gross_profit_margin
+    .grouped_buttons
+      = submit_tag t('label.prev'), :class => 'navigation prev'
+      = submit_tag t('label.next'), :class => 'navigation next'
+  fieldset#competition
+    legend= t('label.competition')
+    = f.label :competitors_details
+    .attribute= resource.competitors_details
+    = f.label :competitive_edges
+    .attribute= resource.competitive_edges
+    = f.label :competing_strategy
+    .attribute= resource.competing_strategy
+    .grouped_buttons
+      = submit_tag t('label.prev'), :class => 'navigation prev'
+      = submit_tag t('label.next'), :class => 'navigation next'
+  fieldset#investment
+    legend= t('label.investment')
+    = f.input :investment_amount
+    = f.label :investment_currency
+    .attribute= resource.investment_currency
+    = f.input :equity_percentage
+    = f.label :spending_plan
+    .attribute= resource.spending_plan
+    = f.input :next_investment_round
+    .grouped_buttons
+      = submit_tag t('label.prev'), :class => 'navigation prev'
+      - unless resource.proposal_stage_identifier == 'submitted'
+        = submit_tag t('label.save_draft')
+        = submit_tag t('label.submit_proposal')

app/views/proposals/edit.html.slim

@@ -1 +1 @@
-= render 'form', :submit_path => startup_proposal_path(parent, resource)
+= render 'form', :submit_path => startup_proposal_path(parent, resource), :meta => {}

app/views/proposals/new.html.slim

@@ -1 +1 @@
-= render 'form', :submit_path => startup_proposals_path(parent)
+= render 'form', :submit_path => startup_proposals_path(parent), :meta => {}

app/views/users/_message_inboxes.html.slim

@@ -6,10 +6,3 @@ ul
  li= link_to_current t('label.inbox_messages'), my_message_inbox_path(:inbox_messages)
  li= link_to_current t('label.sent_messages') , my_message_inbox_path(:sent_messages)
  li= link_to_current t('label.archived_messages') , my_message_inbox_path(:archived_messages)
-
-hr
-h3= t('label.startup_proposals')
-ul
-  li= link_to_current t('label.inbox_proposals') , my_message_inbox_path(:inbox_proposals)
-  li= link_to_current t('label.sent_proposals') , my_message_inbox_path(:sent_proposals)
-  li= link_to_current t('label.archived_proposals') , my_message_inbox_path(:archived_proposals)

app/views/users/_proposal_inboxes.html.slim

@@ -0,0 +1,8 @@
+= render 'users/mini_profile', :user => current_user, :meta => {}
+
+hr
+h3= t('label.startup_proposals')
+ul
+  li= link_to_current t('label.inbox_proposals') , my_message_inbox_path(:inbox_proposals)
+  li= link_to_current t('label.sent_proposals') , my_message_inbox_path(:sent_proposals)
+  li= link_to_current t('label.archived_proposals') , my_message_inbox_path(:archived_proposals)

app/views/users/message_inboxes.html.slim

@@ -1,4 +1,4 @@
 .grid_3
-  = render 'message_inboxes'
+  = render 'users/message_inboxes'
 .grid_9
   = render 'messages/index', :collection => @messages, :meta => { :linkable => true, :new_message? => true }

app/views/users/proposal_inboxes.html.slim

@@ -0,0 +1,4 @@
+.grid_3
+  = render 'users/proposal_inboxes'
+.grid_9
+  = render 'messages/index', :collection => @messages, :meta => { :linkable => true }

config/application.rb

@@ -56,3 +56,6 @@ class Application < Rails::Application
     end
   end
 end
+
+require Rails.root + 'lib/monkey_patches/array'
+require Rails.root + 'lib/monkey_patches/warden'

config/locales/en.yml

@@ -55,6 +55,7 @@ en:
     time_ago: '%{time} ago'
     time_ago_by: '%{time} ago by'
   label:
+    home: Home
     loading: Loading
     create: Create
     update: Update
@@ -85,6 +86,8 @@ en:
     resend_unlock_instructions: Resend unlock instructions
     edit_my_profile: Edit my profile
     startup: Startup
+    submitted_by: Submitted by
+    submitted_to: Submitted to
     startups: Startups
     investor: Investor
     investors: Investors
@@ -123,6 +126,7 @@ en:
     five_year_market: Market in Five Years
     messages: Messages
     new_message: New message
+    new_proposal: New Proposal
     private_messages: Private messages
     inbox: Inbox
     inbox_messages: Inbox messages
@@ -132,6 +136,8 @@ en:
     sent_proposals: Sent proposals
     archived_proposals: Archived proposals
     recipients: Recipients
+    messages_inbox: Messages inbox
+    proposals_inbox: Proposals inbox
   message:
     proposal_saved: The proposal has been saved!
     proposal_submitted: The proposal has been submitted to the investors!

lib/monkey_patches/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def for_auto_suggest
+    map { |r| { :id => r.id, :name => r.name } }
+  end
+end

lib/monkey_patches/warden.rb

@@ -0,0 +1,6 @@
+module Warden::Mixins::Common
+  # overwrites session reset so that we could keep things like 'last_visited_page'
+  def reset_session!
+    nil
+  end
+end

spec/controllers/users_controller_spec.rb

@@ -32,11 +32,11 @@
       it "shows inbox messages by default" do
         get :message_inboxes
 
-        assigns(:messages).should == current_user.inbox_messages
+        response.should redirect_to(my_message_inbox_path(:inbox_messages))
       end
 
       it "shows inbox messages" do
-        get :message_inboxes, :type => :inbox
+        get :message_inboxes, :type => :inbox_messages
 
         assigns(:messages).should == current_user.inbox_messages
       end

spec/models/message_spec.rb

@@ -57,6 +57,7 @@
         subject.send_private_message(user, 'hey there!')
 
         user.has_new_messages?.should == true
+        user.has_new_proposals?.should == false
       end
 
       context "private messages" do

spec/models/proposal_spec.rb

@@ -60,6 +60,7 @@
       startup.proposals.draft.count.should == 0
       startup.proposals.submitted.count.should == 1
       startup.founder.sent_proposals.count.should == 1
+      investor1.has_new_proposals?.should == true
       investor1.proposals.count.should == 1
       investor1.inbox_proposals.count.should == 1
       startup.proposals.first.proposal_stage_identifier.should == 'submitted'