From f5b93fa7579a0bfa2b744691ba70c7d415e856df Mon Sep 17 00:00:00 2001 From: Will Bradley Date: Tue, 13 Dec 2011 22:49:09 -0700 Subject: [PATCH] DRYed layout, created print css, restricted deleting --- app/controllers/contracts_controller.rb | 7 +++--- app/views/contracts/show.html.erb | 7 +++--- ...emplates.html.erb => application.html.erb} | 3 ++- app/views/layouts/contracts.html.erb | 23 ------------------- app/views/layouts/signers.html.erb | 23 ------------------- public/stylesheets/print.css | 3 +++ 6 files changed, 13 insertions(+), 53 deletions(-) rename app/views/layouts/{contract_templates.html.erb => application.html.erb} (88%) delete mode 100644 app/views/layouts/contracts.html.erb delete mode 100644 app/views/layouts/signers.html.erb create mode 100644 public/stylesheets/print.css diff --git a/app/controllers/contracts_controller.rb b/app/controllers/contracts_controller.rb index cac1619..5e5124e 100644 --- a/app/controllers/contracts_controller.rb +++ b/app/controllers/contracts_controller.rb @@ -35,6 +35,7 @@ class ContractsController < ApplicationController # GET /contracts/1/edit def edit @contract = Contract.find(params[:id]) + redirect_to(@contract, :notice => 'Contracts cannot be edited.') end # POST /contracts @@ -80,11 +81,11 @@ class ContractsController < ApplicationController # DELETE /contracts/1.xml def destroy @contract = Contract.find(params[:id]) - @contract.destroy + #@contract.destroy respond_to do |format| - format.html { redirect_to(contracts_url) } - format.xml { head :ok } + format.html { redirect_to(@contract, :notice => 'Contracts cannot be deleted.') } + format.xml { render :xml => @contract.errors, :status => :unprocessable_entity } end end end diff --git a/app/views/contracts/show.html.erb b/app/views/contracts/show.html.erb index 1ecdb5d..54c5f44 100644 --- a/app/views/contracts/show.html.erb +++ b/app/views/contracts/show.html.erb @@ -1,11 +1,11 @@

- First Name: + Name: <%= @contract.signer.first_name %> <%= @contract.signer.last_name %>

Minor: - <%= @contract.signer.cosigner %> + <%= if @contract.signer.cosigner.blank? then "n/a" else @contract.signer.cosigner end %>

@@ -26,6 +26,7 @@ Verification: <%=Digest::SHA1.hexdigest @contract.boilerplate+@contract.signature+@contract.datesigned.to_s%>

- +
<%= link_to 'Edit', edit_contract_path(@contract) %> | <%= link_to 'Back', contracts_path %> +
diff --git a/app/views/layouts/contract_templates.html.erb b/app/views/layouts/application.html.erb similarity index 88% rename from app/views/layouts/contract_templates.html.erb rename to app/views/layouts/application.html.erb index 1caf1ad..5fd3977 100644 --- a/app/views/layouts/contract_templates.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,9 +6,10 @@ <%= controller.controller_name.capitalize %>: <%= controller.action_name %> <%= stylesheet_link_tag 'scaffold', :media => "all" %> + <%= stylesheet_link_tag 'print', :media => "print" %> -
+
Quicksign Signers Contracts diff --git a/app/views/layouts/contracts.html.erb b/app/views/layouts/contracts.html.erb deleted file mode 100644 index 1caf1ad..0000000 --- a/app/views/layouts/contracts.html.erb +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - <%= controller.controller_name.capitalize %>: <%= controller.action_name %> - <%= stylesheet_link_tag 'scaffold', :media => "all" %> - - - - -

<%= notice %>

- -<%= yield %> - - - diff --git a/app/views/layouts/signers.html.erb b/app/views/layouts/signers.html.erb deleted file mode 100644 index 4422210..0000000 --- a/app/views/layouts/signers.html.erb +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Signers: <%= controller.action_name %> - <%= stylesheet_link_tag 'scaffold', :media => "all" %> - - - - -

<%= notice %>

- -<%= yield %> - - - diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css new file mode 100644 index 0000000..31bc9d8 --- /dev/null +++ b/public/stylesheets/print.css @@ -0,0 +1,3 @@ +.noprint { + display: none; +}