Optimized Compnents' Layout

Issue-ID: HOLMES-150

Change-Id: I47b398069a976cd3df9a85554c72cc4be75b251f
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

1 files changed, 83 insertions, 82 deletions

diff --git a/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html b/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html
index f5158b9..61535fc 100644
--- a/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html
+++ b/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html
@@ -13,137 +13,138 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<div class="container" style="margin-top: 20px">
+<div class="container-fluid" style="padding: 40px 55px 0 55px">
     <form #ruleForm="ngForm" class="form-group row" (submit)="onSubmit(ruleName)">
         <div class="form-body">
-            <div class="row form-group col-xs-12 ">
-                <label for="userName" class="col-xs-2 col-form-label labelstyle">
-                        <span>{{"field_rule_name_Add_Page"|translate}}</span>
-                        <span style="color: red">*</span>
-                    </label>
-                <div class="col-xs-6" style="margin-left: -100px">
-                    <input class="form-control ng-pristine ng-untouched ng-invalid ng-invalid-required" style="width: 60%" type="text" name="rulename"
-                        [(ngModel)]="queryRule.ruleName" id="ruleNameInput" readonly="{{addBottonStatus}}" #ruleName="ngModel"
-                        required>
+            <div class="row form-group">
+                <label for="userName" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+                    <span>{{"field_rule_name_Add_Page"|translate}}</span>
+                    <span style="color: red">*</span>
+                </label>
+                <div class="col-xs-5 col-sm-6">
+                    <input class="form-control ng-pristine ng-untouched ng-invalid ng-invalid-required" type="text" name="rulename" [(ngModel)]="queryRule.ruleName"
+                        id="ruleNameInput" readonly="{{addBottonStatus}}" #ruleName="ngModel" required>
                 </div>
             </div>
 
-            <div class="row form-group col-xs-12">
-                <label for="userName" class="col-xs-2 col-form-label labelstyle">
-                        <span>{{"field_description"|translate}}</span>
-                    </label>
-                <div class="col-xs-6" style="margin-left: -100px">
-                    <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" style="width: 60%" type="text"
-                        [(ngModel)]="queryRule.loopControlName" name="description">
+            <div class="row form-group">
+                <label for="controlLoopName" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+                    <span>{{"field_controlLoopName"|translate}}</span>
+                    <span style="color: red">*</span>
+                </label>
+                <div class="col-xs-5 col-sm-6">
+                    <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" type="text" [(ngModel)]="queryRule.loopControlName"
+                        name="controlLoopName" id="controlLoopName" required>
                 </div>
             </div>
 
-            <div class="row form-group col-xs-12">
-                <label for="userName" class="col-xs-2 col-form-label labelstyle">
-                        <span>{{"field_description"|translate}}</span>
-                    </label>
-                <div class="col-xs-6" style="margin-left: -100px">
-                    <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" style="width: 60%" type="text"
-                        [(ngModel)]="queryRule.description" name="description">
+            <div class="row form-group">
+                <label for="userName" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+                    <span>{{"field_description"|translate}}</span>
+                </label>
+                <div class="col-xs-5 col-sm-6">
+                    <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" type="text" [(ngModel)]="queryRule.description"
+                        name="description">
                 </div>
             </div>
 
-            <div id="state" class="row form-group col-xs-12">
-                <label class="col-xs-2 col-form-label labelstyle">
-                         <span>{{"common_status"|translate}}</span>
-                     </label>
+            <div id="state" class="row form-group">
+                <label class="col-xs-2 col-sm-1 col-form-label labelstyle">
+                    <span>{{"common_status"|translate}}</span>
+                </label>
 
-                <div class="col-xs-6" style="margin-left: -113px">
-                    <div *ngIf="queryRule.enabled == 0">
-                        <div class="col-xs-3" >
-                            <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>
-                            <label for="radio1" >{{"common_off"|translate}}</label>
+                <div class="col-xs-10 col-sm-11">
+                    <div class="row">
+                        <div *ngIf="queryRule.enabled == 0">
+                            <div class="col-xs-4 col-sm-2 col-md-1">
+                                <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>
+                                <label for="radio1">{{"common_off"|translate}}</label>
+                            </div>
+                            <div class="col-xs-4 col-sm-2 col-md-1">
+                                <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='1'>
+                                <label for="radio1" (click)="switch()">{{"common_on"|translate}}</label>
+                            </div>
                         </div>
-                        <div class="col-xs-3" >
-                            <input class="magic-radio" type="radio" name="radio"  [(ngModel)]="queryRule.enabled" value='1'>
-                            <label for="radio1" (click)="switch()">{{"common_on"|translate}}</label>
+                        <div *ngIf="queryRule.enabled == 1">
+                            <div class="col-xs-4 col-sm-2 col-md-1">
+                                <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>
+                                <label for="radio1" (click)="switch()">{{"common_off"|translate}}</label>
+                            </div>
+                            <div class="col-xs-4 col-sm-2 col-md-1">
+                                <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='1'>
+                                <label for="radio1">{{"common_on"|translate}}</label>
+                            </div>
                         </div>
                     </div>
-                    <div *ngIf="queryRule.enabled == 1">
-                        <div class="col-xs-3" >
-                            <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>
-                            <label for="radio1" (click)="switch()">{{"common_off"|translate}}</label>
-                        </div>
-                        <div class="col-xs-3" >
-                            <input class="magic-radio" type="radio" name="radio"  [(ngModel)]="queryRule.enabled" value='1'>
-                            <label for="radio1" >{{"common_on"|translate}}</label>
-                        </div>
-                    </div>             
                 </div>
             </div>
 
-            <div class="row form-group col-xs-12">
-                <label for="" class="col-xs-2 col-form-label labelstyle">
-                        <span>{{"common_file"|translate}}</span>
-                    </label>
-                <div class="col-xs-6" style="margin-left: -100px">
+            <div class="row form-group">
+                <label for="" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+                    <span>{{"common_file"|translate}}</span>
+                </label>
+                <div class="col-xs-6 col-sm-7">
                     <div class="btn-group btn-group-circle">
                         <span class="importDivArea mmlBatchBtnBar">
                             <button class="btn btn-info" id="importBtn" disabled="{{addBottonStatus}}">
                                 <span class="ict-import"></span>
-                        <span>{{"import"|translate}}</span>
-                        </button>
-                        <div id="importDiv" class="container upload">
-                            <form id="fileupload" #fileForm="ngForm" role="form" enctype="multipart/form-data">
-                                <div class="file-preview">
-                                    <div id="dropzone" class="file-drop-zone">
-                                        <div class="file-drop-zone-title">
-                                            <span>{{"file_import"|translate}}</span>
+                                <span>{{"import"|translate}}</span>
+                            </button>
+                            <div id="importDiv" class="container upload">
+                                <form id="fileupload" #fileForm="ngForm" role="form" enctype="multipart/form-data">
+                                    <div class="file-preview">
+                                        <div id="dropzone" class="file-drop-zone">
+                                            <div class="file-drop-zone-title">
+                                                <span>{{"file_import"|translate}}</span>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
 
-                                <div class="input-group fileupload-btn">
-                                    <div id="fileName" class="form-control file-caption">task2.zip</div>
-                                    <span class="input-group-btn" id="btnGroup">
+                                    <div class="input-group fileupload-btn">
+                                        <div id="fileName" class="form-control file-caption">task2.zip</div>
+                                        <span class="input-group-btn" id="btnGroup">
                                             <span class="btn btn-primary fileinput-button white radius_s blue1-active" id="browse" data-placement="bottom" data-toggle="tooltip">
                                                 <span class="importBtnFontSize">{{"common_browse"|translate}}</span>
-                                    <input type="file" name="file" title=" " accept=".txt" multiple="">
-                                    </span>
-                                    <button id="fileremove" class="btn btn-default" type="button">
+                                                <input type="file" name="file" title=" " accept=".txt" multiple="">
+                                            </span>
+                                            <button id="fileremove" class="btn btn-default" type="button">
                                                 <span class="importBtnFontSize">{{"common_remove"|translate}}</span>
                                             </button>
-                                    <button id="filesubmit" class="btn btn-default" type="button">{{"common_confirm"|translate}}</button>
-                                    </span>
-                                </div>
+                                            <button id="filesubmit" class="btn btn-default" type="button">{{"common_confirm"|translate}}</button>
+                                        </span>
+                                    </div>
 
-                            </form>
-                        </div>
+                                </form>
+                            </div>
                         </span>
                     </div>
                 </div>
             </div>
 
-            <div class="row form-group col-xs-12">
-                <label for="" class="col-xs-2 col-form-label labelstyle">
-                        <span>{{"message_rule_content"|translate}}</span>
-                        <span style="color: red">*</span>
-                    </label>
-                <div class="col-xs-8" style="margin-left: -100px">
+            <div class="row form-group">
+                <label for="" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+                    <span>{{"message_rule_content"|translate}}</span>
+                    <span style="color: red">*</span>
+                </label>
+                <div class="col-xs-9 col-sm-10">
                     <div class="form-group">
                         <textarea id="cmds" class="form-control" readonly="{{addBottonStatus}}" [(ngModel)]="queryRule.content" name="content" rows="12"
                             cols="80" required placeholder="package example;">
                          </textarea>
-
                     </div>
                 </div>
             </div>
 
-            <div class="row form-group col-xs-12 " style="margin-left: 73px">
-                <div class="col-xs-8 ">
+            <div class="row form-group">
+                <div class="col-xs-8 col-xs-offset-2 col-sm-offset-1">
                     <label class="myclass" id="checkLabel">
                         <button type="button" (click)="checkContent('check')" disabled="{{addBottonStatus}}" class="btn btn-info">{{"common_check"|translate}}</button>
                     </label>
                     <label class="myclass" id="updateLabel">
-                        <button type="button"  disabled="{{addBottonStatus}}" class="btn btn-info" (click)="update()">{{"common_update"|translate}}</button>
+                        <button type="button" disabled="{{addBottonStatus}}" class="btn btn-info" (click)="update()">{{"common_update"|translate}}</button>
                     </label>
                     <label class="myclass" id="saveLabel">
-                        <button type="submit"  disabled="{{addBottonStatus}}" class="btn btn-info">{{"common_save"|translate}}</button>
+                        <button type="submit" disabled="{{addBottonStatus}}" class="btn btn-info">{{"common_save"|translate}}</button>
                     </label>
                     <label class="myclass" id="cancelLabel">
                         <button type="button" routerLink='/alarmRule' class="btn btn-info">{{"common_cancel"|translate}}</button>