summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-04 21:26:23 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-04 21:26:23 -0400
commitfaf4db767165d199b14777cebc70a37812313f08 (patch)
tree57814885287b61457aeece73db72823564376436
parentc79d2f61272aeb928e0a9545e421cf556feea99a (diff)
run generate.sh
-rw-r--r--app/views/simple_captcha/_simple_captcha.erb37
-rw-r--r--db/migrate/20140404212449_create_simple_captcha_data.rb15
-rw-r--r--db/migrate/20140405012452_create_servers.rb (renamed from db/migrate/20140405010436_create_servers.rb)0
-rw-r--r--db/migrate/20140405012455_create_matches.rb (renamed from db/migrate/20140405010438_create_matches.rb)0
-rw-r--r--db/migrate/20140405012457_create_teams.rb (renamed from db/migrate/20140405010441_create_teams.rb)0
-rw-r--r--db/migrate/20140405012500_create_alerts.rb (renamed from db/migrate/20140405010443_create_alerts.rb)0
-rw-r--r--db/migrate/20140405012503_create_pms.rb (renamed from db/migrate/20140405010446_create_pms.rb)0
-rw-r--r--db/migrate/20140405012506_create_tournaments.rb (renamed from db/migrate/20140405010448_create_tournaments.rb)0
-rw-r--r--db/migrate/20140405012508_create_games.rb (renamed from db/migrate/20140405010451_create_games.rb)0
-rw-r--r--db/migrate/20140405012510_create_users.rb (renamed from db/migrate/20140405010454_create_users.rb)0
-rw-r--r--db/migrate/20140405012513_create_sessions.rb (renamed from db/migrate/20140405010456_create_sessions.rb)0
-rw-r--r--db/migrate/20140405012516_create_server_settings.rb (renamed from db/migrate/20140405010459_create_server_settings.rb)0
-rw-r--r--db/migrate/20140405012519_create_game_settings.rb (renamed from db/migrate/20140405010501_create_game_settings.rb)0
-rw-r--r--db/migrate/20140405012521_create_tournament_preferences.rb (renamed from db/migrate/20140405010503_create_tournament_preferences.rb)0
-rw-r--r--db/migrate/20140405012524_create_scores.rb (renamed from db/migrate/20140405010506_create_scores.rb)0
-rw-r--r--db/migrate/20140405012527_create_remote_usernames.rb (renamed from db/migrate/20140405010508_create_remote_usernames.rb)0
-rw-r--r--db/migrate/20140405012529_create_tournament_players_join_table.rb (renamed from db/migrate/20140405010511_create_tournament_players_join_table.rb)0
-rw-r--r--db/migrate/20140405012532_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140405010513_create_tournament_hosts_join_table.rb)0
-rw-r--r--db/migrate/20140405012535_create_team_user_join_table.rb (renamed from db/migrate/20140405010515_create_team_user_join_table.rb)0
-rw-r--r--db/migrate/20140405012537_create_match_team_join_table.rb (renamed from db/migrate/20140405010518_create_match_team_join_table.rb)0
-rw-r--r--db/migrate/20140405012548_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140405010527_add_hidden_attrs_to_user.rb)0
-rw-r--r--db/schema.rb11
22 files changed, 62 insertions, 1 deletions
diff --git a/app/views/simple_captcha/_simple_captcha.erb b/app/views/simple_captcha/_simple_captcha.erb
new file mode 100644
index 0000000..9968910
--- /dev/null
+++ b/app/views/simple_captcha/_simple_captcha.erb
@@ -0,0 +1,37 @@
+<style type="text/CSS">
+ .simple_captcha{border: 1px solid #ccc; padding: 5px !important;}
+ .simple_captcha,
+ .simple_captcha div{display: table;}
+ .simple_captcha .simple_captcha_field,
+ .simple_captcha .simple_captcha_image{
+ border: 1px solid #ccc;
+ margin: 0px 0px 2px 0px !important;
+ padding: 0px !important;
+ }
+ .simple_captcha .simple_captcha_image img{
+ margin: 0px !important;
+ padding: 0px !important;
+ width: 110px !important;
+ }
+ .simple_captcha .simple_captcha_label{font-size: 12px;}
+ .simple_captcha .simple_captcha_field input{
+ width: 150px !important;
+ font-size: 16px;
+ border: none;
+ background-color: #efefef;
+ }
+</style>
+
+<div class='simple_captcha'>
+ <div class='simple_captcha_image'>
+ <%= simple_captcha_options[:image] %>
+ </div>
+
+ <div class='simple_captcha_field'>
+ <%= simple_captcha_options[:field] %>
+ </div>
+
+ <div class='simple_captcha_label'>
+ <%= simple_captcha_options[:label] %>
+ </div>
+</div>
diff --git a/db/migrate/20140404212449_create_simple_captcha_data.rb b/db/migrate/20140404212449_create_simple_captcha_data.rb
new file mode 100644
index 0000000..4573b20
--- /dev/null
+++ b/db/migrate/20140404212449_create_simple_captcha_data.rb
@@ -0,0 +1,15 @@
+class CreateSimpleCaptchaData < ActiveRecord::Migration
+ def self.up
+ create_table :simple_captcha_data do |t|
+ t.string :key, :limit => 40
+ t.string :value, :limit => 6
+ t.timestamps
+ end
+
+ add_index :simple_captcha_data, :key, :name => "idx_key"
+ end
+
+ def self.down
+ drop_table :simple_captcha_data
+ end
+end
diff --git a/db/migrate/20140405010436_create_servers.rb b/db/migrate/20140405012452_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140405010436_create_servers.rb
+++ b/db/migrate/20140405012452_create_servers.rb
diff --git a/db/migrate/20140405010438_create_matches.rb b/db/migrate/20140405012455_create_matches.rb
index 31eea12..31eea12 100644
--- a/db/migrate/20140405010438_create_matches.rb
+++ b/db/migrate/20140405012455_create_matches.rb
diff --git a/db/migrate/20140405010441_create_teams.rb b/db/migrate/20140405012457_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140405010441_create_teams.rb
+++ b/db/migrate/20140405012457_create_teams.rb
diff --git a/db/migrate/20140405010443_create_alerts.rb b/db/migrate/20140405012500_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140405010443_create_alerts.rb
+++ b/db/migrate/20140405012500_create_alerts.rb
diff --git a/db/migrate/20140405010446_create_pms.rb b/db/migrate/20140405012503_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140405010446_create_pms.rb
+++ b/db/migrate/20140405012503_create_pms.rb
diff --git a/db/migrate/20140405010448_create_tournaments.rb b/db/migrate/20140405012506_create_tournaments.rb
index c0d8929..c0d8929 100644
--- a/db/migrate/20140405010448_create_tournaments.rb
+++ b/db/migrate/20140405012506_create_tournaments.rb
diff --git a/db/migrate/20140405010451_create_games.rb b/db/migrate/20140405012508_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140405010451_create_games.rb
+++ b/db/migrate/20140405012508_create_games.rb
diff --git a/db/migrate/20140405010454_create_users.rb b/db/migrate/20140405012510_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140405010454_create_users.rb
+++ b/db/migrate/20140405012510_create_users.rb
diff --git a/db/migrate/20140405010456_create_sessions.rb b/db/migrate/20140405012513_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140405010456_create_sessions.rb
+++ b/db/migrate/20140405012513_create_sessions.rb
diff --git a/db/migrate/20140405010459_create_server_settings.rb b/db/migrate/20140405012516_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140405010459_create_server_settings.rb
+++ b/db/migrate/20140405012516_create_server_settings.rb
diff --git a/db/migrate/20140405010501_create_game_settings.rb b/db/migrate/20140405012519_create_game_settings.rb
index eed6b00..eed6b00 100644
--- a/db/migrate/20140405010501_create_game_settings.rb
+++ b/db/migrate/20140405012519_create_game_settings.rb
diff --git a/db/migrate/20140405010503_create_tournament_preferences.rb b/db/migrate/20140405012521_create_tournament_preferences.rb
index 991d659..991d659 100644
--- a/db/migrate/20140405010503_create_tournament_preferences.rb
+++ b/db/migrate/20140405012521_create_tournament_preferences.rb
diff --git a/db/migrate/20140405010506_create_scores.rb b/db/migrate/20140405012524_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140405010506_create_scores.rb
+++ b/db/migrate/20140405012524_create_scores.rb
diff --git a/db/migrate/20140405010508_create_remote_usernames.rb b/db/migrate/20140405012527_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140405010508_create_remote_usernames.rb
+++ b/db/migrate/20140405012527_create_remote_usernames.rb
diff --git a/db/migrate/20140405010511_create_tournament_players_join_table.rb b/db/migrate/20140405012529_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140405010511_create_tournament_players_join_table.rb
+++ b/db/migrate/20140405012529_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140405010513_create_tournament_hosts_join_table.rb b/db/migrate/20140405012532_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140405010513_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140405012532_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140405010515_create_team_user_join_table.rb b/db/migrate/20140405012535_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140405010515_create_team_user_join_table.rb
+++ b/db/migrate/20140405012535_create_team_user_join_table.rb
diff --git a/db/migrate/20140405010518_create_match_team_join_table.rb b/db/migrate/20140405012537_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140405010518_create_match_team_join_table.rb
+++ b/db/migrate/20140405012537_create_match_team_join_table.rb
diff --git a/db/migrate/20140405010527_add_hidden_attrs_to_user.rb b/db/migrate/20140405012548_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140405010527_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140405012548_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index 0763348..c0d4fee 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20140405010527) do
+ActiveRecord::Schema.define(version: 20140405012548) do
create_table "alerts", force: true do |t|
t.integer "author_id"
@@ -129,6 +129,15 @@ ActiveRecord::Schema.define(version: 20140405010527) do
add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true
add_index "sessions", ["user_id"], name: "index_sessions_on_user_id"
+ create_table "simple_captcha_data", force: true do |t|
+ t.string "key", limit: 40
+ t.string "value", limit: 6
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+ add_index "simple_captcha_data", ["key"], name: "idx_key"
+
create_table "teams", force: true do |t|
t.integer "match_id"
t.datetime "created_at"