app/views/shared/_wowhead.erb @@ -1,7 +1,9 @@ +require 'net/http' + class LootsController < ApplicationController - before_filter :load_raid + before_filter :load_raid, :except => :search before_filter :load_character, :only => :create - before_filter :require_admin + before_filter :require_admin, :except => :search def create @loot = Loot.new(params[:loot]) @@ -30,6 +32,10 @@ class LootsController < ApplicationController @loot.update_attributes(params[:loot]) ? redirect_to(raid_url(@raid)) : render(:action => :edit) end + def search + render :json => Net::HTTP.get('www.wowhead.com', "/?search=#{CGI::escape(params[:search])}&opensearch") + end + private def load_character app/controllers/loots_controller.rb @@ -18,9 +18,15 @@ :id, :name) %> </dd> <dt></dt> - <dd><%= submit_tag "Save" %> + <dd> + <%= submit_tag "Save" %> + <%= link_to 'Back to raid', @raid %> + </dd> </dl> <% end %> + <dl> + <%= render :partial => 'shared/wowhead' %> + </dl> <% end %> - - + + app/views/loots/edit.html.erb @@ -145,6 +145,7 @@ <dd id="new_loot"> <%= render :partial => "new_loot", :locals => { :raid => @raid } %> </dd> + <%= render :partial => 'shared/wowhead' %> <% @raid.locations.each do |location| %> <dt><%= location.instance.name %> Loot</dt> <dd> app/views/raids/show.html.erb @@ -1 +1 @@ -<span style="color: #<%= character.cclass.color %>;"><%= character.name %></span> \ No newline at end of file +<span class="character" style="color: #<%= character.cclass.color %>;"><%= character.name %></span> app/views/shared/_character.erb @@ -51,6 +51,8 @@ ActionController::Routing::Routes.draw do |map| admin.resources :accounts, :collection => { 'rename' => :post } end + map.wowhead('wowhead/:search', :controller => 'loots', :action => 'search') + map.login('login', :controller => 'login', :action => 'index', config/routes.rb public/images/loading.gif @@ -117,20 +117,21 @@ function validate_loot() { // Wowhead search function wowhead_items(data) { var items = data[1]; - var meta = data[7]; - var results = []; + if (items.length > 0) { + var meta = data[7]; - $.each(items, function(i, name) { - var m = meta[i]; + $.each(items, function(i, name) { + var m = meta[i]; - // Check for an item - if(m[0] === 3 && m[3] === 4) { - results.push([name.replace(/ \(Item\)/, ''), m[1]]); - } - }); - - return results; + // Check for an item + if(m[0] === 3 && m[3] === 4) { + // Found first item, fill out and quit + fill_loot(name.replace(/ \(Item\)/, ''), 'http://www.wowhead.com/?item=' + m[1]); + return false; + } + }); + } } // Wow Heroes Lookup public/javascripts/application.js @@ -38,7 +38,7 @@ div.raid dl { position: relative; overflow: hidden; margin: 1em 0; } div.raid dt { float: left; clear: left; margin-bottom: 1em; font-weight: bold; line-height: 1em; width: 9em; text-align: right; padding-right: 1em; } -div.raid dd { float: left; clear: right; +div.raid dd { float: left; clear: right; position: relative; margin-bottom: 1em; margin-right: 1em; line-height: 1em; max-width: 40em; } div.raid dd#slots { max-width: 70em; } @@ -55,7 +55,7 @@ div.raid dl.list { background-color: #111; border: 1px solid #000; overflow: vis padding: 0.5em; float: left; margin: 0 1em 0 0; } div.raid dl.list dt { color: #ffd302; font-weight: bold; padding: 0; margin: 0.2em 0 0.7em 0; text-align: center; - vertical-align: top; width: auto; + vertical-align: top; width: auto; float: none; } div.raid dl.list dd { background-color: #222; border: 1px solid #000; @@ -118,3 +118,6 @@ span.note { color: #aaa; } /* Errors */ div.errorExplanation ul { list-style-position: inside; color: #f00; } + +/* WoWhead search */ +img#wowhead_search_loading_image { position: absolute; display: inline; top: 0; right: -20px; } public/stylesheets/lilyraid.css 5cfecb382438cbd6730b6c01d3d645cab101cfc0 Christopher Giroir kelsin@valefor.com http://github.com/Kelsin/lilyraid/commit/686daca2031934b78f012358f4f38b01ade7dccb 686daca2031934b78f012358f4f38b01ade7dccb 2009-07-18T13:44:29-07:00 2009-07-18T13:44:29-07:00 Ajax item search and click for armory! 15be1b294264367b5efa0aa8f52a11fc1181cfe0 Christopher Giroir kelsin@valefor.com