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/ringtones | |
parent | 495bbfdf78206c8adaec057e83900dda6754092c (diff) | |
parent | f8bc860750f06ab95f9ced8e919e846d3e589819 (diff) |
Merge branch 'tb-css' into develop
Diffstat (limited to 'app/views/ringtones')
-rw-r--r-- | app/views/ringtones/_index_core.html.haml | 6 | ||||
-rw-r--r-- | app/views/ringtones/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/ringtones/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/ringtones/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/ringtones/show.html.haml | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/views/ringtones/_index_core.html.haml b/app/views/ringtones/_index_core.html.haml index c39357a..e3b9a32 100644 --- a/app/views/ringtones/_index_core.html.haml +++ b/app/views/ringtones/_index_core.html.haml @@ -1,11 +1,11 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('ringtones.index.audio') %th= t('ringtones.index.bellcore_id') - - reset_cycle + - for ringtone in ringtones - %tr{:class => cycle('odd', 'even')} + %tr %td= ringtone.audio %td= ringtone.bellcore_id =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => ringtone.ringtoneable, :child => ringtone}
\ No newline at end of file diff --git a/app/views/ringtones/edit.html.haml b/app/views/ringtones/edit.html.haml index 6779190..341b97f 100644 --- a/app/views/ringtones/edit.html.haml +++ b/app/views/ringtones/edit.html.haml @@ -1,3 +1,3 @@ -- title t("ringtones.edit.page_title") +- content_for :title, t("ringtones.edit.page_title") = render "form" diff --git a/app/views/ringtones/index.html.haml b/app/views/ringtones/index.html.haml index 4da75fa..2eea5fe 100644 --- a/app/views/ringtones/index.html.haml +++ b/app/views/ringtones/index.html.haml @@ -1,4 +1,4 @@ -- title t("ringtones.index.page_title") +- content_for :title, t("ringtones.index.page_title") - if @ringtones.count > 0 = render "index_core", :ringtones => @ringtones diff --git a/app/views/ringtones/new.html.haml b/app/views/ringtones/new.html.haml index 025f440..de0070c 100644 --- a/app/views/ringtones/new.html.haml +++ b/app/views/ringtones/new.html.haml @@ -1,3 +1,3 @@ -- title t("ringtones.new.page_title") +- content_for :title, t("ringtones.new.page_title") = render "form" diff --git a/app/views/ringtones/show.html.haml b/app/views/ringtones/show.html.haml index 408b808..7e0a011 100644 --- a/app/views/ringtones/show.html.haml +++ b/app/views/ringtones/show.html.haml @@ -1,4 +1,4 @@ -- title t("ringtones.show.page_title") +- content_for :title, t("ringtones.show.page_title") - if 1 == 2 %p |