diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-11 14:43:13 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-11 14:43:13 +0100 |
| commit | f1e7f17befcb5c9f7d6d10a27cbe06c8482dbe2b (patch) | |
| tree | a6bce5a8df0c053689da41d4f0fcf1133ace1018 /app/views | |
| parent | 62ac01a8ea536718734bd911fc3642c0bd8b6bc7 (diff) | |
| parent | ca8121930d7e75b9f6bac08591c6ffea3ca1fea1 (diff) | |
Merge branch 'private_pub' into develop
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/system_messages/_form.html.haml | 7 | ||||
| -rw-r--r-- | app/views/system_messages/_form_core.html.haml | 2 | ||||
| -rw-r--r-- | app/views/system_messages/_index_core.html.haml | 12 | ||||
| -rw-r--r-- | app/views/system_messages/index.html.haml | 3 | ||||
| -rw-r--r-- | app/views/system_messages/new.html.haml | 3 | ||||
| -rw-r--r-- | app/views/system_messages/show.html.haml | 8 |
6 files changed, 0 insertions, 35 deletions
diff --git a/app/views/system_messages/_form.html.haml b/app/views/system_messages/_form.html.haml deleted file mode 100644 index 036ee00..0000000 --- a/app/views/system_messages/_form.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -= simple_form_for([@user, @system_message]) do |f| - = f.error_notification - - = render "form_core", :f => f - - .actions - = f.button :submit, conditional_t('system_messages.form.submit')
\ No newline at end of file diff --git a/app/views/system_messages/_form_core.html.haml b/app/views/system_messages/_form_core.html.haml deleted file mode 100644 index a85db28..0000000 --- a/app/views/system_messages/_form_core.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -.inputs - = f.input :content, :label => t('system_messages.form.content.label'), :hint => conditional_hint('system_messages.form.content.hint') diff --git a/app/views/system_messages/_index_core.html.haml b/app/views/system_messages/_index_core.html.haml deleted file mode 100644 index 7c9dab5..0000000 --- a/app/views/system_messages/_index_core.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -%table.table.table-striped - %thead - %tr - %th= t('system_messages.index.created_at') - %th= t('system_messages.index.content') - - %tbody - - for system_message in system_messages - %tr - %td= system_message.created_at - %td= system_message.content - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => system_message}
\ No newline at end of file diff --git a/app/views/system_messages/index.html.haml b/app/views/system_messages/index.html.haml deleted file mode 100644 index ffd3fc3..0000000 --- a/app/views/system_messages/index.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -- content_for :title, t("system_messages.index.page_title") - -= render "index_core", :system_messages => @system_messages
\ No newline at end of file diff --git a/app/views/system_messages/new.html.haml b/app/views/system_messages/new.html.haml deleted file mode 100644 index 565f5c5..0000000 --- a/app/views/system_messages/new.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -- content_for :title, t("system_messages.new.page_title") - -= render "form" diff --git a/app/views/system_messages/show.html.haml b/app/views/system_messages/show.html.haml deleted file mode 100644 index 70be6f2..0000000 --- a/app/views/system_messages/show.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -- content_for :title, t("system_messages.show.page_title") - -%p - %strong= t('system_messages.show.created_at') + ":" - = @system_message.created_at -%p - %strong= t('system_messages.show.content') + ":" - = @system_message.content |