Skip to content

Commit

Permalink
minor,code review
Browse files Browse the repository at this point in the history
  • Loading branch information
chenzhx committed Jan 16, 2018
1 parent 1388b73 commit 89fffc2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion webapp/app/partials/cubes/cubes.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
</td>
<td >
<div ng-click="$event.stopPropagation();" class="btn-group" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask)">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" ng-click="listAccess(cube, 'CubeInstance')">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
</button>
<ul class="dropdown-menu" role="menu" style="right:0;left:auto;">
Expand Down
6 changes: 3 additions & 3 deletions webapp/app/partials/dashboard/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,16 @@
<div class="row charts">
<div class="col-sm-6" ng-if="barChart">
<div style="border: 2px solid #ddd; margin-top:15px;">
<div class="form-group" style="width: 90px; position: absolute; right: 15px; bottom: 265px;">
showValue: <input type="checkbox" ng-model="barChart.options.chart.showValues">
<div class="form-group" style="width: 96px; position: absolute; right: 15px; bottom: 265px;">
Show Value: <input type="checkbox" ng-model="barChart.options.chart.showValues">
</div>
<nvd3 options="barChart.options" data="barChart.data"></nvd3>
</div>
</div>
<div class="col-sm-6" ng-if="lineChart">
<div style="border: 2px solid #ddd; margin-top:15px;">
<div class="form-group">
<select class="form-control" style="width: 80px; position: absolute; right: 20px; bottom: 270px;" ng-options="option.name for option in lineChart.dimension.options track by option.value" ng-model="lineChart.dimension.selected" ng-change="changeDimensionFilter('line')">
<select class="form-control" style="padding: 4px;width: 80px; position: absolute; right: 20px; bottom: 270px;" ng-options="option.name for option in lineChart.dimension.options track by option.value" ng-model="lineChart.dimension.selected" ng-change="changeDimensionFilter('line')">
</select>
</div>
<nvd3 options="lineChart.options" data="lineChart.data"></nvd3>
Expand Down
2 changes: 1 addition & 1 deletion webapp/app/partials/projects/project_create.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h4>New Project</h4>
</div>
</div>
<div class="modal-footer">
<button class="btn" ng-click="cancel()">Close</button>
<button class="btn btn-primary" ng-click="cancel()">Close</button>
<button class="btn btn-success" ng-click="createOrUpdate()" ng-disabled="proj_create_form.$invalid">
Submit
</button>
Expand Down
4 changes: 2 additions & 2 deletions webapp/app/partials/query/query.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ <h4>
</table>
<pagination total-items="savedQueries.length" page="savedQueries.curPage"
items-per-page="savedQueries.perPage"
max-size="5" class="pull-right"></pagination>
max-size="5" class="pull-right" first-text="First" last-text="Last" boundary-links="true" rotate="false"></pagination>
</div>

<div ng-show="mainPanel=='cached'">
Expand Down Expand Up @@ -178,7 +178,7 @@ <h4>
</tr>
</table>
<pagination total-items="cachedFilterQueries.length" items-per-page="cachedFilterQueries.perPage" max-size="5"
page="cachedFilterQueries.curPage" class="pull-right"></pagination>
page="cachedFilterQueries.curPage" class="pull-right" first-text="First" last-text="Last" boundary-links="true" rotate="false"></pagination>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions webapp/app/partials/query/query_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ <h4>Save Query</h4>
<label class="col-sm-2 control-label">Project</label>

<div class="col-sm-10">
<span>{{curQuery.project}}</span>
<p class="form-control-static">{{curQuery.project}}</p>
</div>
</div>
<div class="form-group">
Expand All @@ -212,7 +212,7 @@ <h4>Save Query</h4>
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="cancel()">Close</button>
<button class="btn btn-primary" ng-click="saveQuery(curQuery)" ng-disabled="save_query_form.$invalid">Save
<button class="btn btn-success" ng-click="saveQuery(curQuery)" ng-disabled="save_query_form.$invalid">Save
</button>
</div>
</script>

0 comments on commit 89fffc2

Please sign in to comment.