From 4aeaf0e41518695c3c6ba3b09025516f67b06a11 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Tue, 22 Apr 2014 11:46:07 -0400
Subject: not exactly sure what's wrong with the labels, but fixed true/false

---
 app/views/tournaments/_selected.html.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index eec8b5e..a4efa4f 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -18,21 +18,23 @@
   <% end %>
 
   <%= fields_for "tournament[settings]", @tournament.settings do |setting_fields|  %>
-    <% @tournament.settings.each do |setting| %>
+    <% @game.settings.each do |setting| %>
       <p>
       <%= setting_fields.label setting.name %>
       <br>
-      <% case setting.stype %>
+      <% case setting.vartype %>
         <% when 0 %>
            <%= setting_fields.text_field( setting.name ) %>
         <% when 1 %>
            <%= setting_fields.text_area( setting.name ) %>
         <% when 2 %>
-           <%= setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(','), :first, :last, { item_wrapper_tag: false } ) %>
+           <%= setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(','), "first", "last", { item_wrapper_tag: false } ) %>
         <% when 3 %>
-           <%= setting_fields.collection_check_boxes( setting.name, setting.type_opt.split(','), :first, :last, { item_wrapper_tag: false } ) %>
+           <%= setting_fields.collection_check_boxes( setting.name, setting.type_opt.split(','), "first", "last", { item_wrapper_tag: false } ) %>
         <% when 4 %>
+	   <%= setting_fields.label "true" %>
            <%= setting_fields.radio_button( setting.name, "true" ) %>
+	   <%= setting_fields.label "false" %>
            <%= setting_fields.radio_button( setting.name, "false" ) %>
         <% when 5 %>
            <%= setting_fields.select( setting.name, setting.type_opt.split(',') ) %>
-- 
cgit v1.2.3-54-g00ecf


From 0665e442de8245c5b5a135fee14f589b0bfa00c3 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Tue, 22 Apr 2014 11:53:06 -0400
Subject: footer problems have been fixed

---
 app/assets/stylesheets/scaffolds.css.scss | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 40791e8..123aa1d 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -108,11 +108,9 @@ button, input[type="submit"] {
 
 footer {
   clear: both;
-  margin: 0 auto;
   border-top: solid 1px $orange;
   padding-top: 10px;
   text-align: center;
-  position:absolute;
   bottom: 0;
   width: 100%;
 }
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From 5444bc11d478b0a182b196fab77f9e4ad90a99dd Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Tue, 22 Apr 2014 12:23:16 -0400
Subject: fixed permissions style

---
 app/assets/stylesheets/scaffolds.css.scss |  1 -
 app/assets/stylesheets/servers.css.scss   | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 123aa1d..509cb19 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -112,5 +112,4 @@ footer {
   padding-top: 10px;
   text-align: center;
   bottom: 0;
-  width: 100%;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/servers.css.scss b/app/assets/stylesheets/servers.css.scss
index 4710386..1ff4536 100644
--- a/app/assets/stylesheets/servers.css.scss
+++ b/app/assets/stylesheets/servers.css.scss
@@ -1,3 +1,26 @@
 // Place all the styles related to the servers controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+$page-color: #444;
+$toolbar-color: black;
+$orange: #DD9125;
+$darker-orange: #9D4102;
+$link-yellow: #FFC50D;
+
+.edit_server {
+
+	legend {
+		color: #EEE;
+	}
+	color: #FFF;
+
+	input[type="submit"] {
+		color: $page-color;
+	}
+
+	li {
+		list-style: none;
+	}
+
+}
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf