From a24aee0fdfcbbc2200ad05ee5b789aec5988f1ad Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 24 Jun 2013 16:43:42 +0200
Subject: First step to provide an attended transfer.

---
 app/views/switchboards/show.html.erb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/views')

diff --git a/app/views/switchboards/show.html.erb b/app/views/switchboards/show.html.erb
index 1a8e5a0..f3304cf 100644
--- a/app/views/switchboards/show.html.erb
+++ b/app/views/switchboards/show.html.erb
@@ -50,6 +50,7 @@
                       <p>
                         {{#each activeCall in activeCalls}}
                           <button {{action transfer_blind activeCall.id phoneNumber.number}} class="btn btn-small">Transfer</button>
+                          <button {{action transfer_attended activeCall.id phoneNumber.number}} class="btn btn-small">Attended Transfer</button>
                         {{/each}}
                       </p>
                     {{/if}}
-- 
cgit v1.2.3


From 14da4be11fe13d4fcd55143c39b73c0d086b901b Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 25 Jun 2013 13:09:07 +0200
Subject: Show transfer buttons only for switchable incoming calls.

---
 app/views/switchboards/show.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/views/switchboards/show.html.erb b/app/views/switchboards/show.html.erb
index f3304cf..69b0ed6 100644
--- a/app/views/switchboards/show.html.erb
+++ b/app/views/switchboards/show.html.erb
@@ -46,11 +46,11 @@
                       {{phoneNumber.number}}
                     </span>
 
-                    {{#if activeCalls.length}}
+                    {{#if dispatchableIncomingCalls.length}}
                       <p>
-                        {{#each activeCall in activeCalls}}
-                          <button {{action transfer_blind activeCall.id phoneNumber.number}} class="btn btn-small">Transfer</button>
-                          <button {{action transfer_attended activeCall.id phoneNumber.number}} class="btn btn-small">Attended Transfer</button>
+                        {{#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}}
-- 
cgit v1.2.3


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/views/switchboards/show.html.erb | 40 ++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 15 deletions(-)

(limited to 'app/views')

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>
-- 
cgit v1.2.3