* VRFS-943 - warn user about read only volume

web/app/assets/javascripts/clientUpdate.js

@@ -175,7 +175,10 @@
 
       // check if method exists at all for migration purposes
       if(context.jamClient.IsAppInWritableVolume && os == "MacOSX" && !context.jamClient.IsAppInWritableVolume()) {
-        context.JK.Banner.showAlert("JamKazam Application Needs Moving!", $('#template-app-in-read-only-volume').html());
+        context.JK.Banner.showAlert(
+          { title: "JamKazam Needs Moving!",
+            buttons: [{name: 'SHUTDOWN APPLICATION', click: function() {context.jamClient.ShutdownApplication()}} ],
+            html: $('#template-app-in-read-only-volume').html()});
         return;
       }
 

web/app/assets/javascripts/fakeJamClient.js

@@ -35,12 +35,9 @@
             context.window.open(href);
         }
         
-        function RestartApplication() {
-
-        }
-        function FTUECancel() {
-
-        }
+        function RestartApplication() {}
+        function ShutdownApplication() {}
+        function FTUECancel() {}
         function FTUEGetMusicProfileName() {
           return "default"
         }
@@ -269,7 +266,7 @@
         function GetOS() { return 100000000; }
         function GetOSAsString() {
             return "Win32";
-            //return "Mac";
+            //return "MacOSX";
         }
 
         function LatencyUpdated(map) { dbg('LatencyUpdated:' + JSON.stringify(map)); }
@@ -924,6 +921,7 @@
 
         this.OpenSystemBrowser = OpenSystemBrowser;
         this.RestartApplication = RestartApplication;
+        this.ShutdownApplication = ShutdownApplication;
 
         // Websocket/Auth sessions
         this.OnLoggedIn = OnLoggedIn;

web/app/assets/stylesheets/client/banner.css.scss

@@ -31,6 +31,11 @@
     list-style:disc;
     margin-left:20px;
   }
+
+  ol {
+    list-style:decimal;
+  }
+
   li {
     margin: 15px 12px 15px 36px;
   }
@@ -47,5 +52,14 @@
     line-height:20px;
     margin-bottom:10px;
   }
+
+  .template-app-in-read-only-volume {
+    .download-dmg {
+      em {
+        font-style:italic;
+        margin-left:20px;
+      }
+    }
+  }
 }
 

web/app/views/clients/_banner.html.erb

@@ -21,19 +21,23 @@
 </div>
 
 <script type="text/template" id="template-app-in-read-only-volume">
-  <p> The JamKazam application is running in a read-only volume.  This prevents the automatic update feature
-  from succeeding, and may cause other issues because it is not a supported configuration.</p>
-  <p> The most common cause of this is because, after opening the JamKazam.dmg, you then selected the JamKazam application icon
-  directly from the folder that showed.  Instead, do this to properly install JamKazam
+  <div class="template-app-in-read-only-volume">
+  <p> The JamKazam application is running in a read-only volume.  This stops the automatic update feature
+  from working, and may cause other issues because it is not a supported configuration.</p>
+  <p> So let's fix it.  Don't worry--it's easy to do.  Please read on.</p>
+  <p> First, here's almost certainly what happened to cause this problem: after JamKazam.dmg was downloaded, it was then double-clicked and a window opened showing the contents of the dmg.
+  The JamKazam application icon was double-clicked inside that opened window.  Unfortunately, that isn't OK.</p>
+  <p>Instead, do this to move JamKazam to a good location, and run it from there:</p>
   <ol>
-    <li>Download the latest mac installer from the <a href="/downloads">Downloads</a> page.</li>
-    <li>Double-click the downloaded '.dmg' file.</li>
-    <li>In the resulting screen, drag the JamKazam icon to the Applications folder</li>
-    <li>Double-click the Applications folder</li>
-    <li>If you are still running the JamKazam application as you go through these steps, you will need to stop it before executing the last step</li>
-    <li>Find the JamKazam application in the Applications folder, and launch it!</li>
+    <li class="download-dmg">Download the latest mac installer from the <a href="/downloads">Downloads</a> page.<br/><em>(the download will have a filename ending in .dmg)</em></li>
+    <li>Double-click the downloaded dmg file to open it.</li>
+    <li>In the resulting screen, drag the JamKazam icon to the Applications folder. It will show a progress bar as it copies.</li>
+    <li>Double-click the Applications folder to go into it.</li>
+    <li>If you are still running the JamKazam application, you will need to stop it before executing the last step.</li>
+    <li>Find the JamKazam application in the Applications folder, and double-click the icon to launch it!</li>
   </ol>
+<!---<p>The following animation shows the the steps, after once you've downloaded the JamKazam '.dmg'.</p>-->
 
-  <!---<p>The following animation shows the the steps, after once you've downloaded the JamKazam '.dmg'.</p>-->
+  </div>
 
 </script>

web/app/views/clients/index.html.erb

@@ -204,7 +204,6 @@
 
             // This is a helper class with a singleton. No need to instantiate.
             JK.GenreSelectorHelper.initialize();
-            JK.Banner.initialize();
 
             var inviteMusiciansUtil1 = new JK.InviteMusiciansUtil(JK.app);
             inviteMusiciansUtil1.initialize(friendSelectorDialog);
@@ -293,7 +292,9 @@
           return;
         }
 
-        // Let's get things rolling...
+        JK.Banner.initialize();
+
+      // Let's get things rolling...
         if (JK.currentUserId) {
 
             JK.app.initialize();