Adding of minimize size for other popups

Author: Valerii Malkov

app/view/sdl/PopUp.js

@@ -42,13 +42,15 @@ SDL.PopUp = Em.ContainerView.extend(
       'backButton'
     ],
     classNameBindings: [
-      'this.active:active_state:inactive_state'
+      'this.active:active_state:inactive_state',
+      'minimalSize'
     ],
     popUpId: 0,
     /**
      * Callback function to return result of made action by user
      */
     callback: null,
+    minimalSize: false,
     content: 'Title',
     active: false,
     timer: null,

css/general.css

@@ -195,7 +195,7 @@ div {
     opacity: 1;
     display: block;
     z-index: 10000;
-    left: 480px;
+    left: 8px;
     width: 300px;
     height: 217px;
     top: 56px;

css/sdl.css

@@ -1136,11 +1136,23 @@
 }
 
 .PopUp {
-    left: 200px;
-    width: 400px;
-    height: 245px;
+    left: 480px;
+    width: 300px;
+    height: 215px;
     z-index: 2;
-    top: 110px;
+    top: 57px;
+    -webkit-transition: opacity 1s ease-in-out;
+    background-color: black;
+    border: #A6A6A6 solid 2px;
+    border-radius: 6px;
+}
+
+.PopUp.minimal-size {
+    left: 8px;
+    width: 300px;
+    height: 150px;
+    z-index: 2;
+    top: 278px;
     -webkit-transition: opacity 1s ease-in-out;
     background-color: black;
     border: #A6A6A6 solid 2px;
@@ -1150,19 +1162,41 @@
 .PopUp .text {
     top: 41px;
     left: 5px;
-    width: 390px;
+    width: 295px;
     height: 120px;
     line-height: 20px;
     position: absolute;
     overflow: hidden;
     text-align: center;
     text-overflow: ellipsis;
+    overflow: auto;
+}
+
+.PopUp.minimal-size .text {
+    top: 15px;
+    left: 12px;
+    width: 280px;
+    height: 70px;
+    line-height: 20px;
+    position: absolute;
+    overflow: hidden;
+    text-align: center;
+    text-overflow: ellipsis;
+    overflow: auto;
+}
+
+.PopUp.minimal-size .OkButton {
+    top: 93px;
+    left: 5px;
+    width: 140px;
+    border: 1px solid #393939;
+    text-align: center;
 }
 
 .PopUp .OkButton {
-    top: 190px;
+    top: 160px;
     left: 5px;
-    width: 190px;
+    width: 140px;
     border: 1px solid #393939;
     text-align: center;
 }
@@ -1174,9 +1208,17 @@
 }
 
 .PopUp .CancelButton {
-    top: 190px;
-    left: 205px;
-    width: 190px;
+    top: 160px;
+    left: 150px;
+    width: 140px;
+    border: 1px solid #393939;
+    text-align: center;
+}
+
+.PopUp.minimal-size .CancelButton {
+    top: 93px;
+    left: 150px;
+    width: 140px;
     border: 1px solid #393939;
     text-align: center;
 }

ffw/BasicCommunicationRPC.js

@@ -138,6 +138,9 @@ FFW.BasicCommunication = FFW.RPCObserver
           .subscribeToNotification(this.onSDLConsentNeededNotification);
         this.onResumeAudioSourceSubscribeRequestID = this
           .subscribeToNotification(this.onResumeAudioSourceNotification);
+        this.onServiceUpdateNotificationSubscribeRequestID = this.client
+          .subscribeToNotification(this.onServiceUpdateNotification);
+        this
         setTimeout(function() {
           FFW.BasicCommunication.OnSystemTimeReady();
         }, 500);
@@ -171,6 +174,8 @@ FFW.BasicCommunication = FFW.RPCObserver
           .unsubscribeFromNotification(this.onSDLConsentNeededNotification);
         this.onResumeAudioSourceUnsubscribeRequestID = this.client
           .unsubscribeFromNotification(this.onResumeAudioSourceNotification);
+        this.onServiceUpdateNotificationUnsubscribeRequestID = this.client
+          .unsubscribeFromNotification(this.onServiceUpdateNotification);
       },
       /**
        * Client disconnected.
@@ -299,11 +304,18 @@ FFW.BasicCommunication = FFW.RPCObserver
       onRPCNotification: function(notification) {
         Em.Logger.log('FFW.BasicCommunicationRPC.onRPCNotification');
         this._super();
+        if (notification.method == this.onServiceUpdateNotification) {
+          SDL.ServiceUpdatePopUp.activate(notification.params.serviceType,
+            notification.params.serviceEvent,
+            notification.params.reason);
+        }
         if (notification.method == this.onFileRemovedNotification) {
           SDL.SDLModel.onFileRemoved(notification.params);
         }
         if (notification.method == this.onStatusUpdateNotification) {
-          SDL.PopUp.create().appendTo('body').popupActivate(
+          var popUp = SDL.PopUp.create().appendTo('body');
+          popUp.set('minimalSize',SDL.ServiceUpdatePopUp.active);
+          popUp.popupActivate(
             'onStatusUpdate Notification: ' + notification.params.status
           );
           var messageCode = '';