From 83b6383fc1326c9eee4427af5f967e953afd7ab3 Mon Sep 17 00:00:00 2001
From: Jonathon Wilson <Jonathon.Wilson@demandmedia.com>
Date: Sat, 14 Sep 2013 11:27:03 -0600
Subject: [PATCH] VRFS-648. Add Resync button to session screen.

---
 app/assets/images/content/icon_resync.png      | Bin 0 -> 320 bytes
 app/assets/javascripts/session.js              |  13 +++++++++++++
 app/assets/stylesheets/client/session.css.scss |   2 +-
 app/views/clients/_session.html.erb            |   6 +++++-
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/images/content/icon_resync.png

diff --git a/app/assets/images/content/icon_resync.png b/app/assets/images/content/icon_resync.png
new file mode 100644
index 0000000000000000000000000000000000000000..86ed62630fa2ee7f5b2482bf5660fa8c191b36e5
GIT binary patch
literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq000aC000gM1^@s68@>JP0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy;z>k7RCwBA`2YVu0}k8(#G2^h*c37X
zF%J;`{0{*!P%#V*Oh6m}#7BYn`+roh6o@&IHE=@};seGo4Iq;bBT2jk;@Lp_5y}VA
zCdf{5L{hv7W;GCh1>!wG%!lsjRZzts1-wX-GEm!50)>TvfkB@E0*(UlX9fg#g2ZM7
zVm2WD%LF8TKn3|2aDzoqb%#OLOhod7DwcRrK$2es5>P=Bcmc%vK+Fuq+CcmSNnQ(P
zN;O)Tzkp(7(19Frpr|jv6KUnJ<N+p-fCLZ+1F=02{|4d{K)eQspTiUY1Q-Ao($n_h
SXM&~x0000<MNUMnLSTX`2X&?Z

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/session.js b/app/assets/javascripts/session.js
index 6df8dc70d..04db7f786 100644
--- a/app/assets/javascripts/session.js
+++ b/app/assets/javascripts/session.js
@@ -779,7 +779,20 @@
             }
         }
 
+        function sessionResync(evt) {
+            evt.preventDefault();
+            var response = context.jamClient.FTUESave(true);
+            if (response) {
+                app.notify({
+                  "title": "Error",
+                  "text": response,
+                  "icon_url": "/assets/content/icon_alert_big.png"});
+            }
+            return false;
+        }
+
         function events() {
+            $('#session-resync').on('click', sessionResync);
             $('#session-contents').on("click", '[action="delete"]', deleteSession);
             $('#tracks').on('click', 'div[control="mute"]', toggleMute);
 
diff --git a/app/assets/stylesheets/client/session.css.scss b/app/assets/stylesheets/client/session.css.scss
index 833b3f3ad..fcd27f93b 100644
--- a/app/assets/stylesheets/client/session.css.scss
+++ b/app/assets/stylesheets/client/session.css.scss
@@ -2,7 +2,7 @@
 
 [layout-id="session"] {
 
-    .settings {
+    .resync {
         margin-left:15px;
     }
 
diff --git a/app/views/clients/_session.html.erb b/app/views/clients/_session.html.erb
index d21473bf8..af1489925 100644
--- a/app/views/clients/_session.html.erb
+++ b/app/views/clients/_session.html.erb
@@ -10,7 +10,11 @@
 
     <!-- session controls -->
     <div id="session-controls">
-        <a class="button-grey settings left" layout-link="session-settings">
+        <a class="button-grey resync left" id="session-resync">
+            <%= image_tag "content/icon_resync.png", {:align => "texttop", :height => 14, :width => 12} %>
+            RESYNC
+        </a>
+        <a class="button-grey left" layout-link="session-settings">
             <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %>
             SETTINGS
         </a>