styling notification (#225)

* styling notification making network create non-blocking adding error notifications error notification styling Correction Animation removing comments regenerating bundle * fixing icons * comments fixed comments fixed regenerating bundle * network delete fix
contiv · Dec 9, 2016 · b66bbca · b66bbca
1 parent f64f0e8
commit b66bbca
Show file tree

Hide file tree

Showing 55 changed files with 1,633 additions and 1,563 deletions.
diff --git a/app/applicationgroups/applicationgroupcreate.html b/app/applicationgroups/applicationgroupcreate.html
@@ -80,9 +80,5 @@
                 </div>
             </div>
         </div>
-
-        <ctv-error *ngIf="showServerError" header="Error creating application group"
-                   [error]="serverErrorMessage">
-        </ctv-error>
     </div>
 </form>
diff --git a/app/applicationgroups/applicationgroupcreatectrl.ts b/app/applicationgroups/applicationgroupcreatectrl.ts
@@ -36,7 +36,6 @@ export class ApplicationGroupCreateComponent {
 
         function resetForm() {
             crudHelperService.stopLoader(applicationGroupCreateCtrl);
-            crudHelperService.hideServerError(applicationGroupCreateCtrl);
             applicationGroupCreateCtrl.applicationGroup = {
                 groupName: '',          // For Group Name
                 networkName: '',        // For Network Name
@@ -61,7 +60,6 @@ export class ApplicationGroupCreateComponent {
     createApplicationGroup(validform: boolean) {
         var applicationGroupCreateCtrl = this;
         if (validform) {
-            applicationGroupCreateCtrl.crudHelperService.hideServerError(applicationGroupCreateCtrl);
             applicationGroupCreateCtrl.crudHelperService.startLoader(applicationGroupCreateCtrl);
             applicationGroupCreateCtrl.applicationGroup.networkName =
                 applicationGroupCreateCtrl.selectedNetwork;
@@ -76,11 +74,11 @@ export class ApplicationGroupCreateComponent {
             applicationGroupCreateCtrl.applicationGroupsModel.create(applicationGroupCreateCtrl.applicationGroup,undefined).then(
                 function successCallback(result) {
                     applicationGroupCreateCtrl.crudHelperService.stopLoader(applicationGroupCreateCtrl);
-                    applicationGroupCreateCtrl.crudHelperService.showNotification("Application Group Created", result.key.toString());
+                    applicationGroupCreateCtrl.crudHelperService.showNotification("Application group: Created", result.key.toString());
                     applicationGroupCreateCtrl.returnToApplicationGroup();
                 }, function errorCallback(result) {
                     applicationGroupCreateCtrl.crudHelperService.stopLoader(applicationGroupCreateCtrl);
-                    applicationGroupCreateCtrl.crudHelperService.showServerError(applicationGroupCreateCtrl, result);
+                    applicationGroupCreateCtrl.crudHelperService.showServerError("Application group: Create failed", result);
                 });
         }
     }

diff --git a/app/applicationgroups/applicationgroupdetails.html b/app/applicationgroups/applicationgroupdetails.html
@@ -66,14 +66,6 @@
                 </button>
             </div>
         </div>
-        <ctv-error *ngIf="((showServerError) && (mode === 'edit'))"
-                   header="Error saving application group"
-                   [error]="serverErrorMessage">
-        </ctv-error>
-        <ctv-error *ngIf="((showServerError) && (mode === 'details'))"
-                   header="Error deleting application group"
-                   [error]="serverErrorMessage">
-        </ctv-error>
     </div>
 </div>
 

diff --git a/app/applicationgroups/applicationgroupdetailsctrl.ts b/app/applicationgroups/applicationgroupdetailsctrl.ts
@@ -38,7 +38,6 @@ export class ApplicationGroupDetailsComponent implements OnInit{
         }
 
         applicationGroupDetailsCtrl.crudHelperService.startLoader(applicationGroupDetailsCtrl);
-        applicationGroupDetailsCtrl.crudHelperService.hideServerError(applicationGroupDetailsCtrl);
 
         applicationGroupDetailsCtrl.applicationGroupsModel.getModelByKey(activatedRoute.snapshot.params['key'], false, 'key')
             .then(function (group) {
@@ -82,32 +81,31 @@ export class ApplicationGroupDetailsComponent implements OnInit{
 
     deleteApplicationGroup() {
         var applicationGroupDetailsCtrl = this;
-        applicationGroupDetailsCtrl.crudHelperService.hideServerError(applicationGroupDetailsCtrl);
         applicationGroupDetailsCtrl.crudHelperService.startLoader(applicationGroupDetailsCtrl);
         applicationGroupDetailsCtrl.applicationGroupsModel.delete(applicationGroupDetailsCtrl.applicationGroup).then(
             function successCallback(result) {
                 applicationGroupDetailsCtrl.crudHelperService.stopLoader(applicationGroupDetailsCtrl);
-                applicationGroupDetailsCtrl.crudHelperService.showNotification("Application Group Deleted", result.toString());
+                applicationGroupDetailsCtrl.crudHelperService.showNotification("Application group: Deleted", result.toString());
                 applicationGroupDetailsCtrl.returnToApplicationGroup();
             }, function errorCallback(result) {
                 applicationGroupDetailsCtrl.crudHelperService.stopLoader(applicationGroupDetailsCtrl);
-                applicationGroupDetailsCtrl.crudHelperService.showServerError(applicationGroupDetailsCtrl, result);
+                applicationGroupDetailsCtrl.crudHelperService.showServerError("Application group: Delete failed", result);
             });
     }
 
     saveApplicationGroup() {
         var applicationGroupDetailsCtrl = this;
-        applicationGroupDetailsCtrl.crudHelperService.hideServerError(applicationGroupDetailsCtrl);
         applicationGroupDetailsCtrl.crudHelperService.startLoader(applicationGroupDetailsCtrl);
 
         applicationGroupDetailsCtrl.applicationGroupsModel.save(applicationGroupDetailsCtrl.applicationGroup).then(
             function successCallback(result) {
                 applicationGroupDetailsCtrl.crudHelperService.stopLoader(applicationGroupDetailsCtrl);
-                applicationGroupDetailsCtrl.crudHelperService.showNotification("Application Group Updated", result.key.toString());
+                applicationGroupDetailsCtrl.crudHelperService.showNotification("Application group: Updated", result.key.toString());
                 applicationGroupDetailsCtrl.returnToApplicationGroupDetails();
             }, function errorCallback(result) {
                 applicationGroupDetailsCtrl.crudHelperService.stopLoader(applicationGroupDetailsCtrl);
-                applicationGroupDetailsCtrl.crudHelperService.showServerError(applicationGroupDetailsCtrl, result);
+                applicationGroupDetailsCtrl.crudHelperService.showServerError("Application group: Update failed", result);
+
             });
     }
 }
diff --git a/app/appprofiles/appprofilecreate.component.ts b/app/appprofiles/appprofilecreate.component.ts
@@ -21,7 +21,6 @@ export class AppProfileCreateComponent {
 
         function resetForm() {
             crudHelperService.stopLoader(component);
-            crudHelperService.hideServerError(component);
             component.newAppProfile = {
                 key: '',
                 appProfileName: '',
@@ -45,20 +44,19 @@ export class AppProfileCreateComponent {
         var component = this;
         if (formvalid) {
             this.crudHelperService.startLoader(this);
-            this.crudHelperService.hideServerError(this);
             component.newAppProfile.key = this.appProfilesModel.generateKey(this.newAppProfile);
             this.appProfilesModel.create(component.newAppProfile, undefined)
                 .then((result) => {
                     component.ngZone.run(() => {
                         component.crudHelperService.stopLoader(component);
-                        component.crudHelperService.showNotification("Application Profile Created", result.key.toString());
+                        component.crudHelperService.showNotification("Application profile: Created", result.key.toString());
                     });
                     component.returnToAppProfiles();
                 }, (error) => {
                     component.ngZone.run(() => {
                         component.crudHelperService.stopLoader(component);
                     });
-                    component.crudHelperService.showServerError(component, error);
+                    component.crudHelperService.showServerError("Application profile: Create failed", error);
                 });
         }
     }

diff --git a/app/appprofiles/appprofilecreate.html b/app/appprofiles/appprofilecreate.html
@@ -44,8 +44,5 @@
                 </div>
             </div>
         </div>
-
-        <ctv-error *ngIf="showServerError" header="Error creating application profile" [error]="serverErrorMessage">
-        </ctv-error>
     </div>
 </form>
diff --git a/app/appprofiles/appprofiledetails.component.ts b/app/appprofiles/appprofiledetails.component.ts
@@ -30,7 +30,6 @@ export class AppProfileDetailsComponent {
         }
 
         component.crudHelperService.stopLoader(component);
-        component.crudHelperService.hideServerError(component);
 
         component.appProfilesModel.getModelByKey(activatedRoute.snapshot.params['key'], false, 'key')
             .then(function (appProfile) {
@@ -58,41 +57,39 @@ export class AppProfileDetailsComponent {
 
     deleteAppProfile() {
         var component = this;
-        component.crudHelperService.hideServerError(component);
         component.crudHelperService.startLoader(component);
         component.appProfilesModel.delete(component.appProfile).then(
             function successCallback(result) {
                 component.ngZone.run(() => {
                     component.crudHelperService.stopLoader(component);
-                    component.crudHelperService.showNotification("Application Profile Deleted", result);
+                    component.crudHelperService.showNotification("Application profile: Deleted", result);
                 });
                 component.returnToAppProfile();
             }, function errorCallback(result) {
                 component.ngZone.run(() => {
                     component.crudHelperService.stopLoader(component);
                 });
-                component.crudHelperService.showServerError(component, result);
+                component.crudHelperService.showServerError("Application profile: Delete failed", result);
             });
     }
 
     saveAppProfile(formvalid: boolean) {
         var component = this;
         if (formvalid) {
-            component.crudHelperService.hideServerError(component);
             component.crudHelperService.startLoader(component);
 
             component.appProfilesModel.save(component.appProfile).then(
                 function successCallback(result) {
                     component.ngZone.run(() => {
                         component.crudHelperService.stopLoader(component);
-                        component.crudHelperService.showNotification("Application Profile Updated", result.key.toString());
+                        component.crudHelperService.showNotification("Application profile: Updated", result.key.toString());
                     });
                     component.returnToAppProfileDetails();
                 }, function errorCallback(result) {
                     component.ngZone.run(() => {
                         component.crudHelperService.stopLoader(component);
                     });
-                    component.crudHelperService.showServerError(component, result);
+                    component.crudHelperService.showServerError("Application profile: Update failed", result);
                 });
         }
     }

diff --git a/app/appprofiles/appprofiledetails.html b/app/appprofiles/appprofiledetails.html
@@ -76,16 +76,9 @@ <h4 class="ui header" style="margin-top: 40px">Application Groups</h4>
                     </button>
                 </div>
             </div>
-            <ctv-error *ngIf="((showServerError) && (mode === 'edit'))"
-                       header="Error saving application profile"
-                       [error]="serverErrorMessage">
-            </ctv-error>
         </form>
-        <ctv-error *ngIf="((showServerError) && (mode === 'details'))"
-                   header="Error deleting application profile"
-                   [error]="serverErrorMessage">
-        </ctv-error>
     </div>
 
 </div>
 
+</div>
diff --git a/app/bower_components/semantic-ui/dist/components/icon.css b/app/bower_components/semantic-ui/dist/components/icon.css
@@ -507,12 +507,16 @@ i.icons .inverted.corner.icon {
 }
 .icon.info .path2:before {
   content: "\e93f";
-  margin-left: -1em;
+  position: absolute;
+  right: 3px;
+  top: 3px;
   color: #ffffff;
 }
 .icon.info .path3:before {
   content: "\e940";
-  margin-left: -1em;
+  position: absolute;
+  top: 3px;
+  right: 3px;
   color: #ffffff;
 }
 .icon.major .path1:before {
@@ -535,12 +539,16 @@ i.icons .inverted.corner.icon {
 }
 .icon.minor .path2:before {
   content: "\e945";
-  margin-left: -1em;
+  position: absolute;
+  right: 4px;
+  top: 4px;
   color: #ffffff;
 }
 .icon.minor .path3:before {
   content: "\e946";
-  margin-left: -1em;
+  position: absolute;
+  top: 4px;
+  right: 4px;
   color: #ffffff;
 }
 .icon.pending .path1:before {
@@ -568,7 +576,9 @@ i.icons .inverted.corner.icon {
 }
 .icon.ready .path2:before {
   content: "\e94c";
-  margin-left: -1em;
+  position: absolute;
+  right: 3px;
+  top: 4px;
   color: #ffffff;
 }
 .icon.soaking:before {
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,8 +44,5 @@ @@
                     </div>
                 </div>
             </div>
-            <ctv-error *ngIf="showServerError" header="Error creating application profile" [error]="serverErrorMessage">
-            </ctv-error>
         </div>
     </form>