From 86013c678b91e69c48a9c32eda4d5103cf1d5884 Mon Sep 17 00:00:00 2001 From: rmaratos Date: Thu, 27 Apr 2017 11:32:33 -0400 Subject: [PATCH] Update tracker with the official spacing of 'AB Tech' --- .../admin_mailer/cleanup_backups.text.erb | 2 +- .../accept.html.erb | 2 +- .../accept.text.erb | 2 +- .../apply.html.erb | 2 +- .../apply.text.erb | 2 +- app/views/invoices/_form.html.erb | 14 ++-- .../invoices/_prettyView_footer.html.erb | 76 +++++++++---------- app/views/layouts/iphone.html.erb | 10 +-- app/views/member_mailer/comment.html.erb | 2 +- app/views/member_mailer/comment.text.erb | 2 +- app/views/members/index.html.erb | 4 +- lib/tasks/newmember.rake | 2 +- 12 files changed, 60 insertions(+), 60 deletions(-) diff --git a/app/views/admin_mailer/cleanup_backups.text.erb b/app/views/admin_mailer/cleanup_backups.text.erb index f53f19bf..fb601dd0 100644 --- a/app/views/admin_mailer/cleanup_backups.text.erb +++ b/app/views/admin_mailer/cleanup_backups.text.erb @@ -1,3 +1,3 @@ This is a quarterly reminder to clean out the tracker database backups folder on AFS. ---Automated Email from ABTech Tracker, do not respond \ No newline at end of file +--Automated Email from AB Tech Tracker, do not respond diff --git a/app/views/event_role_application_mailer/accept.html.erb b/app/views/event_role_application_mailer/accept.html.erb index b0761371..3a851c29 100644 --- a/app/views/event_role_application_mailer/accept.html.erb +++ b/app/views/event_role_application_mailer/accept.html.erb @@ -2,4 +2,4 @@

Your application for the role of <%= link_to @application.event_role.description, @application.event_role.event %> <%= @application.event_role.role %> has been accepted.

-

--ABTT (ABTech Tracker)

+

--ABTT (AB Tech Tracker)

diff --git a/app/views/event_role_application_mailer/accept.text.erb b/app/views/event_role_application_mailer/accept.text.erb index 71545079..b13b9c83 100644 --- a/app/views/event_role_application_mailer/accept.text.erb +++ b/app/views/event_role_application_mailer/accept.text.erb @@ -2,4 +2,4 @@ Your application for the role of <%= @application.event_role.description %> <%= @application.event_role.role %> has been accepted. ---ABTT (ABTech Tracker) +--ABTT (AB Tech Tracker) diff --git a/app/views/event_role_application_mailer/apply.html.erb b/app/views/event_role_application_mailer/apply.html.erb index a7ff2d23..4725748d 100644 --- a/app/views/event_role_application_mailer/apply.html.erb +++ b/app/views/event_role_application_mailer/apply.html.erb @@ -7,4 +7,4 @@

You can <%= link_to "accept", application_confirm_url(@application.event_role.event, @application) %> or <%= link_to "deny", application_deny_url(@application.event_role.event, @application) %> this application.

-

--ABTT (ABTech Tracker)

+

--ABTT (AB Tech Tracker)

diff --git a/app/views/event_role_application_mailer/apply.text.erb b/app/views/event_role_application_mailer/apply.text.erb index 0e5ee71d..30046395 100644 --- a/app/views/event_role_application_mailer/apply.text.erb +++ b/app/views/event_role_application_mailer/apply.text.erb @@ -8,4 +8,4 @@ Notes: You can accept (<%= application_confirm_url(@application.event_role.event, @application) %>) or deny (<%= application_deny_url(@application.event_role.event, @application) %>) this application. ---ABTT (ABTech Tracker) +--ABTT (AB Tech Tracker) diff --git a/app/views/invoices/_form.html.erb b/app/views/invoices/_form.html.erb index eb10d717..d4856d30 100644 --- a/app/views/invoices/_form.html.erb +++ b/app/views/invoices/_form.html.erb @@ -15,7 +15,7 @@ <%= f.label :memo, "Memo" %>: <%= f.text_field :memo, size: 35 %> - + <%= f.label :event_id, "Event" %>: <% if not f.object.event.nil? and f.object.event.representative_date < Account.magic_date %> @@ -24,7 +24,7 @@ <%= f.select :event_id, options_from_collection_for_select(Event.current_year.order("title ASC"), "id", "title", f.object.event_id) %> <% end %> - + <%= f.label :status, "Status" %>: <% if can? :status, f.object %> @@ -35,12 +35,12 @@ <%= f.object.status %> <% end %> - + <%= f.label :payment_type, "Payment Type" %>: <%= f.select :payment_type, Invoice::Payment_Types %> - + <% if f.object.payment_type == "Oracle" %> <% else %> @@ -53,7 +53,7 @@

> - Each item must have the current condition of the item listed in its description (click the arrow next to the memo box to access the description box) as well as the item's replacement cost (the amount of reimbursement ABTech would require if the borrower of the equipment were to damage it). + Each item must have the current condition of the item listed in its description (click the arrow next to the memo box to access the description box) as well as the item's replacement cost (the amount of reimbursement AB Tech would require if the borrower of the equipment were to damage it).

@@ -66,11 +66,11 @@ Quantity - + <%= f.fields_for :invoice_lines, @invoice.invoice_lines.sort do |builder| %> <%= render :partial => 'invoice_line_fields', :locals => {:f => builder} %> <% end %> - + <%= link_to_add_fields "Add another line", f, :invoice_lines, "2", "invoices" %> diff --git a/app/views/invoices/_prettyView_footer.html.erb b/app/views/invoices/_prettyView_footer.html.erb index 02ab5cf8..f783f3c7 100644 --- a/app/views/invoices/_prettyView_footer.html.erb +++ b/app/views/invoices/_prettyView_footer.html.erb @@ -33,7 +33,7 @@ Event Contact:<%= @invoice.event.contact_name %> Organization:<%= @invoice.event.organization.name %> Bill to Account: - <%= if @invoice.payment_type == "Oracle" and not @no_show_oracle then + <%= if @invoice.payment_type == "Oracle" and not @no_show_oracle then @invoice.oracle_string else @invoice.event.organization.name @@ -90,7 +90,7 @@

Thank you,
Head of Tech
- AB Tech + AB Tech

<% elsif @invoice.status == "Contract" then %>

@@ -101,49 +101,49 @@

  1. For purposes of this Contract:
      -
    1. "Rental equipment" shall refer to any equipment rented by ABTech on behalf of the Purchaser for use at the above-cited Event. -
    2. "Extended rentals" shall refer to rental of ABTech equipment to Purchaser for periods of time where no ABTech crewmember will supervise the use of ABTech equipment by Purchaser. +
    3. "Rental equipment" shall refer to any equipment rented by AB Tech on behalf of the Purchaser for use at the above-cited Event. +
    4. "Extended rentals" shall refer to rental of AB Tech equipment to Purchaser for periods of time where no AB Tech crewmember will supervise the use of AB Tech equipment by Purchaser.
    -
  2. While the quoted price is presented in good faith, ABTech reserves the right to modify this quote to reflect any unexpected costs that may arise due to changes or miscommunications in required services, changes in prices of listed rental equipment, costs of emergency rental equipment, or supplemental fees (such as late or cancellation fees). ABTech is responsible only for performing the services listed above. +
  3. While the quoted price is presented in good faith, AB Tech reserves the right to modify this quote to reflect any unexpected costs that may arise due to changes or miscommunications in required services, changes in prices of listed rental equipment, costs of emergency rental equipment, or supplemental fees (such as late or cancellation fees). AB Tech is responsible only for performing the services listed above.
  4. Purchaser will receive a Final Cost Statement within a reasonable time after completion of the event. Payment will be made within four weeks after receipt of the Final Cost Statement, or no less than one month before the end of the Fiscal Year, whichever is shorter.
      -
    1. Wherever possible, payment will be made via CMU Journal Entry from Purchaser's account to ABTech's. If this is not possible, payment shall be made via business check or money order.
      2. +
    2. Wherever possible, payment will be made via CMU Journal Entry from Purchaser's account to AB Tech's. If this is not possible, payment shall be made via business check or money order.
    -
  5. Should the event be cancelled for reasons other than Acts of God, the Purchaser must notify ABTech at least 48 hours prior to the event. +
  6. Should the event be cancelled for reasons other than Acts of God, the Purchaser must notify AB Tech at least 48 hours prior to the event.
      -
    1. Notifications within 48 hours, but prior to 24 hours, of the event will incur a fee of 20% of the list cost plus the rental costs of any equipment already rented. -
    2. For notifications under 24 hours, the Purchaser will be billed the full cost of the event. If the event is cancelled for any reason within 24 hours of the event, the Purchaser will be billed for the cost of rental equipment. +
    3. Notifications within 48 hours, but prior to 24 hours, of the event will incur a fee of 20% of the list cost plus the rental costs of any equipment already rented. +
    4. For notifications under 24 hours, the Purchaser will be billed the full cost of the event. If the event is cancelled for any reason within 24 hours of the event, the Purchaser will be billed for the cost of rental equipment.
    5. Cancellation due to weather considerations shall not be considered Acts of God. The Purchaser is encouraged to have an appropriate rain venue for outdoor events.
    -
  7. ABTech reserves the sole and exclusive right to preside over all equipment and personnel, owned or responsible for, including rental equipment. -
  8. All equipment provided by ABTech remains the property of ABTech or, in the case of rental equipment, the renter. The Purchaser shall be liable for all damage to equipment provided by ABTech, including rental equipment. Possible damage includes, but is not limited to, damage caused by inadequate security, power, and protection from the weather. Purchaser shall not be liable for damage determined by ABTech to have been directly caused by crewmembers of ABTech. -
  9. Purchaser shall be liable to ABTech for the replacement cost of any equipment lost or stolen: +
  10. AB Tech reserves the sole and exclusive right to preside over all equipment and personnel, owned or responsible for, including rental equipment. +
  11. All equipment provided by AB Tech remains the property of AB Tech or, in the case of rental equipment, the renter. The Purchaser shall be liable for all damage to equipment provided by AB Tech, including rental equipment. Possible damage includes, but is not limited to, damage caused by inadequate security, power, and protection from the weather. Purchaser shall not be liable for damage determined by AB Tech to have been directly caused by crewmembers of AB Tech. +
  12. Purchaser shall be liable to AB Tech for the replacement cost of any equipment lost or stolen:
      -
    1. In the case of extended rentals to Purchaser, from the time the equipment is delivered to the Purchaser until it is returned to ABTech -
    2. For all other events, from the time the equipment is loaded into the venue until it is loaded out by ABTech -
    3. In the case of extended rentals, Purchaser shall return the equipment to ABTech at the designated place and time. Otherwise, the equipment will be considered stolen. +
    4. In the case of extended rentals to Purchaser, from the time the equipment is delivered to the Purchaser until it is returned to AB Tech +
    5. For all other events, from the time the equipment is loaded into the venue until it is loaded out by AB Tech +
    6. In the case of extended rentals, Purchaser shall return the equipment to AB Tech at the designated place and time. Otherwise, the equipment will be considered stolen.
  13. The Purchaser is required to do the following:
      -
    1. Obtain all necessary permits, licenses, and contracts required by law and/or venue and provide copies of those documents to ABTech. +
    2. Obtain all necessary permits, licenses, and contracts required by law and/or venue and provide copies of those documents to AB Tech.
    3. Secure access to the venue by the time listed for Set-up.
    4. Provide adequate security for the event. -
    5. Provide adequate security for all ABTech personnel and equipment during the time required for setup, run, and strike. +
    6. Provide adequate security for all AB Tech personnel and equipment during the time required for setup, run, and strike.
    -
  14. In the case of an extended rental of ABTech equipment, Purchaser agrees that they can and will safely and properly operate all components of the equipment. If, at any time, the Purchaser is unsure how to safely and properly operate the equipment, they shall contact ABTech and halt all use of the equipment until ABTech agrees to the continued use of the equipment. -
  15. ABTech will not perform the listed services, or may stop the performance, if there exists a fire or electrical hazard, or any other hazard in any of the venues determined by ABTech, police, maintenance, or safety officials to be dangerous to the audience, performers, or show personnel. ABTech shall comply with all instructions given it by University officials or police, including turning off all systems upon demand. No price alteration will be given in this case. -
  16. ABTech shall not be responsible for any items heretofore mentioned when prevented from doing so by an Act of God or any other legitimate conditions beyond the control of ABTech. -
  17. ABTech will provide enough manpower to perform the listed services, unless otherwise agreed upon. +
  18. In the case of an extended rental of AB Tech equipment, Purchaser agrees that they can and will safely and properly operate all components of the equipment. If, at any time, the Purchaser is unsure how to safely and properly operate the equipment, they shall contact AB Tech and halt all use of the equipment until AB Tech agrees to the continued use of the equipment. +
  19. AB Tech will not perform the listed services, or may stop the performance, if there exists a fire or electrical hazard, or any other hazard in any of the venues determined by AB Tech, police, maintenance, or safety officials to be dangerous to the audience, performers, or show personnel. AB Tech shall comply with all instructions given it by University officials or police, including turning off all systems upon demand. No price alteration will be given in this case. +
  20. AB Tech shall not be responsible for any items heretofore mentioned when prevented from doing so by an Act of God or any other legitimate conditions beyond the control of AB Tech. +
  21. AB Tech will provide enough manpower to perform the listed services, unless otherwise agreed upon.
  22. The Contact for the Purchaser, in signing this contract, warrants that they sign as an agent of the Purchaser. -
  23. The Representative of ABTech, in signing this contract, warrants that they sign as an agent of the Carnegie Mellon University Activities Board Technical Committee. The Representative assumes no personal responsibility for execution of this contract. +
  24. The Representative of AB Tech, in signing this contract, warrants that they sign as an agent of the Carnegie Mellon University Activities Board Technical Committee. The Representative assumes no personal responsibility for execution of this contract.
  25. All amendments to this contract must be initialed and dated by both parties in written form.
- + -
____________________________________________________________________
ABTechPurchaser
AB TechPurchaser
_____________________________________________________________________
Printed NamePrinted Name
+ <% elsif @invoice.status == "Loan Agreement" %>

@@ -151,37 +151,37 @@

Loan Agreement For AB Tech Equipment

- +

This agreement, made this <%= Time.new.day.ordinalize %> day of <%= Time.new.strftime("%B %Y") %> by and between AB Tech (the "Lender") and <%= @invoice.event.organization.name %> (the "Borrower").

- +

Witnesseth, that the items listed above are loaned to the Borrower at the above agreed cost by the Lender for the period beginning on the <%= @invoice.event.eventdates.first.startdate.day.ordinalize %> day of <%= @invoice.event.eventdates.first.startdate.strftime("%B %Y") %> to the <%= @invoice.event.eventdates.first.enddate.day.ordinalize %> day of <%= @invoice.event.eventdates.first.enddate.strftime("%B %Y") %>.

- +

Witnesseth, that the Borrower has suitable insurance or acceptable cash assets an amount equal to or greater than the replacement value of the items. Borrower shall indemnify and hold AB Tech harmless in the event the items are lost, stolen or destroyed in total or in part.

- +

Witnesseth, that the "replacement value" for each item rented is listed above. The "replacement value" is to be paid in full to the Lender in case of loss, theft or damage as determined in the sole judgement of the Lender. A suitable replacement if offered, will be accepted in the Lender's sole discretion in lieu of the "replacement value".

- +

In witness whereof, this agreement has been duly executed by the parties hereto.

- +

AB Tech

- +

Signature: ___________________________________

- +

Name: ___________________________________

- +

Title: ___________________________________

- +

Borrower

- +

Signature: ___________________________________

- +

Name: ___________________________________

- +

Title: ___________________________________

- +

Organization: ___________________________________

diff --git a/app/views/layouts/iphone.html.erb b/app/views/layouts/iphone.html.erb index 30c7660e..79c93100 100755 --- a/app/views/layouts/iphone.html.erb +++ b/app/views/layouts/iphone.html.erb @@ -10,7 +10,7 @@ <%# %> " /> - ABTech Tool + AB Tech Tool <% if ENV["RAILS_ENV"] != "production" %>
<%= ENV["RAILS_ENV"].upcase%> ENVIRONMENT
<% end %> - +
<%= image_tag("header.png", width: "95%") %>
<%= yield %> -
+
<%= link_to "Full Site", events_path %>
diff --git a/app/views/member_mailer/comment.html.erb b/app/views/member_mailer/comment.html.erb index 728d95c4..7fad17db 100644 --- a/app/views/member_mailer/comment.html.erb +++ b/app/views/member_mailer/comment.html.erb @@ -4,6 +4,6 @@
<%= auto_link simple_format @comment.content %>
-

--ABTT (ABTech Tracker)

+

--ABTT (AB Tech Tracker)

To unsubscribe from these emails, edit your profile on tracker and uncheck the "Receive emails for comments on events" checkbox.

diff --git a/app/views/member_mailer/comment.text.erb b/app/views/member_mailer/comment.text.erb index df9b3345..66c59c9b 100644 --- a/app/views/member_mailer/comment.text.erb +++ b/app/views/member_mailer/comment.text.erb @@ -8,6 +8,6 @@ Below is a link to the event: <%= event_url(@comment.event) %> ---ABTT (ABTech Tracker) +--ABTT (AB Tech Tracker) To unsubscribe from these emails, edit your profile on tracker and uncheck the "Receive emails for comments on events" checkbox. diff --git a/app/views/members/index.html.erb b/app/views/members/index.html.erb index 8864949f..bbd00185 100755 --- a/app/views/members/index.html.erb +++ b/app/views/members/index.html.erb @@ -1,4 +1,4 @@ -

Members of ABTech

+

Members of AB Tech

See also: https://www.abtech.org/wiki/bin/view/Main/WebHome?topic=PhoneList

@@ -16,7 +16,7 @@ <% end %> - + <% for member in @members %> diff --git a/lib/tasks/newmember.rake b/lib/tasks/newmember.rake index a0e97b5f..c10e8489 100755 --- a/lib/tasks/newmember.rake +++ b/lib/tasks/newmember.rake @@ -1,7 +1,7 @@ namespace :member do desc "Create a new member interactively." task(:new => :environment) do - puts "This script will add a new user to the ABTech tracker in the #{ENV["RAILS_ENV"]} environment." + puts "This script will add a new user to the AB Tech tracker in the #{ENV["RAILS_ENV"]} environment." puts "Please give the following information about the new user." m = Member.new m.role = :general_member
<%= table_order_link "Joined", "created_at", @order, @order_desc, @query %>
<%= member.email %>