app/controllers/server.rb app/helpers/server_helper.rb app/models/impression.rb app/views/server/index.html.erb app/views/shared/_ad.html.erb app/views/sites/_insertion_code.html.erb data/GeoLiteCity.dat schema/migrations/004_impression_migration.rb spec/controllers/server_spec.rb spec/helpers/server_helper_spec.rb spec/models/impression_spec.rb @@ -4,4 +4,4 @@ class Dashboard < Application render end -end +end \ No newline at end of file app/controllers/dashboard.rb @@ -15,5 +15,10 @@ module Merb (fraction*100).to_s + "%" end + def host_with_port + request.protocol + request.host + #"http://" + Merb.config[:host] + ":" + Merb.config[:port] + end + end end app/helpers/global_helpers.rb @@ -1,6 +1,7 @@ class Campaign < ActiveRecord::Base belongs_to :spot + has_many :impressions validates_presence_of :name, :starts_on, :ends_on, :spot_id app/models/campaign.rb @@ -13,4 +13,9 @@ class Spot < ActiveRecord::Base return self.campaigns[index - 1] end + # finds an advertisment with weighting, etc taken into account + def campaign_for_serving + self.campaigns.first + end + end \ No newline at end of file app/models/spot.rb @@ -20,11 +20,13 @@ <% if @site.spots.empty? %> <p>No spots added for this site.</p> <% else %> - <ul class="spots"> + <ul class="spots full-width-spots"> <% for spot in @site.spots %> <li> - <h4><%=h spot.name %></h4> + <p class="status"><%=h spot.name %></p> <p class="meta"><%= spot.campaigns.count %> / <%= spot.campaign_limit %> campaigns filled</p> + <p class="action"><a href="#" class="codetoggler" toggle="code-<%= spot.id %>">Show Code</a></p> + <textarea id="code-<%= spot.id %>" class="code-insertion"><%= partial :insertion_code, :spot => spot %></textarea> </li> <% end %> </ul> app/views/sites/edit.html.erb @@ -25,7 +25,7 @@ use_test :rspec ### Add your other dependencies here -dependencies "merb-assets", "merb_helpers" +dependencies "merb-assets", "merb_helpers", "geoip" Merb::BootLoader.after_app_loads do my_formats = { config/init.rb @@ -37,6 +37,22 @@ var rules = { // update hidden fields if visual fields have info in them element.fireEvent('keyup'); + }, + + '.codetoggler': function(element){ + element = $(element); + toggle_element = $(element.getAttribute('toggle')); + toggle_element.hide(); + element.addEvent('click', function(e){ + if (toggle_element.visible()){ + toggle_element.hide(); + this.innerHTML = 'Show Code'; + }else{ + toggle_element.show(); + this.innerHTML = 'Hide Code'; + } + (new Event(e)).stop(); + }); } } public/javascripts/application.js @@ -190,6 +190,13 @@ input[type=text], input[type=password], textarea{ input[type=text].datepicker{ width:100px; } +textarea.code-insertion{ + width:97%; + height:120px; + font-family: "Courier New", Courier, monospace; + font-size:11px; + color:#000; +} input[type=submit], button[type=submit]{ padding:5px 10px; @@ -285,6 +292,9 @@ ul.meta li a{ ul.spots{ margin:15px 0 15px -10px; } +ul.full-width-spots{ + margin-left:0; +} ul.spots li{ list-style-type:none; float:left; @@ -298,7 +308,11 @@ ul.spots li{ -o-border-radius:4px; border-radius:4px; } - +ul.full-width-spots li{ + float:none; + margin-left:0; + width:auto; +} .spots p.status{ margin:5px 0; font-size:11px; public/stylesheets/master.css @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 3) do +ActiveRecord::Schema.define(:version => 4) do create_table "campaigns", :force => true do |t| t.string "name" @@ -22,6 +22,17 @@ ActiveRecord::Schema.define(:version => 3) do t.integer "spot_id" t.datetime "created_at" t.datetime "updated_at" + t.string "link" + t.integer "impressions_count", :default => 0 + t.integer "clicks_count", :default => 0 + end + + create_table "impressions", :force => true do |t| + t.string "ip" + t.string "country" + t.boolean "clicked", :default => false + t.integer "campaign_id" + t.datetime "created_at" end create_table "sites", :force => true do |t| schema/schema.rb fd7fd932d6657833bace20062c954d56a54602b9 Kyle Neath kneath@gmail.com http://github.com/kneath/greed/commit/3a2be190863e49a2211f844ac39505447672148e 3a2be190863e49a2211f844ac39505447672148e 2008-04-27T00:38:53-07:00 2008-04-27T00:38:53-07:00 Add impressions & basic serving 59da9828b97b3f130c5736df753df6c02a2085db Kyle Neath kneath@gmail.com