From ddb3dfa92ec0878240211cb2b7a8e125961b1360 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 23:01:16 +0100 Subject: Moved to GsParemeter.get and set defaults for a couple of validations. --- app/views/hunt_groups/_form_core.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/hunt_groups') diff --git a/app/views/hunt_groups/_form_core.html.haml b/app/views/hunt_groups/_form_core.html.haml index 10a0111..53d44d1 100644 --- a/app/views/hunt_groups/_form_core.html.haml +++ b/app/views/hunt_groups/_form_core.html.haml @@ -1,4 +1,4 @@ .inputs = f.input :name, :label => t('hunt_groups.form.name.label'), :hint => conditional_hint('hunt_groups.form.name.hint') - = f.input :strategy, :as => :select, :label => t('hunt_groups.form.strategy.label'), :hint => conditional_hint('hunt_groups.form.strategy.hint'), :include_blank => false, :collection => HUNT_GROUP_STRATEGIES.map {|x| [I18n.t('hunt_groups.strategies.' + x), x] } - = f.input :seconds_between_jumps, :collection => VALID_SECONDS_BETWEEN_JUMPS_VALUES, :label => t('hunt_groups.form.seconds_between_jumps.label'), :hint => conditional_hint('hunt_groups.form.seconds_between_jumps.hint') \ No newline at end of file + = f.input :strategy, :as => :select, :label => t('hunt_groups.form.strategy.label'), :hint => conditional_hint('hunt_groups.form.strategy.hint'), :include_blank => false, :collection => GsParameter.get('HUNT_GROUP_STRATEGIES').map {|x| [I18n.t('hunt_groups.strategies.' + x), x] } + = f.input :seconds_between_jumps, :collection => GsParameter.get('VALID_SECONDS_BETWEEN_JUMPS_VALUES'), :label => t('hunt_groups.form.seconds_between_jumps.label'), :hint => conditional_hint('hunt_groups.form.seconds_between_jumps.hint') \ No newline at end of file -- cgit v1.2.3 From 18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 20:18:16 +0100 Subject: Started the migration to Twitter Bootstrap. --- app/views/hunt_groups/_index_core.html.haml | 2 +- app/views/hunt_groups/edit.html.haml | 2 +- app/views/hunt_groups/index.html.haml | 2 +- app/views/hunt_groups/new.html.haml | 2 +- app/views/hunt_groups/show.html.haml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/hunt_groups') diff --git a/app/views/hunt_groups/_index_core.html.haml b/app/views/hunt_groups/_index_core.html.haml index 3000e97..b820ad0 100644 --- a/app/views/hunt_groups/_index_core.html.haml +++ b/app/views/hunt_groups/_index_core.html.haml @@ -1,6 +1,6 @@ - show_seconds = hunt_groups.map{|x| ! x.seconds_between_jumps.nil? }.include?(true) -%table +%table{:class => 'table table-striped'} %tr %th= t('hunt_groups.index.name') %th= t('hunt_groups.index.strategy') diff --git a/app/views/hunt_groups/edit.html.haml b/app/views/hunt_groups/edit.html.haml index f2ef998..5d5b146 100644 --- a/app/views/hunt_groups/edit.html.haml +++ b/app/views/hunt_groups/edit.html.haml @@ -1,3 +1,3 @@ -- title t("hunt_groups.edit.page_title") +- content_for :title, t("hunt_groups.edit.page_title") = render "form" diff --git a/app/views/hunt_groups/index.html.haml b/app/views/hunt_groups/index.html.haml index 62bc2aa..8c6fdf6 100644 --- a/app/views/hunt_groups/index.html.haml +++ b/app/views/hunt_groups/index.html.haml @@ -1,4 +1,4 @@ -- title t("hunt_groups.index.page_title") +- content_for :title, t("hunt_groups.index.page_title") - if @hunt_groups.count > 0 = render "index_core", :hunt_groups => @hunt_groups diff --git a/app/views/hunt_groups/new.html.haml b/app/views/hunt_groups/new.html.haml index a40e579..2c1350e 100644 --- a/app/views/hunt_groups/new.html.haml +++ b/app/views/hunt_groups/new.html.haml @@ -1,3 +1,3 @@ -- title t("hunt_groups.new.page_title") +- content_for :title, t("hunt_groups.new.page_title") = render "form" diff --git a/app/views/hunt_groups/show.html.haml b/app/views/hunt_groups/show.html.haml index 009af50..3ffe4f3 100644 --- a/app/views/hunt_groups/show.html.haml +++ b/app/views/hunt_groups/show.html.haml @@ -1,4 +1,4 @@ -- title t("hunt_groups.show.page_title") +- content_for :title, t("hunt_groups.show.page_title") %p %strong= t('hunt_groups.show.name') + ":" -- cgit v1.2.3 From d8fe3b636cab1504cb5d3cb5dc57ed818749ccf5 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 21:30:48 +0100 Subject: Twitter Bootstrap stuff. --- app/views/hunt_groups/_index_core.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/hunt_groups') diff --git a/app/views/hunt_groups/_index_core.html.haml b/app/views/hunt_groups/_index_core.html.haml index b820ad0..16b1b5d 100644 --- a/app/views/hunt_groups/_index_core.html.haml +++ b/app/views/hunt_groups/_index_core.html.haml @@ -9,9 +9,9 @@ %th= t('hunt_groups.index.phone_numbers') %th= t('hunt_groups.index.hunt_group_members') - - reset_cycle + - for hunt_group in hunt_groups - %tr{:class => cycle('odd', 'even')} + %tr %td= hunt_group.name %td= t("hunt_groups.strategies.#{hunt_group.strategy}") - if show_seconds -- cgit v1.2.3