From 1c6646bc732def369e54ef4ac576d748c6ba9c92 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 25 Jun 2013 13:19:26 +0200
Subject: GUI improvements.

---
 app/serializers/switchboard_entry_serializer.rb |  2 +-
 app/views/switchboards/show.html.erb            | 40 +++++++++++++++----------
 public/js/app.js                                |  3 +-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/serializers/switchboard_entry_serializer.rb b/app/serializers/switchboard_entry_serializer.rb
index 1b6c761..5d76e16 100644
--- a/app/serializers/switchboard_entry_serializer.rb
+++ b/app/serializers/switchboard_entry_serializer.rb
@@ -1,5 +1,5 @@
 class SwitchboardEntrySerializer < ActiveModel::Serializer
-  attributes :id, :name, :path_to_user, :avatar_src, :callstate
+  attributes :id, :name, :path_to_user, :avatar_src, :callstate, :switchable
 
   has_one :sip_account, embed: :ids
   has_one :switchboard, embed: :ids
diff --git a/app/views/switchboards/show.html.erb b/app/views/switchboards/show.html.erb
index 69b0ed6..b390ce5 100644
--- a/app/views/switchboards/show.html.erb
+++ b/app/views/switchboards/show.html.erb
@@ -40,22 +40,32 @@
                     </p>
                   {{/if}}
 
-                  <p>
-                  {{#each phoneNumber in switchboardEntry.sipAccount.phoneNumberShortList}}
-                    <span class="label">
-                      {{phoneNumber.number}}
-                    </span>
+                  {{#if switchboardEntry.switchable}}
+                    <p>
+                    {{#each phoneNumber in switchboardEntry.sipAccount.phoneNumberShortList}}
+                      <span class="label">
+                        {{phoneNumber.number}}
+                      </span>
+                    {{/each}}
+                    </p>
+                  {{else}}
+                    <p>
+                    {{#each phoneNumber in switchboardEntry.sipAccount.phoneNumberShortList}}
+                      <span class="label">
+                        {{phoneNumber.number}}
+                      </span>
 
-                    {{#if dispatchableIncomingCalls.length}}
-                      <p>
-                        {{#each dispatchableIncomingCall in dispatchableIncomingCalls}}
-                          <button {{action transfer_blind dispatchableIncomingCall.id phoneNumber.number}} class="btn btn-small">Transfer</button>
-                          <button {{action transfer_attended dispatchableIncomingCall.id phoneNumber.number}} class="btn btn-small">Attended Transfer</button>
-                        {{/each}}
-                      </p>
-                    {{/if}}
-                  {{/each}}
-                  </p>
+                      {{#if dispatchableIncomingCalls.length}}
+                        <p>
+                          {{#each dispatchableIncomingCall in dispatchableIncomingCalls}}
+                            <button {{action transfer_blind dispatchableIncomingCall.id phoneNumber.number}} class="btn btn-small">Transfer</button>
+                            <button {{action transfer_attended dispatchableIncomingCall.id phoneNumber.number}} class="btn btn-small">Attended Transfer</button>
+                          {{/each}}
+                        </p>
+                      {{/if}}
+                    {{/each}}
+                    </p>
+                  {{/if}}
 
                   {{#if switchboardEntry.sipAccount.calls.length}}
                     <p>
diff --git a/public/js/app.js b/public/js/app.js
index 1dee270..531e4b8 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -61,7 +61,8 @@ App.SwitchboardEntry = DS.Model.extend({
   name: DS.attr('string'),
   path_to_user: DS.attr('string'),
   avatar_src: DS.attr('string'),
-  callstate: DS.attr('string')  
+  callstate: DS.attr('string'),
+  switchable: DS.attr('boolean')
 });
 
 App.ActiveCall = DS.Model.extend({
-- 
cgit v1.2.3