Yangman - change loader

Change-Id: I49b0ec03a26356984969eff2ff42186af993350c
Signed-off-by: Stanislav Jamrich <sjamrich@cisco.com>

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/leftpanel/modules-tab.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/leftpanel/modules-tab.tpl.html
index 3e4ca9019461136fcc5067e3412b879cc096fa12..79e051fa8eee4c84dbf3a506afaded6e9c6bb2b5 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/leftpanel/modules-tab.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/leftpanel/modules-tab.tpl.html
@@ -1,6 +1,6 @@
-<section ng-controller="ModulesListCtrl as modulesList" class="h100">
+<section ng-cloak ng-controller="ModulesListCtrl as modulesList" class="h100">
     <!-- searching -->
-    <section class="yangmanModule__left-panel__search" ng-hide="modulesList.showLoadingBox">
+    <section class="yangmanModule__left-panel__search">
         <md-input-container layout="row" md-no-float class="modules-list-search">
             <md-icon class="material-icons">search</md-icon>
             <input class="ng-pristine ng-valid ng-touched"
@@ -30,12 +30,13 @@
     <md-list ng-cloak class="yangmanModule__modules-list scrollableY">
 
         <!-- Loading box -->
-        <div class="yangmanModule__left-panel__loading-container" ng-show="modulesList.showLoadingBox">
-            <md-progress-linear md-mode="query"></md-progress-linear>
-            <div class="bottom-block">
-                <span>{{ 'YANGMAN_LOADING_MODULES' | translate }}</span>
-            </div>
-        </div>
+        <!--<div class="yangmanModule__left-panel__loading-container" ng-show="modulesList.showLoadingBox">-->
+            <!--<md-progress-linear md-mode="query"></md-progress-linear>-->
+            <!--<div class="bottom-block">-->
+                <!--<span>{{ 'YANGMAN_LOADING_MODULES' | translate }}</span>-->
+            <!--</div>-->
+        <!--</div>-->
+        <md-progress-linear md-mode="indeterminate" ng-show="modulesList.showLoadingBox"></md-progress-linear>
 
         <!-- Mount point title -->
         <section ng-show="modulesList.moduleListTitle.length">

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/detail.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/detail.tpl.html
index d18e9d2e556425d20bd1bbca91dd302e90ae9012..0e03c2119649e6366fd1ec386e8eb988632e335c 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/detail.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/detail.tpl.html
@@ -1,22 +1,23 @@
 <!-- Header -->
 <section md-whiteframe="1"
          class="yangmanModule__right-panel__header"
-style="margin-bottom: 0px!important;"
-         ng-include src="globalViewPath + 'rightpanel/request-header.tpl.html'"></section>
+         style="margin-bottom: 0px!important;"
+         ng-include src="globalViewPath + 'rightpanel/request-header.tpl.html'">
+</section>
 <!-- /Header -->
 
-<section class="yangmanModule__right-panel__request-progress">
-    <div class="yangmanModule__right-panel__request-progress__loading-container" ng-show="main.executingRequestProgress">
-        <md-progress-linear md-mode="query"></md-progress-linear>
-        <div class="bottom-block">
-            <span>{{ 'YANGMAN_EXECUTING_REQUEST' | translate }}...</span>
-        </div>
-    </div>
-</section>
+<!--<section class="yangmanModule__right-panel__request-progress">-->
+    <!--<div class="yangmanModule__right-panel__request-progress__loading-container">-->
+        <!--<md-progress-linear md-mode="query"></md-progress-linear>-->
+        <!--<div class="bottom-block">-->
+            <!--<span>{{ 'YANGMAN_EXECUTING_REQUEST' | translate }}...</span>-->
+        <!--</div>-->
+    <!--</div>-->
+<!--</section>-->
 
 <!-- Form section -->
 <section class="yangmanModule__right-panel__form bottom-content"
-         ng-show="rightPanelSection === 'form' && !main.executingRequestProgress"
+         ng-show="rightPanelSection === 'form'"
          ng-if="node"
          ng-controller="YangFormCtrl as yangForm">
     <div ng-show="yangForm.errorMsg"><p class="error">{{ yangForm.errorMsg }}</p></div>
@@ -26,7 +27,8 @@ style="margin-bottom: 0px!important;"
 
 <!-- JSON section -->
 <section class="yangmanModule__right-panel__req-data bottom-content"
-         ng-show="rightPanelSection === 'req-data' && !main.executingRequestProgress">
+         ng-cloak
+         ng-show="rightPanelSection === 'req-data'">
 
     <!-- Sent data -->
     <div ng-controller="RequestDataCtrl as requestData"

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
index 94655fc229285d001844a8bbb0637322628af24b..a779241b0cc5ba15d83bd582ff12ff048b121f07 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
@@ -144,3 +144,4 @@
         </md-content>
     </section>
 </md-content>
+<md-progress-linear md-mode="indeterminate" ng-show="main.executingRequestProgress"></md-progress-linear>

diff --git a/modules/yangman-resources/src/main/resources/yangman/yangman.less b/modules/yangman-resources/src/main/resources/yangman/yangman.less
index b49ae10fccbe1e22899ac505c670645c37e92fb6..3ccf1abf464838cef58fc6476d062c21a097655b 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/yangman.less
+++ b/modules/yangman-resources/src/main/resources/yangman/yangman.less
@@ -461,6 +461,7 @@ md-dialog{
         .bottom-content{
             height: calc(~'100% - 195px');
             overflow-y: auto;
+            margin-top: 25px;
 
             .codemirror-container{
                 height: 100%;
@@ -478,6 +479,10 @@ md-dialog{
                 }
             }
 
+            md-progress-linear{
+                margin-top: -5px;
+            }
+
             md-input-container{
                 margin: 0;
             }
@@ -511,35 +516,6 @@ md-dialog{
             }
         }
 
-        &__request-progress{
-
-            margin-top: 12px;
-            margin-bottom: 12px;
-
-            &__loading-container {
-                display: block;
-                position: relative;
-                border: 2px solid @infoBoxBorderColor;
-                transition: opacity  0.1s linear;
-                border-top: 0px;
-                margin: 0;
-
-                .bottom-block {
-                    display: block;
-                    position: relative;
-                    background-color: @infoBoxBackColor;
-                    height: 85px;
-
-                    > span {
-                        display: inline-block;
-                        margin-top: 10px;
-                        padding: 25px;
-                        font-size: 0.9em;
-                    }
-                }
-            }
-        }
-
         &__req-data{
 
             &__header{
@@ -572,6 +548,7 @@ md-dialog{
                         vertical-align: top;
                     }
                 }
+
             }
 
             > div{