Skip to content

Commit

Permalink
Re-fix z-win-h4 left floating
Browse files Browse the repository at this point in the history
  • Loading branch information
tolbkni authored and QiRaining committed Apr 5, 2017
1 parent 93efc65 commit f151922
Show file tree
Hide file tree
Showing 34 changed files with 39 additions and 39 deletions.
1 change: 0 additions & 1 deletion zstack_dashboard/static/css/zstack1.css
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ p { word-break: break-all }
}

.z-win-h4 {
float: left;
padding-bottom: 20px;
margin-top: 0;
margin-left: 5px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ <h4 class="z-win-h4">{{ "backupStorage.createBackupStorage.CREATE BACKUP STORAGE
<div class="alert alert-warning col-sm-21" ng-show="!zonePage.hasZone()">
{{ "backupStorage.createBackupStorage.ALERT2" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "backupStorage.createBackupStorage.ATTACH ZONE" | translate }}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasL2Network()">
{{"cluster.attachL2Network.hasL2Network()" | translate}} <a href="/#/l2Network">{{"cluster.attachL2Network.l2Network page" | translate}}</a> {{"cluster.attachL2Network.hasL2Network2()" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"cluster.attachL2Network.ATTACH L2 NETWORK" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasPrimaryStorage()">
{{"cluster.attachPrimaryStorage.hasPrimaryStorage()" | translate}} <a href="/#/primaryStorage">{{"cluster.attachPrimaryStorage.primary storage" | translate}}</a> {{"cluster.attachPrimaryStorage.hasPrimaryStorage2()" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"cluster.attachPrimaryStorage.ATTACH PRIMARY STORAGE" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
6 changes: 3 additions & 3 deletions zstack_dashboard/static/templates/cluster/createCluster.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasZone()">
{{"cluster.createCluster.hasZone()" | translate}} <a href="/#/zone">{{"cluster.createCluster.zone page" | translate}}</a> {{"cluster.createCluster.hasZone2()" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"cluster.createCluster.CLUSTER INFO" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-24">
Expand Down Expand Up @@ -34,7 +34,7 @@ <h4 class="z-win-h4">{{"cluster.createCluster.CLUSTER INFO" | translate}}</h4>
<div class="alert alert-warning col-sm-21" ng-show="!psPage.hasPrimaryStorage()">
{{"cluster.createCluster.hasPrimaryStorage()" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"cluster.createCluster.ATTACH PRIMARY STORAGE" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand All @@ -49,7 +49,7 @@ <h4 class="z-win-h4">{{"cluster.createCluster.ATTACH PRIMARY STORAGE" | translat
<div class="alert alert-warning col-sm-21" ng-show="!l2Page.hasL2Network()">
{{"cluster.createCluster.hasL2Network()" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"cluster.createCluster.ATTACH L2 NETWORK" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasL2Network()">
{{"cluster.detachL2Network.hasL2Network" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"cluster.detachL2Network.DETACH L2 NETWORK" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasPrimaryStorage()">
{{"cluster.detachPrimaryStorage.hasL2Network()" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"cluster.detachPrimaryStorage.DETACH PRIMARY STORAGE" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/eip/attachEip.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasVm()">
{{"eip.attachEip.hasVm1()" | translate}} <a href="/#/vmInstance">{{"eip.attachEip.vm instance page" | translate}}</a> {{"eip.attachEip.hasVm2()" | translate}}.
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"eip.attachEip.ATTACH EIP" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/eip/createEip.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!vipPage.hasVip() && vipPage.method == 'existing'">
{{"eip.createEip.HINT1" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"eip.createEip.SELECT VIP" | translate}}</h4>
<form class="form" id="vipForm">
<div class="form-group col-sm-24">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/host/createHost.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasCluster()">
{{"host.createHost.hasCluster()" | translate}} <a href="/#/cluster">{{"host.createHost.cluster page" | translate}}</a> {{"host.createHost.hasCluster2()" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"host.createHost.ADD HOST" | translate}}</h4>
<form class="form" id="formCreate">
<div class="form-group col-sm-24">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/image/addImage.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasBackup()">
{{"image.addImage.HINT1" | translate}} <a href="/#/backupStorage">{{"image.addImage.backup storage page" | translate}}</a> {{"image.addImage.HINT2" | translate}}.
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"image.addImage.ADD IMAGE" | translate}}</h4>
<form class="form" id="formCreate">
<div class="form-group col-sm-24">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasCluster()">
{{"l2Network.attachCluster.HINT" | translate}} <a href="/#/cluster">{{"l2Network.attachCluster.cluster page" | translate}}</a> {{"l2Network.attachCluster.to create a new one." | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"l2Network.attachCluster.ATTACH CLUSTER" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasZone()">
{{"l2Network.createL2Network.HINT" | translate}} <a href="/#/zone">{{"l2Network.createL2Network.zone page" | translate}}</a> {{"l2Network.createL2Network.to create a new one." | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"l2Network.createL2Network.CREATE L2 NETWORK" | translate}}</h4>
<form class="form" id="formCreate">
<div class="form-group col-sm-24">
Expand Down Expand Up @@ -50,7 +50,7 @@ <h4 class="z-win-h4">{{"l2Network.createL2Network.CREATE L2 NETWORK" | translate
<div class="alert alert-warning col-sm-21" ng-show="!clusterPage.hasCluster()">
{{"l2Network.createL2Network.HINT6" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"l2Network.createL2Network.ATTACH CLUSTER" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasCluster()">
{{"l2Network.detachCluster.HINT" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"l2Network.detachCluster.DETACH CLUSTER" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasL2Network()">
{{"l3Network.createL3Network.HINT" | translate}} <a href="/#/l2Network">{{"l3Network.createL3Network.L2 network page" | translate}}</a> to create a new one.
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"l3Network.createL3Network.CREATE L3 NETWORK" | translate}}</h4>
<form class="form" id="formCreate">
<div class="form-group col-sm-24">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasVm()">
{{"portForwarding.attachPortForwarding.hasVm()1" | translate}} <a href="/#/vmInstance">{{"portForwarding.attachPortForwarding.vm instance page" | translate}}</a> {{"portForwarding.attachPortForwarding.hasVm()2" | translate}}.
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"portForwarding.attachPortForwarding.ATTACH PORT FORWARDING RULE" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!vipPage.hasVip() && vipPage.method == 'existing'">
{{"portForwarding.createPortForwarding.HINT3" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"portForwarding.createPortForwarding.SELECT VIP" | translate}}</h4>
<form class="form" id="vipForm">
<div class="form-group col-sm-24">
Expand Down Expand Up @@ -108,7 +108,7 @@ <h4 class="z-win-h4">{{"portForwarding.createPortForwarding.PORT FORWARDING INFO
<div class="alert alert-warning col-sm-21" ng-show="!attachPage.hasVm()">
{{"portForwarding.createPortForwarding.HINT9" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"portForwarding.createPortForwarding.ATTACH VM NIC" | translate}}</h4>
<form class="form" id="formAttach">
<div class="form-group col-sm-24">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasCluster()">
{{ "primaryStorage.attachCluster.ALERT1.1" | translate }}<a href="/#/cluster">{{ "primaryStorage.attachCluster.ALERT1.2" | translate }}</a>{{ "primaryStorage.attachCluster.ALERT1.3" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "primaryStorage.attachCluster.ATTACH CLUSTER" | translate }}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasZone()">
{{ "primaryStorage.createPrimaryStorage.ALERT" | translate }}<a href="/#/zone">{{ "primaryStorage.createPrimaryStorage.ALERT.2" | translate }}</a>{{ "primaryStorage.createPrimaryStorage.ALERT.3" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "primaryStorage.createPrimaryStorage.CREATE PRIMARY STORAGE" | translate }}</h4>
<form class="form" id="formCreate">
<div class="form-group col-sm-24">
Expand Down Expand Up @@ -159,7 +159,7 @@ <h4 class="z-win-h4">{{ "primaryStorage.createPrimaryStorage.CREATE PRIMARY STOR
<div class="alert alert-warning col-sm-21" ng-show="!clusterPage.hasCluster()">
{{ "primaryStorage.createPrimaryStorage.ALERT4" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "primaryStorage.createPrimaryStorage.ATTACH CLUSTER" | translate }}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasCluster()">
{{ "primaryStorage.detachCluster.ALERT1" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "primaryStorage.detachCluster.DETACH CLUSTER" | translate }}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasVmNic()">
{{"securityGroup.addVmNic.HINT1" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"securityGroup.addVmNic.HINT2" | translate}}{{securityGroupName}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<a href="/#/l3Network">{{"securityGroup.attachL3Network.L3 network page" | translate}}</a>
{{"securityGroup.attachL3Network.HINT2" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"securityGroup.attachL3Network.ATTACH L3 NETWORK" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h4 class="z-win-h4">{{"securityGroup.createSecurityGroup.ADD RULE" | translate}
<div class="alert alert-warning col-sm-21" ng-show="!l3Page.hasL3Network()">
{{"securityGroup.createSecurityGroup.HINT6" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"securityGroup.createSecurityGroup.ATTACH L3 NETWORK" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasL3Network()">
{{"securityGroup.detachL3Network.HINT1" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"securityGroup.detachL3Network.DETACH L3 NETWORK" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasVmNic()">
{{"securityGroup.removeVmNic.HINT1" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"securityGroup.removeVmNic.HINT2" | translate}}{{securityGroupName}}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/vip/createVip.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasL3Network()">
{{"vip.createVip.hasL3Network1" | translate}}<a href="/#/l3Network">{{"vip.createVip.L3 network page" | translate}}</a> {{"vip.createVip.hasL3Network2" | translate}}.
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"vip.createVip.ACQUIRE VIP" | translate}}</h4>
<form class="form" id="formCreate">
<div class="form-group col-sm-24">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasImage()">
{{ "virtualRouterOffering.addVirtualRouterOffering.ALERT3.1" | translate }}<a href="/#/image">{{ "virtualRouterOffering.addVirtualRouterOffering.ALERT3.2" | translate }}</a>{{ "virtualRouterOffering.addVirtualRouterOffering.ALERT3.3" | translate }}
</div>
<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "virtualRouterOffering.addVirtualRouterOffering.CREATE VIRTUAL ROUTER OFFERING" | translate }}</h4>
<form class="form" id="formCreate">
<div class="form-group col-sm-24">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/vm/createVm.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasInstanceOffering()">
{{"vm.createVm.hasInstanceOffering()" | translate}}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{"vm.createVm.VM INSTANCE INFO" | translate}}</h4>
<form class="form">
<div class="form-group col-sm-24">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/volume/attachVm.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasVm()">
{{ "volume.attachVm.ALERT1.1" | translate }}<a href="/#/vmInstance">{{ "volume.attachVm.ALERT1.2" | translate }}</a>{{ "volume.attachVm.ALERT1.3" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "volume.attachVm.ATTACH VM INSTANCE" | translate }}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasBackupStorage()">
{{ "volume.backupSnapshot.ALERT1.1" | translate }}<a href="/#/backupStorage">{{ "volume.backupSnapshot.ALERT1.1" | translate }}</a>{{ "volume.backupSnapshot.ALERT1.1" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "volume.backupSnapshot.BACKUP VOLUME SNAPSHOT" | translate }}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/volume/backupVolume.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="alert alert-warning col-sm-21" ng-show="!hasBackupStorage()">
{{ "volume.backupVolume.ALERT1.1" | translate }}<a href="/#/backupStorage">{{ "volume.backupVolume.ALERT1.2" | translate }}</a>{{ "volume.backupVolume.ALERT1.3" | translate }}
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "volume.backupVolume.BACKUP DATA VOLUME" | translate }}</h4>
<form class="form">
<div class="form-group col-sm-18">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{ "volume.createTemplateFromVolume.ALERT1.1" | translate }}<a href="/#/backupStorage">{{ "volume.createTemplateFromVolume.ALERT1.2" | translate }}</a>{{ "volume.createTemplateFromVolume.ALERT1.3" | translate }}
Or please attach an existing backup storage to the zone this root volume belongs to.
</div>

<div class="clearfix"></div>
<h4 class="z-win-h4">{{ "volume.createTemplateFromVolume.CREATE TEMPLATE FROM ROOT VOLUME" | translate }}</h4>
<div class="alert alert-warning col-sm-21" ng-show="!isVmInCorrectState()">
{{ "volume.createTemplateFromVolume.ALERT2.1" | translate }}<a herf="/#/vmInstance/{{vm.uuid}}">{{vm.name}}</a>{{ "volume.createTemplateFromVolume.ALERT2.2" | translate }}{{vm.state}},{{ "volume.createTemplateFromVolume.ALERT2.3" | translate }}
Expand Down
Loading

0 comments on commit f151922

Please sign in to comment.