This commit is contained in:
sunny 2018-05-25 12:46:04 +09:00
parent 69e32ba623
commit ab6a38fbcf
6 changed files with 70 additions and 39 deletions

View File

@ -1,8 +1,8 @@
<div class="ui-g"> <h1>Discovery</h1>
<div class="ui-g-12"> <!-- <div class="ui-g-12">
<p-panel [showHeader]="false" >Temp Area</p-panel> <p-panel [showHeader]="false" >Temp Area</p-panel>
</div> </div> -->
<div class="ui-g">
<div class="ui-g-12 ui-md-3"> <div class="ui-g-12 ui-md-3">
<p-accordion (onClose)="onTabClose($event)" (onOpen)="OnTabOpen($event)"> <p-accordion (onClose)="onTabClose($event)" (onOpen)="OnTabOpen($event)">
<p-accordionTab header="Discovery Search Config Area" [selected]="true"> <p-accordionTab header="Discovery Search Config Area" [selected]="true">

View File

@ -1,73 +1,99 @@
<div class="ui-g-nopad"> <div class="ui-g">
<!--<form [formGroup]="discoveryFormGroup" (ngSubmit)="discoveryStartClick()" >--> <!--<form [formGroup]="discoveryFormGroup" (ngSubmit)="discoveryStartClick()" >-->
<of-probe-selector [hidden]="requestStart" [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
<div class="ui-g ui-fluid" style="width:250px;margin-bottom:10px">
<div class="ui-g-12"> <div class="ui-g-12">
<p-radioButton name="group1" value="0" label="IPv4" [(ngModel)]="ipVesion" inputId="opt1"></p-radioButton> <label>Probe</label>
</div>
<div class="ui-g-12 ui-bottom-space-20">
<of-probe-selector [hidden]="requestStart" [preProbe]="probe" (probeSelected)="onProbeSelect($event)"></of-probe-selector>
</div> </div>
<div class="ui-g-12"> <div class="ui-g-12">
<label>IP Version</label>
</div>
<div class="ui-g-12 ui-bottom-space-20">
<div class="ui-g-6 ui-g-nopad">
<p-radioButton name="group1" value="0" label="IPv4" [(ngModel)]="ipVesion" inputId="opt1"></p-radioButton>
</div>
<div class="ui-g-6 ui-g-nopad">
<p-radioButton name="group1" value="1" label="IPv6" [(ngModel)]="ipVesion" inputId="opt2"></p-radioButton> <p-radioButton name="group1" value="1" label="IPv6" [(ngModel)]="ipVesion" inputId="opt2"></p-radioButton>
</div> </div>
</div> </div>
<div class="ui-g ui-fluid">
<span>Start IP Adress </span>
<input type="hidden" >
<div class="ui-inputgroup">
<input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g ui-fluid">
<span>End IP Adress </span>
<div class="ui-inputgroup">
<input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g ui-fluid">
<span>Exclud IP Adress </span>
<div class="ui-inputgroup">
<input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g ui-fluid" style="width:250px;margin-bottom:10px">
<div class="ui-g-12"> <div class="ui-g-12">
<label>IP Adress</label>
<input type="hidden" >
</div>
<div class="ui-g-12">
<div class="ui-inputgroup">
<span style="margin-right: 18px">Start </span>
<input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g-12">
<div class="ui-inputgroup">
<span style="margin-right: 24px">End </span>
<input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g-12 ui-bottom-space-20">
<div class="ui-inputgroup">
<span style="margin-right: 5px">Exclud </span>
<input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3">
<span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="1" maxlength="3">
</div>
</div>
<div class="ui-g-12">
<label>Port type</label>
</div>
<div class="ui-g-12 ui-bottom-space-20">
<div class="ui-g-6 ui-g-nopad">
<p-radioButton name="group2" value="0" label="TCP" [(ngModel)]="portType" inputId="opt3"></p-radioButton> <p-radioButton name="group2" value="0" label="TCP" [(ngModel)]="portType" inputId="opt3"></p-radioButton>
</div> </div>
<div class="ui-g-12"> <div class="ui-g-6 ui-g-nopad">
<p-radioButton name="group2" value="1" label="UDP" [(ngModel)]="portType" inputId="opt4"></p-radioButton> <p-radioButton name="group2" value="1" label="UDP" [(ngModel)]="portType" inputId="opt4"></p-radioButton>
</div> </div>
</div> </div>
<div class="ui-g ui-fluid"> <div class="ui-g-12">
<span>Start Port : </span> <label>Port</label>
<p-inputMask slotChar=" " mask="9999" [(ngModel)]="startPort" placeholder="1024" [autoClear]="false"></p-inputMask> - </div>
<span>End Port : </span> <div class="ui-g-12 ui-g-nopad ui-bottom-space-20">
<p-inputMask mask="9999" [(ngModel)]="endPort" placeholder="1024" [autoClear]="false"></p-inputMask> <div class="ui-g-4">
<span>Exclude Port : </span> <p-inputMask slotChar=" " mask="9999" [(ngModel)]="startPort" placeholder="Start" [autoClear]="false"></p-inputMask>
<p-inputMask mask="9999" [(ngModel)]="excludePort" placeholder="1024" [autoClear]="false"></p-inputMask> </div>
<div class="ui-g-4">
<p-inputMask mask="9999" [(ngModel)]="endPort" placeholder="End" [autoClear]="false"></p-inputMask>
</div>
<div class="ui-g-4">
<p-inputMask mask="9999" [(ngModel)]="excludePort" placeholder="Exclude" [autoClear]="false"></p-inputMask>
</div>
</div> </div>
<of-service-selector [disabled]="!serviceChecked" [(includeServices)]="includeServices"></of-service-selector>
<div class="ui-g-12">
<label>Service</label>
</div>
<div class="ui-g-12 ui-g-nopad">
<of-service-selector [disabled]="!serviceChecked" [(includeServices)]="includeServices"></of-service-selector>
</div>
<div class="ui-g-12" dir="rtl">
<button type="submit" label="Discovery Start" pButton class="ui-button-width-fit" ></button> <button type="submit" label="Discovery Start" pButton class="ui-button-width-fit" ></button>
</div>
<!--</form>--> <!--</form>-->
</div> </div>

View File

@ -1,8 +1,11 @@
<div class="ui-g-nopad"> <div class="ui-g">
<div class="ui-g ui-fluid"> <div class="ui-g-12">
<span>Start IP Adress </span> <label>IP Adress</label>
<input type="hidden" > <input type="hidden" >
</div>
<div class="ui-g-12">
<div class="ui-inputgroup"> <div class="ui-inputgroup">
<span style="margin-right: 18px">Start </span>
<input type="text" pInputText placeholder="127" maxlength="3"> <input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span> <span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3"> <input type="text" pInputText placeholder="0" maxlength="3">
@ -12,10 +15,9 @@
<input type="text" pInputText placeholder="1" maxlength="3"> <input type="text" pInputText placeholder="1" maxlength="3">
</div> </div>
</div> </div>
<div class="ui-g ui-fluid"> <div class="ui-g-12 ui-bottom-space-20">
<span>End IP Adress </span>
<input type="hidden" >
<div class="ui-inputgroup"> <div class="ui-inputgroup">
<span style="margin-right: 24px">End </span>
<input type="text" pInputText placeholder="127" maxlength="3"> <input type="text" pInputText placeholder="127" maxlength="3">
<span class="ui-inputgroup-addon">.</span> <span class="ui-inputgroup-addon">.</span>
<input type="text" pInputText placeholder="0" maxlength="3"> <input type="text" pInputText placeholder="0" maxlength="3">
@ -26,7 +28,7 @@
</div> </div>
</div> </div>
<div class="ui-g ui-fluid"> <div class="ui-g">
<p-toggleButton offLabel="Oracle" onLabel="Oracle" [(ngModel)]="Oracle" [style]="{'width':'150px'}" ></p-toggleButton> <p-toggleButton offLabel="Oracle" onLabel="Oracle" [(ngModel)]="Oracle" [style]="{'width':'150px'}" ></p-toggleButton>
<p-toggleButton offLabel="MYSQL" onLabel="MYSQL" [(ngModel)]="MYSQL" [style]="{'width':'150px'}"></p-toggleButton> <p-toggleButton offLabel="MYSQL" onLabel="MYSQL" [(ngModel)]="MYSQL" [style]="{'width':'150px'}"></p-toggleButton>
<p-toggleButton offLabel="Tomcat" onLabel="Tomcat" [(ngModel)]="Tomcat" [style]="{'width':'150px'}"></p-toggleButton> <p-toggleButton offLabel="Tomcat" onLabel="Tomcat" [(ngModel)]="Tomcat" [style]="{'width':'150px'}"></p-toggleButton>

View File

@ -4,6 +4,6 @@
placeholder="Select a Probe" placeholder="Select a Probe"
[(ngModel)]="selected" [(ngModel)]="selected"
(onChange)="onProbeSelect($event)" (onChange)="onProbeSelect($event)"
[style]="{'width':'300px'}"> [style]="{'width':'100%'}">
</p-dropdown> </p-dropdown>
</div> </div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -142,6 +142,9 @@
.ui-bottom-space-10{ .ui-bottom-space-10{
margin-bottom: 10px; margin-bottom: 10px;
} }
.ui-bottom-space-20{
margin-bottom: 20px;
}
.ui-top-space-10{ .ui-top-space-10{
margin-top: 10px; margin-top: 10px;