FS-8183 Move google ClientID to config file where it belongs

diff --git a/html5/verto/verto_communicator/src/partials/login.html b/html5/verto/verto_communicator/src/partials/login.html
index 58ac2e9f9c7cf58a5fda38151cd8b9e685fc21f3..5a0c03c7ddd5d11c245945dc67b1850741762312 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/login.html
+++ b/html5/verto/verto_communicator/src/partials/login.html
@@ -51,7 +51,7 @@
             <div><a style="margin-top: 13px;" href="" ng-click="advanced = !advanced" class="pull-left">Settings</a></div>
            <div><button type="submit" class="btn btn-success" ng-click="(form.$valid && login())">Login</button></div>
            <div ng-if="googlelogin" class="googlelogin">
-             <google-plus-signin clientid="675954646436-cuejgg314a32s2c76dnc2n7ier3kbudu.apps.googleusercontent.com" class="center">
+             <google-plus-signin clientid="{{src/partials/login.html}}" class="center">
              </google-plus-signin>
            </div>
           </div>

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/LoginController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/LoginController.js
index 427789861802b233703a3000134870de3b548de9..bae60ac31edb1e26347726ca3037b087f3d69f98 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/LoginController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/LoginController.js
@@ -22,6 +22,7 @@
                                console.debug("googlelogin: " + data.googlelogin);
                                if (data.googlelogin){
                                        $scope.googlelogin = data.googlelogin;
+                                       $scope.googleclientid = data.googleclientid;
                                }
 
                                angular.extend(verto.data, data);