From 3b2e0094ab8b6443f4575576d40be6962f71ff5b Mon Sep 17 00:00:00 2001 From: Jonathan Hoyt Date: Sun, 12 Apr 2009 17:35:41 -0400 Subject: [PATCH] Rewrote the iphone controllers and views to use the new jQTouch library. UI works much better and faster now. [#28] --- app/controllers/iphone/tickets_controller.rb | 12 +- app/controllers/tickets_controller.rb | 1 - app/helpers/tickets_helper.rb | 2 +- app/views/iphone/clients/home.html.erb | 51 ++- app/views/iphone/clients/index.html.erb | 23 +- app/views/iphone/clients/show.html.erb | 85 ++-- app/views/iphone/devices/index.html.erb | 23 +- app/views/iphone/devices/show.html.erb | 63 +-- app/views/iphone/tickets/index.html.erb | 58 ++- app/views/iphone/tickets/show.html.erb | 73 ++-- app/views/layouts/iphone.html.erb | 55 ++- public/images/jqt/backButton.png | Bin 0 -> 816 bytes public/images/jqt/back_button.png | Bin 0 -> 3756 bytes public/images/jqt/back_button_clicked.png | Bin 0 -> 3741 bytes public/images/jqt/bg_row.gif | Bin 0 -> 162 bytes public/images/jqt/bg_row_select.gif | Bin 0 -> 264 bytes public/images/jqt/blueButton.png | Bin 0 -> 517 bytes public/images/jqt/button.png | Bin 0 -> 3315 bytes public/images/jqt/button_clicked.png | Bin 0 -> 3283 bytes public/images/jqt/cancel.png | Bin 0 -> 362 bytes public/images/jqt/chevron.png | Bin 0 -> 259 bytes public/images/jqt/chevron_select.png | Bin 0 -> 308 bytes public/images/jqt/grayButton.png | Bin 0 -> 943 bytes public/images/jqt/header.gif | Bin 0 -> 271 bytes public/images/jqt/listGroup.png | Bin 0 -> 2867 bytes public/images/jqt/loading.gif | Bin 0 -> 1435 bytes public/images/jqt/pinstripes.png | Bin 0 -> 117 bytes public/images/jqt/selection.png | Bin 0 -> 159 bytes public/images/jqt/thumb.png | Bin 0 -> 2835 bytes public/images/jqt/toggle.png | Bin 0 -> 2815 bytes public/images/jqt/toggleOn.png | Bin 0 -> 163 bytes public/images/jqt/toolButton.png | Bin 0 -> 531 bytes public/images/jqt/toolbar.gif | Bin 0 -> 269 bytes public/images/jqt/toolbar.png | Bin 0 -> 171 bytes public/images/jqt/whiteButton.png | Bin 0 -> 978 bytes public/javascripts/jqtouch.min.js | 88 ++++ public/javascripts/jquery-1.3.2.min.js | 19 + ...one-sabretech-swords.png => sabretech.png} | Bin public/stylesheets/jqt/jqtouch.css | 408 ++++++++++++++++++ 39 files changed, 772 insertions(+), 189 deletions(-) create mode 100644 public/images/jqt/backButton.png create mode 100644 public/images/jqt/back_button.png create mode 100644 public/images/jqt/back_button_clicked.png create mode 100644 public/images/jqt/bg_row.gif create mode 100644 public/images/jqt/bg_row_select.gif create mode 100644 public/images/jqt/blueButton.png create mode 100644 public/images/jqt/button.png create mode 100644 public/images/jqt/button_clicked.png create mode 100644 public/images/jqt/cancel.png create mode 100644 public/images/jqt/chevron.png create mode 100644 public/images/jqt/chevron_select.png create mode 100644 public/images/jqt/grayButton.png create mode 100644 public/images/jqt/header.gif create mode 100644 public/images/jqt/listGroup.png create mode 100644 public/images/jqt/loading.gif create mode 100644 public/images/jqt/pinstripes.png create mode 100644 public/images/jqt/selection.png create mode 100644 public/images/jqt/thumb.png create mode 100644 public/images/jqt/toggle.png create mode 100644 public/images/jqt/toggleOn.png create mode 100644 public/images/jqt/toolButton.png create mode 100644 public/images/jqt/toolbar.gif create mode 100644 public/images/jqt/toolbar.png create mode 100644 public/images/jqt/whiteButton.png create mode 100644 public/javascripts/jqtouch.min.js create mode 100644 public/javascripts/jquery-1.3.2.min.js rename public/{images/iphone-sabretech-swords.png => sabretech.png} (100%) create mode 100644 public/stylesheets/jqt/jqtouch.css diff --git a/app/controllers/iphone/tickets_controller.rb b/app/controllers/iphone/tickets_controller.rb index c033593..92ffef8 100644 --- a/app/controllers/iphone/tickets_controller.rb +++ b/app/controllers/iphone/tickets_controller.rb @@ -9,19 +9,13 @@ def show def index if params[:client_id] - tickets = Ticket.find(:all, :conditions => {:client_id => params[:client_id]}) - new_array = [] - tickets.each do |ticket| - if ticket.archived_on == nil - new_array << ticket - end - end - @tickets = new_array.sort_by{|ticket| [ticket.status, ticket.id]} + @tickets = Ticket.find(:all, :conditions => {:client_id => params[:client_id]}) + @tickets = @tickets.sort_by{|ticket| [ticket.status, ticket.id]} elsif params[:device_id] @tickets = Device.find(params[:device_id]).tickets else if params[:status] - @tickets = Ticket.limit(params[:status], params[:scope], current_user, params[:device]) + @tickets = Ticket.limit(params[:status], current_user, params[:scope]) @tickets = @tickets.sort_by{|ticket| [ticket.status, ticket.id]} else @tickets = [] diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb index 77ea356..1fcf931 100644 --- a/app/controllers/tickets_controller.rb +++ b/app/controllers/tickets_controller.rb @@ -4,7 +4,6 @@ class TicketsController < ApplicationController def index @tickets = Ticket.limit(params[:status], current_user, params[:scope]) - @tickets = @tickets.sort_by{|ticket| [ticket.status, ticket.id]} respond_to do |format| diff --git a/app/helpers/tickets_helper.rb b/app/helpers/tickets_helper.rb index e7fbcec..5f5fcaa 100644 --- a/app/helpers/tickets_helper.rb +++ b/app/helpers/tickets_helper.rb @@ -1,7 +1,7 @@ module TicketsHelper def totals_helper(status) if @totals[status].to_i > 0 - return "#{@totals[status]}" + return "#{@totals[status]}" end end diff --git a/app/views/iphone/clients/home.html.erb b/app/views/iphone/clients/home.html.erb index edbb89d..109511c 100644 --- a/app/views/iphone/clients/home.html.erb +++ b/app/views/iphone/clients/home.html.erb @@ -1,10 +1,43 @@ -
-

- Back - Home +
+
+

Suite

+
+
- \ No newline at end of file + +<% form_tag "/iphone/clients", :method => "get", :class => "panel", :title => "Client Search", :id => "client_search" do %> +
+

Client Search

+ Home +
+
+
+
+ + <%= text_field_tag :q %> +
+
+ +
+<% end %> + +<% form_tag "/iphone/devices", :method => "get", :class => "panel", :title => "Device Search", :id => "device_search" do %> +
+

Device Search

+ Home +
+
+
+
+ + <%= text_field_tag :q %> +
+
+
+ +<% end %> \ No newline at end of file diff --git a/app/views/iphone/clients/index.html.erb b/app/views/iphone/clients/index.html.erb index 9e9ca21..21a2930 100644 --- a/app/views/iphone/clients/index.html.erb +++ b/app/views/iphone/clients/index.html.erb @@ -1,17 +1,12 @@ -<% if @clients.length == 0 %> - <% form_tag "/iphone/clients", :method => "get", :class => "panel", :title => "Search", :selected => "true" do %> -
-
- - <%= text_field_tag :q %> -
-
- - <% end %> -<% else %> -