You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ch...@apache.org on 2018/01/16 10:08:40 UTC
[2/2] kylin git commit: minor,code review
minor,code review
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/89fffc23
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/89fffc23
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/89fffc23
Branch: refs/heads/master
Commit: 89fffc23b9067f7161df597b26602be0593c67f8
Parents: 1388b73
Author: chenzhx <ch...@apache.org>
Authored: Tue Jan 16 18:08:26 2018 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Tue Jan 16 18:08:26 2018 +0800
----------------------------------------------------------------------
webapp/app/partials/cubes/cubes.html | 2 +-
webapp/app/partials/dashboard/dashboard.html | 6 +++---
webapp/app/partials/projects/project_create.html | 2 +-
webapp/app/partials/query/query.html | 4 ++--
webapp/app/partials/query/query_detail.html | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/89fffc23/webapp/app/partials/cubes/cubes.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 8107730..94dc3a6 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -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;">
http://git-wip-us.apache.org/repos/asf/kylin/blob/89fffc23/webapp/app/partials/dashboard/dashboard.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/dashboard/dashboard.html b/webapp/app/partials/dashboard/dashboard.html
index 6c1c273..0d46098 100644
--- a/webapp/app/partials/dashboard/dashboard.html
+++ b/webapp/app/partials/dashboard/dashboard.html
@@ -130,8 +130,8 @@
<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>
@@ -139,7 +139,7 @@
<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>
http://git-wip-us.apache.org/repos/asf/kylin/blob/89fffc23/webapp/app/partials/projects/project_create.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/projects/project_create.html b/webapp/app/partials/projects/project_create.html
index ceba015..2dc76da 100644
--- a/webapp/app/partials/projects/project_create.html
+++ b/webapp/app/partials/projects/project_create.html
@@ -81,7 +81,7 @@
</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>
http://git-wip-us.apache.org/repos/asf/kylin/blob/89fffc23/webapp/app/partials/query/query.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html
index e43f7c0..c250cfa 100644
--- a/webapp/app/partials/query/query.html
+++ b/webapp/app/partials/query/query.html
@@ -134,7 +134,7 @@
</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'">
@@ -178,7 +178,7 @@
</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>
http://git-wip-us.apache.org/repos/asf/kylin/blob/89fffc23/webapp/app/partials/query/query_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html
index d25477f..63cf5ac 100644
--- a/webapp/app/partials/query/query_detail.html
+++ b/webapp/app/partials/query/query_detail.html
@@ -190,7 +190,7 @@
<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">
@@ -212,7 +212,7 @@
</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>