summaryrefslogtreecommitdiff
path: root/app/views/hunt_groups
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 15:33:06 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 15:33:06 +0100
commit39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch)
tree6c88289c9f99be0af8635636fcdf64102090e5ec /app/views/hunt_groups
parent5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff)
parent6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff)
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'app/views/hunt_groups')
-rw-r--r--app/views/hunt_groups/_form_core.html.haml4
-rw-r--r--app/views/hunt_groups/_index_core.html.haml6
-rw-r--r--app/views/hunt_groups/edit.html.haml2
-rw-r--r--app/views/hunt_groups/index.html.haml2
-rw-r--r--app/views/hunt_groups/new.html.haml2
-rw-r--r--app/views/hunt_groups/show.html.haml2
6 files changed, 9 insertions, 9 deletions
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
diff --git a/app/views/hunt_groups/_index_core.html.haml b/app/views/hunt_groups/_index_core.html.haml
index 3000e97..16b1b5d 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')
@@ -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
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') + ":"