Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor for cloud page style #292

Merged
merged 1 commit into from
Apr 21, 2017
Merged

Refactor for cloud page style #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,36 @@
.app-width-size{
width:97%;
}
/* index css */
#control-sidebar-theme-demo-options-tab li {
float:left;
width: 33.33333%;
padding: 5px;
}
#control-sidebar-theme-demo-options-tab li a {
display: block;
box-shadow: 0 0 3px rgba(0,0,0,0.4);
}
.top-span {
display:block;
width: 100%;
float: left;
height: 7px;
}
#span-black{
background: #fefefe;
}
.down-span-left {
display:block;
width: 20%;
float: left;
height: 20px;
background: #222d32;
}
.down-span-right {
display:block;
width: 80%;
float: left;
height: 20px;
background: #f4f5f7;
}
2 changes: 1 addition & 1 deletion ...ic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</div>
<div class="form-group">
<div class="center-font">
<button id="save-button" type="submit" class="btn btn-primary">确定</button>
<button id="save-button" type="submit" class="btn-xs btn-primary">确定</button>
</div>
</div>
</form>
Expand Down
72 changes: 36 additions & 36 deletions ...-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,44 @@
<div class="page-height-min">
<section class="content-header">
<h1>应用定义</h1>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-laptop"></i> 定义</li>
<li class="active">应用定义</li>
</ol>
</section>
<section class="content">
<div class="row">
<div class="box box-info">
<div id="app-toolbar">
<div class="form-inline" role="form">
<div class="form-group">
<a href="#" id="add-app" type="button" class="label label-success">增加</a>
</div>
<div id="app-toolbar">
<div class="form-inline" role="form">
<div class="form-group">
&nbsp;&nbsp;&nbsp;<button type="button" class="btn-xs btn-success" id="add-app">添加</button>
</div>
</div>
<table id="app-table"
data-show-refresh="true"
data-show-toggle="true"
data-striped="true"
data-toggle="table"
data-url="/api/app/list"
data-flat="true"
data-click-to-select="true"
data-search="true"
data-strict-search="false"
data-query-params="queryParams"
data-query-params-type="notLimit"
data-pagination="true"
data-page-list="[10, 20, 50, 100]"
data-show-columns="true"
data-toolbar="#app-toolbar">
<thead>
<tr>
<th data-field="appName" data-sortable="true">名称</th>
<th data-field="appURL" data-sortable="true">所在路径</th>
<th data-field="bootstrapScript" data-sortable="true">启动脚本</th>
<th data-field="operation" data-formatter="operationApp">操作</th>
</tr>
</thead>
</table>
</div>
</div>
<table id="app-table"
data-show-refresh="true"
data-show-toggle="true"
data-striped="true"
data-toggle="table"
data-url="/api/app/list"
data-flat="true"
data-click-to-select="true"
data-search="true"
data-strict-search="false"
data-query-params="queryParams"
data-query-params-type="notLimit"
data-pagination="true"
data-page-list="[10, 20, 50, 100]"
data-show-columns="true"
data-toolbar="#app-toolbar">
<thead>
<tr>
<th data-field="appName" data-sortable="true">名称</th>
<th data-field="appURL" data-sortable="true">所在路径</th>
<th data-field="bootstrapScript" data-sortable="true">启动脚本</th>
<th data-field="operation" data-formatter="operationApp">操作</th>
</tr>
</thead>
</table>
</section>
</div>
</div>
Expand All @@ -51,7 +51,7 @@ <h1>应用定义</h1>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<h2 class="modal-title">应用详情</h2>
</div>
<div class="modal-body" id = "detail-app-body">
<div class="modal-body" id ="detail-app-body">
</div>
</div>
</div>
Expand Down Expand Up @@ -92,8 +92,8 @@ <h2 class="modal-title">添加应用</h2>
<h3 class="size-font">确认要删除该应用吗？</h3>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" id="delete-app-confirm" data-dismiss="modal">确认</button>
<button type="button" class="btn btn-success" id="delete-app-remove" data-dismiss="modal">取消</button>
<button type="button" class="btn-xs btn-danger" id="delete-app-confirm" data-dismiss="modal">确认</button>
<button type="button" class="btn-xs btn-success" id="delete-app-remove" data-dismiss="modal">取消</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</div>
<div class="form-group">
<div class="center-font">
<button id="save-button" class="btn btn-primary" type="submit" >确定</button>
<button id="save-button" class="btn-xs btn-primary" type="submit" >确定</button>
</div>
</div>
</form>
Expand Down
4 changes: 4 additions & 0 deletions ...ud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<div class="content-wrapper">
<section class="content-header">
<h1>Dashboard</h1>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-history"></i> 作业历史</li>
<li class="active">历史dashboard</li>
</ol>
</section>
<hr class="table-line">
<div class="box-body">
Expand Down
128 changes: 63 additions & 65 deletions ...elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,74 @@
<div class="content-wrapper">
<div class="page-height-min">
<section class="content-header">
<h1>作业执行轨迹</h1>
<h1>作业运行轨迹</h1>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-history"></i> 作业历史</li>
<li class="active">作业运行轨迹</li>
</ol>
</section>
<section class="content">
<div class="row">
<div class="box box-info">
<div class="box-body">
<div id="job-exec-detail-toolbar-div">
<div class="form-inline" role="form">
<div class="form-group toolbar">
<label for="job-name">作业名称:</label>
<input type="text" class="form-control" id="job-name" placeholder="">
</div>
<div class="form-group toolbar">
<label for="task-id">任务ID:</label>
<input type="text" class="form-control" size="55" id="task-id" placeholder="">
</div>
<br/>
<div class="form-group toolbar">
<label for="ip">宿主机IP:</label>
<input type="text" class="form-control" data-inputmask="'alias': 'ip'" data-mask="" id="ip">
</div>
<div class="form-group toolbar">
<label>执行时间:</label>
<input type="text" class="form-control pull-right custom-datepicker" id="start-time">
</div>
<div class="form-group toolbar">
<span>至</span>
<input type="text" class="form-control pull-right custom-datepicker" id="end-time">
</div>
<div class="form-group toolbar">
<label for="isSuccess">是否成功:</label>
<input type="radio" name="isSuccess" value="1">是
<input type="radio" name="isSuccess" value="0">否
<input type="radio" name="isSuccess" value="" checked="checked">全部
</div>
</div>
<div id="job-exec-detail-toolbar-div">
<div class="form-inline" role="form">
<div class="form-group toolbar">
<label for="job-name">作业名称:</label>
<input type="text" class="form-control" id="job-name" placeholder="">
</div>
<div class="form-group toolbar">
<label for="task-id">任务ID:</label>
<input type="text" class="form-control" size="55" id="task-id" placeholder="">
</div>
<br/>
<div class="form-group toolbar">
<label for="ip">宿主机IP:</label>
<input type="text" class="form-control" data-inputmask="'alias': 'ip'" data-mask="" id="ip">
</div>
<div class="form-group toolbar">
<label>执行时间:</label>
<input type="text" class="form-control pull-right custom-datepicker" id="start-time">
</div>
<div class="form-group toolbar">
<span>至</span>
<input type="text" class="form-control pull-right custom-datepicker" id="end-time">
</div>
<div class="form-group toolbar">
<label for="isSuccess">是否成功:</label>
<input type="radio" name="isSuccess" value="1">是
<input type="radio" name="isSuccess" value="0">否
<input type="radio" name="isSuccess" value="" checked="checked">全部
</div>
<table id="job-exec-details-table"
data-show-refresh="true"
data-show-toggle="true"
data-striped="true"
data-toggle="table"
data-url="/api/job/events/executions"
data-flat="true"
data-click-to-select="true"
data-row-style="rowStyle"
data-query-params="queryParams"
data-query-params-type="notLimit"
data-side-pagination="server"
data-pagination="true"
data-page-list="[10, 20, 50, 100]"
data-show-columns="true"
data-toolbar="#job-exec-detail-toolbar-div">
<thead>
<tr>
<th data-field="jobName" data-sortable="true">作业名称</th>
<th data-field="taskId">任务ID</th>
<th data-field="ip" data-sortable="true">宿主机IP</th>
<th data-field="shardingItem">分片</th>
<th data-field="source" data-sortable="true">执行依据</th>
<th data-field="success" data-sortable="true" data-formatter="successFormatter">是否成功</th>
<th data-field="failureCause.plainText" data-formatter="splitFormatter">失败原因</th>
<th data-field="startTime" data-sortable="true" data-formatter="dateTimeFormatter">执行开始时间</th>
<th data-field="completeTime" data-sortable="true" data-formatter="dateTimeFormatter">执行结束时间</th>
</tr>
</thead>
</table>
</div>
</div>
</div>
<table id="job-exec-details-table"
data-show-refresh="true"
data-show-toggle="true"
data-striped="true"
data-toggle="table"
data-url="/api/job/events/executions"
data-flat="true"
data-click-to-select="true"
data-row-style="rowStyle"
data-query-params="queryParams"
data-query-params-type="notLimit"
data-side-pagination="server"
data-pagination="true"
data-page-list="[10, 20, 50, 100]"
data-show-columns="true"
data-toolbar="#job-exec-detail-toolbar-div">
<thead>
<tr>
<th data-field="jobName" data-sortable="true">作业名称</th>
<th data-field="taskId">任务ID</th>
<th data-field="ip" data-sortable="true">宿主机IP</th>
<th data-field="shardingItem">分片</th>
<th data-field="source" data-sortable="true">执行依据</th>
<th data-field="success" data-sortable="true" data-formatter="successFormatter">是否成功</th>
<th data-field="failureCause.plainText" data-formatter="splitFormatter">失败原因</th>
<th data-field="startTime" data-sortable="true" data-formatter="dateTimeFormatter">执行开始时间</th>
<th data-field="completeTime" data-sortable="true" data-formatter="dateTimeFormatter">执行结束时间</th>
</tr>
</thead>
</table>
</section>
</div>
</div>
Expand Down
Loading