summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-10 09:52:31 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-10 09:52:31 +0100
commit13e16223977966f9751e7b8e3fb587e2df0a0801 (patch)
treea5eae59fa92f37f4d4b301ee8ae3d94b8f22551b /app/views
parent04730ba7acf55ed5310352eabf3876bf5b8d1f87 (diff)
Add a second configuration option.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/switchboards/edit.html.haml11
-rw-r--r--app/views/users/_switchboards.html.haml7
-rw-r--r--app/views/users/show.html.haml3
3 files changed, 20 insertions, 1 deletions
diff --git a/app/views/switchboards/edit.html.haml b/app/views/switchboards/edit.html.haml
index 1ab0efe..f2e69f4 100644
--- a/app/views/switchboards/edit.html.haml
+++ b/app/views/switchboards/edit.html.haml
@@ -1,3 +1,12 @@
- content_for :title, t("switchboards.edit.page_title")
-= render "form" \ No newline at end of file
+.row
+ .span12
+ = render "form"
+
+.row
+ .span12
+ - if @switchboard.switchboard_entries && @switchboard.switchboard_entries.count > 0
+ = render "switchboard_entries/index_core", :switchboard_entries => @switchboard.switchboard_entries
+
+ = render :partial => 'shared/create_link', :locals => {:parent => @switchboard, :child_class => SwitchboardEntry} \ No newline at end of file
diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml
new file mode 100644
index 0000000..f79d6b8
--- /dev/null
+++ b/app/views/users/_switchboards.html.haml
@@ -0,0 +1,7 @@
+-# Switchboards
+-#
+- if (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard )
+ %h2= t('switchboards.index.page_title')
+ - if can?( :index, Switchboard ) && user.switchboards.count > 0
+ = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user}
+ = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Conference} \ No newline at end of file
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index ea90ab4..98f7cc6 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -87,3 +87,6 @@
- cache(['user_show_conferences_overview', I18n.locale, @user, @user.conferences]) do
= render :partial => 'conferences', :locals => {:user => @user}
+
+ - cache(['user_switchboards_overview', I18n.locale, @user, @user.switchboards]) do
+ = render :partial => 'switchboards', :locals => {:user => @user} \ No newline at end of file