Skip to content

Commit

Permalink
Merge pull request #128 from tolbkni/patch-21
Browse files Browse the repository at this point in the history
Refine action button style
  • Loading branch information
QiRaining authored Mar 23, 2017
2 parents 2f89090 + 6c20231 commit 31fedd6
Show file tree
Hide file tree
Showing 38 changed files with 39 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3 class="z-h3">{{ "backupStorage.backupStorage.BACKUP STORAGE" | translate }}<
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{ "backupStorage.backupStorage.Action" | translate }} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{ "backupStorage.details.Action" | translate }} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/cluster/cluster.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h3 class="z-h3">{{"cluster.cluster.CLUSTER" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"cluster.cluster.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/cluster/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"cluster.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"diskOffering.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h3 class="z-h3">{{"diskOffering.diskOffering.DISK OFFERING" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"diskOffering.diskOffering.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/eip/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"eip.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/eip/eip.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3 class="z-h3">{{"eip.eip.EIP" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"eip.eip.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{ "globalConfig.details.Action" | translate }} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h3 class="z-h3">{{ "globalConfig.globalConfig.GLOBAL CONFIGURE" | translate }}<
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{ "globalConfig.globalConfig.Action" | translate }} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/host/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"host.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/host/host.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h3 class="z-h3">{{"host.host.HOST" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"host.host.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/image/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"image.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/image/image.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h3 class="z-h3">{{"image.image.Image" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"image.image.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"instanceOffering.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h3 class="z-h3">{{"instanceOffering.instanceOffering.INSTANCE OFFERING" | trans
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"instanceOffering.instanceOffering.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/l2Network/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"l2Network.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/l2Network/l2Network.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3 class="z-h3">{{"l2Network.l2Network.L2 NETWORK" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"l2Network.l2Network.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/l3Network/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"l3Network.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/l3Network/l3Network.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h3 class="z-h3">{{"l3Network.l3Network.L3 NETWORK" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"l3Network.l3Network.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"portForwarding.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3 class="z-h3">{{"portForwarding.portForwarding.PORT FORWARDING" | translate}}
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"portForwarding.portForwarding.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{ "primaryStorage.details.Action" | translate }} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3 class="z-h3">{{ "primaryStorage.primaryStorage.PRIMARY STORAGE" | translate
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{ "primaryStorage.primaryStorage.Action" | translate }} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"securityGroup.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h3 class="z-h3">{{"securityGroup.securityGroup.SECURITY GROUP" | translate}}</h
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"securityGroup.securityGroup.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/vip/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"vip.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/vip/vip.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h3 class="z-h3">{{"vip.vip.VIP" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"vip.vip.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"virtualRouter.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h3 class="z-h3">{{"virtualRouter.virtualRouter.VIRTUAL ROUTER" | translate}}</h
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"virtualRouter.virtualRouter.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{ "virtualRouterOffering.details.Action" | translate }} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h3 class="z-h3">{{ "virtualRouterOffering.virtualRouterOffering.VIRTUAL ROUTER
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{ "virtualRouterOffering.virtualRouterOffering.Action" | translate }} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/vm/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h1>{{model.current.name}}</h1>
<i class="fa fa-refresh"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
{{"vm.details.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion zstack_dashboard/static/templates/vm/vm.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h3 class="z-h3">{{"vm.vm.VM INSTANCE" | translate}}</h3>
</div>

<div class="btn-group" ng-show="funcIsActionShow()">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="funcIsActionDisabled()">
{{"vm.vm.Action" | translate}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
Expand Down
Loading

0 comments on commit 31fedd6

Please sign in to comment.