some ui changes

reqtool/ReqmanAngular11/src/app/components/boilerplate-details/boilerplate-details.component.html

@@ -10,10 +10,9 @@
 </nav>
 <div>
     <div *ngIf="currentboilerplate.id" class="edit-form">
-      <h4>Boilerplate</h4>
       <form>
-        <div class="form-group">
-          <label for="title">Title</label>
+        <div class="form-group" style="width: 63%;">
+          <label for="title">Boilerplate title</label>
           <input
             type="text"
             class="form-control"
@@ -30,7 +29,7 @@
               >Prefix
               </mat-checkbox>
           </form>
-          <div *ngIf="this.currentboilerplate.has_prefix">
+          <div *ngIf="this.currentboilerplate.has_prefix" style="margin-left: 50px;">
             <app-prefix-details></app-prefix-details>
             </div>
         </div>
@@ -43,7 +42,7 @@
               >Main
               </mat-checkbox>
           </form>
-          <div *ngIf="this.currentboilerplate.has_main">
+          <div *ngIf="this.currentboilerplate.has_main" style="margin-left: 50px;">
             <app-main-details></app-main-details>
           </div>
         </div>
@@ -56,23 +55,25 @@
                 >Suffix
                 </mat-checkbox>
             </form>
-            <div *ngIf="this.currentboilerplate.has_suffix">
+            <div *ngIf="this.currentboilerplate.has_suffix" style="margin-left: 50px;">
               <app-suffix-details></app-suffix-details>
           </div>
         </div>
       </form>
-  
-      <button class="badge badge-danger mr-2" (click)="deleteBoilerplate()">
-        Delete Boilerplate
-      </button>
-  
-      <button
-        type="submit"
-        class="badge badge-success mb-2"
-        (click)="updateBoilerplate()"
-      >
-        Update Boilerplate
-      </button>
+      <div class="list row">
+        <div fxFlex fxLayout fxHide.xs fxLayoutAlign="start">
+            <input class="btn btn-success" 
+                      type="button" 
+                      value=" Update Boilerplate"
+                      (click)="updateBoilerplate()"/>           
+          </div>
+          <div fxFlex fxLayout fxHide.xs fxLayoutAlign="start">
+            <input class="btn btn-warning" 
+                      type="button" 
+                      value="Delete Boilerplate"
+                      (click)="deleteBoilerplate()"/>
+          </div>
+        </div>
       <p>{{ message }}</p>
     </div>
     <!---->

reqtool/ReqmanAngular11/src/app/components/main-details/main-details.component.html

@@ -56,6 +56,8 @@
           </mat-form-field>
         </form>
       </div>
+</div>
+<div class="form-row">
       <div class="col">
         <form class="form-group form-inline">
           <mat-form-field class="example-full-width">
@@ -141,6 +143,8 @@
           </mat-form-field>
         </form>
       </div>
+</div>
+<div class="form-row">
       <div class="col">
         <form class="form-group form-inline">
           <mat-form-field class="example-full-width">
@@ -180,12 +184,9 @@
         </form>
       </div>
       <div class="col">
-        <button
-          type="submit"
-          class="badge badge-success mb-2"
-          (click)="updateMain()"
-        >
-          Update Main
-        </button>
+        <input class="btn btn-success" 
+                type="button" 
+                value="Update Main"
+                (click)="updateMain()"/>
       </div>
 </div>
\ No newline at end of file

reqtool/ReqmanAngular11/src/app/components/main-details/main-details.component.scss

-example-full-width {
+.example-full-width {
     width: 100%;
-}
\ No newline at end of file
+  }
+  .mat-autocomplete {
+    width: 100%; 
+  }
\ No newline at end of file

reqtool/ReqmanAngular11/src/app/components/prefix-details/prefix-details.component.html

@@ -37,6 +37,8 @@
       </mat-form-field>
     </form>
     </div>
+</div>
+<div class="form-row">
     <div class="col">
       <form class="example-form form-inline">
         <mat-form-field>
@@ -56,6 +58,8 @@
         </mat-form-field>
       </form>
       </div>
+</div>
+<div class="form-row">
       <div class="col">
         <form class="example-form form-inline">
           <mat-form-field>
@@ -97,13 +101,10 @@
           </form>
           </div>
     <div class="col">
-      <button
-        type="submit"
-        class="badge badge-success mb-2"
-        (click)="updatePrefix()"
-      >
-        Update Prefix
-      </button>
+      <input class="btn btn-success" 
+                type="button" 
+                value="Update Prefix"
+                (click)="updatePrefix()"/>
     </div>
     </div>
 

reqtool/ReqmanAngular11/src/app/components/suffix-details/suffix-details.component.html

@@ -65,12 +65,9 @@
         </form>
       </div>
       <div class="col">
-        <button
-          type="submit"
-          class="badge badge-success mb-2"
-          (click)="updateSuffix()"
-        >
-          Update Suffix
-        </button>
+        <input class="btn btn-success" 
+                type="button" 
+                value="Update Suffix"
+                (click)="updateSuffix()"/>
       </div>
 </div>
\ No newline at end of file

reqtool/reqman/api/reqman/apps/reqtool/rest_api/services/parse_ontologies.py

@@ -65,7 +65,10 @@ def get_instances(keyword):
                 spl = s.split("#")
                 uri = spl[len(spl) - 2].split("/")
                 out_list.append(spl[len(spl) - 1])
-    return tuple((str(keywordspl[len(keywordspl)-1]+" : "+n), str(keywordspl[len(keywordspl)-1]+" : "+n) ) for n in (out_list))
+                #new code
+                out_list.append(extra)
+    #return tuple((str(keywordspl[len(keywordspl)-1]+" : "+n), str(keywordspl[len(keywordspl)-1]+" : "+n) ) for n in (out_list))
+    return tuple((str(out_list[n+1]+" : "+out_list[n]), str(out_list[n+1]+" : "+out_list[n]) ) for n in range(0, len(out_list), 2))
 
 # A list with the values and the file that is the instance
 out_list = []