diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 00:04:03 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 00:04:03 +0100 |
commit | ab63774d954fe1f967a97ffe5a0a66016eca2257 (patch) | |
tree | b3974a58deabe6a989ad7352f10e75d7495cb0c5 /app/views/gs_parameters | |
parent | 495bbfdf78206c8adaec057e83900dda6754092c (diff) | |
parent | f8bc860750f06ab95f9ced8e919e846d3e589819 (diff) |
Merge branch 'tb-css' into develop
Diffstat (limited to 'app/views/gs_parameters')
-rw-r--r-- | app/views/gs_parameters/_index_core.html.haml | 4 | ||||
-rw-r--r-- | app/views/gs_parameters/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/gs_parameters/index.html.haml | 6 | ||||
-rw-r--r-- | app/views/gs_parameters/show.html.haml | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/app/views/gs_parameters/_index_core.html.haml b/app/views/gs_parameters/_index_core.html.haml index a3f8e1c..3d5f3cf 100644 --- a/app/views/gs_parameters/_index_core.html.haml +++ b/app/views/gs_parameters/_index_core.html.haml @@ -5,10 +5,10 @@ %th= t('gs_parameters.index.section') %th= t('gs_parameters.index.value') - - reset_cycle + - for gs_parameter in gs_parameters - cache(['gs_parameters_table_single_row', gs_parameter]) do - %tr{:class => cycle('odd', 'even')} + %tr %td= gs_parameter.name - if !@sections %td= gs_parameter.section diff --git a/app/views/gs_parameters/edit.html.haml b/app/views/gs_parameters/edit.html.haml index c00c7df..b456f43 100644 --- a/app/views/gs_parameters/edit.html.haml +++ b/app/views/gs_parameters/edit.html.haml @@ -1,4 +1,4 @@ -- title t("gs_parameters.edit.page_title") +- content_for :title, t("gs_parameters.edit.page_title") %p %strong= t('gs_parameters.show.name') + ":" diff --git a/app/views/gs_parameters/index.html.haml b/app/views/gs_parameters/index.html.haml index 3844c3d..9132cdd 100644 --- a/app/views/gs_parameters/index.html.haml +++ b/app/views/gs_parameters/index.html.haml @@ -1,9 +1,9 @@ -- title t("gs_parameters.index.page_title") +- content_for :title, t("gs_parameters.index.page_title") - if @gs_parameters && @gs_parameters.count > 0 - cache(['gs_parameters_table', I18n.locale, @gs_parameters_unordered.reorder(:updated_at).last, @gs_parameters_unordered.count]) do - if @sections - %table + %table{:class => 'table table-striped'} - @sections.each do |section| %tr %td{:colspan => 3} @@ -11,5 +11,5 @@ -# Template Dependency: gs_parameters/_index_core = render "index_core", :gs_parameters => @gs_parameters.where(:section => section) - else - %table + %table{:class => 'table table-striped'} = render "index_core", :gs_parameters => @gs_parameters diff --git a/app/views/gs_parameters/show.html.haml b/app/views/gs_parameters/show.html.haml index 7919f8c..795d09c 100644 --- a/app/views/gs_parameters/show.html.haml +++ b/app/views/gs_parameters/show.html.haml @@ -1,5 +1,5 @@ - cache(@gs_parameter) do - - title t("gs_parameters.show.page_title") + - content_for :title, t("gs_parameters.show.page_title") %p %strong= t('gs_parameters.show.name') + ":" |