Skip to content

Commit

Permalink
Merge pull request #361 from Zhangxinguo/2.1.4-SNAPSHOT
Browse files Browse the repository at this point in the history 
refactor code for es-job-cloud Locale
  • Loading branch information
@terrymanu
terrymanu authored Jun 12, 2017
2 parents b0b9d42 + 1d3dcde commit eef8e6f
Show file tree
Hide file tree
Showing 27 changed files with 937 additions and 348 deletions.
6 changes: 5 additions & 1 deletion elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.form-group.toolbar label {
float: left;
width: 90px;
width: 130px;
height: 52px;
padding-left: 20px;
text-align: center;
Expand Down Expand Up @@ -135,3 +135,7 @@
#modal-dialog-width{
width: 60%;
}
#execute-result {
float: top;
padding-left: 20px;
}
24 changes: 12 additions & 12 deletions ...ic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<div class="row">
<div class="col-sm-5">
<div class="form-group">
<label for="app-name" class="col-sm-6 control-label"><i>*</i>应用名称</label>
<label for="app-name" class="col-sm-6 control-label" data-lang="app-name"><i>*</i></label>
<div class="col-sm-6">
<input type="text" placeholder="yourappName" id="app-name" name="appName" class="form-control" data-toggle="tooltip" data-placement="bottom" title="应用名称"/>
</div>
</div>
</div>
<div class="col-sm-5">
<div class="form-group">
<label for="bootstrap-script" class="col-sm-6 control-label"><i>*</i>启动脚本</label>
<label for="bootstrap-script" class="col-sm-6 control-label" data-lang="app-bootstrap-script"><i>*</i></label>
<div class="col-sm-6">
<input type="text" placeholder="bin/start.sh" id="bootstrap-script" name=bootstrapScript class="form-control" data-toggle="tooltip" data-placement="bottom" title="启动脚本，如：bin\start.sh。"/>
</div>
Expand All @@ -22,43 +22,43 @@
<div class="row">
<div class="col-sm-5">
<div class="form-group">
<label for="cpu-count" class="col-sm-6 control-label"><i>*</i>CPU数量</label>
<label for="cpu-count" class="col-sm-6 control-label" data-lang="app-cpu-count"><i>*</i></label>
<div class="col-sm-6">
<input type="number" value="1.0" min="0.1" step="0.1" id="cpu-count" name="cpuCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title=""/>
<input type="number" value="1.0" min="0.1" step="0.1" id="cpu-count" name="cpuCount" class="form-control" />
</div>
</div>
</div>
<div class="col-sm-5">
<div class="form-group">
<label for="app-memory" class="col-sm-6 control-label"><i>*</i>应用内存(M)</label>
<label for="app-memory" class="col-sm-6 control-label" data-lang="app-memory"><i>*</i></label>
<div class="col-sm-6">
<input type="number" value="128" min="16" id="app-memory" name="appMemory" class="form-control" data-toggle="tooltip" data-placement="bottom" title=""/>
<input type="number" value="128" min="16" id="app-memory" name="appMemory" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-5">
<div class="form-group">
<label for="event-trace-sampling-count" class="col-sm-6 control-label"><i>*</i>作业事件采样次数(Daemon)</label>
<label for="event-trace-sampling-count" class="col-sm-6 control-label" data-lang="app-event-trace-sampling-count"><i>*</i></label>
<div class="col-sm-6">
<input type="number" value="0" min="0" id="event-trace-sampling-count" name="eventTraceSamplingCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title=""/>
<input type="number" value="0" min="0" id="event-trace-sampling-count" name="eventTraceSamplingCount" class="form-control" />
</div>
</div>
</div>
<div class="col-sm-5">
<div class="form-group">
<label for="app-cache-enable" class="col-sm-6 control-label">本地缓存应用</label>
<label for="app-cache-enable" class="col-sm-6 control-label" data-lang="app-cache-enable"></label>
<div class="col-sm-6">
<input type="checkbox" checked="checked" id="app-cache-enable" name="appCacheEnable" data-toggle="tooltip" data-placement="bottom" title="" />
<input type="checkbox" checked="checked" id="app-cache-enable" name="appCacheEnable" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="form-group">
<div class="width-appURL">
<label for="app-url" class="col-sm-2 control-label"><i>*</i>应用所在路径</label>
<label for="app-url" class="col-sm-2 control-label" data-lang="app-url"><i>*</i></label>
<div class="col-sm-8">
<div class="app-width-size">
<input type="text" placeholder="http://file_host:8080/foo-job.tar.gz" id="app-url" name="appURL" class="form-control" data-toggle="tooltip" data-placement="bottom" title="必须是可以通过网络访问到的路径。如：http://file_host:8080/your-job.tar.gz"/>
Expand All @@ -69,7 +69,7 @@
</div>
<div class="form-group">
<div class="center-font">
<button id="save-button" type="submit" class="btn-xs btn-primary">确定</button>
<button id="save-button" type="submit" class="btn-xs btn-primary" data-lang="operation-submit"></button>
</div>
</div>
</form>
Expand Down
34 changes: 21 additions & 13 deletions ...-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
<div class="content-wrapper">
<div class="page-height-min">
<section class="content-header">
<h1>应用定义</h1>
<h1 data-lang="sidebar-defination"></h1>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-laptop"></i> 定义</li>
<li class="active">应用定义</li>
<li class="active"><i class="fa fa-laptop" data-lang="sidebar-app"></i></li>
<li class="active" data-lang="sidebar-defination"></li>
</ol>
</section>
<section class="content">
<table id="app-table" data-pagination="true" data-page-list="[10, 20, 50, 100]" data-search="true" data-show-refresh="true" data-show-toggle="true" data-striped="true" data-show-columns="true"></table>
<button type="button" class="btn-xs btn-success" data-toggle="modal" id="add-app">添加</button>
<table id="app-table" data-pagination="true" data-page-list="[10, 20, 50, 100]" data-search="true" data-show-refresh="true" data-show-toggle="true" data-striped="true" data-show-columns="true">
<thead>
<tr>
<th data-field="appName" data-sortable="true"><span data-lang="app-name"></span></th>
<th data-field="appURL" data-sortable="true"><span data-lang="app-url"></span></th>
<th data-field="bootstrapScript" data-sortable="true"><span data-lang="app-bootstrap-script"></span></th>
<th data-field="operation" data-formatter="operationApp"><span data-lang="operation"></span></th>
</tr>
</thead>
</table>
<button type="button" class="btn-xs btn-success" data-toggle="modal" id="add-app" data-lang="operation-add"></button>
</section>
</div>
</div>
Expand All @@ -19,7 +28,7 @@ <h1>应用定义</h1>
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<h2 class="modal-title">应用详情</h2>
<h2 class="modal-title" data-lang="app-detail"></h2>
</div>
<div class="modal-body" id ="detail-app-body">
</div>
Expand All @@ -33,7 +42,7 @@ <h2 class="modal-title">应用详情</h2>
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<h2 class="modal-title">修改应用 </h2>
<h2 class="modal-title" data-lang="update-app"></h2>
</div>
<div class="modal-body" id="update-app-body">
</div>
Expand All @@ -47,7 +56,7 @@ <h2 class="modal-title">修改应用 </h2>
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<h2 class="modal-title">添加应用</h2>
<h2 class="modal-title" data-lang="add-app"></h2>
</div>
<div class="modal-body" id="add-app-body">
</div>
Expand All @@ -59,16 +68,15 @@ <h2 class="modal-title">添加应用</h2>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<h3 class="size-font">确认要删除该应用吗？删除应用同时会删除关联作业。</h3>
<h3 class="size-font" data-lang="confirm-to-delete"></h3>
</div>
<div class="modal-footer">
<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>
<button type="button" class="btn-xs btn-danger" id="delete-app-confirm" data-dismiss="modal" data-lang="operation-submit"></button>
<button type="button" class="btn-xs btn-success" id="delete-app-remove" data-dismiss="modal" data-lang="operation-close"></button>
</div>
</div>
</div>
</div>
<script src="lib/bootstrap-table/bootstrap-table.min.js"></script>
<script src="lib/bootstrap-table/bootstrap-table-zh-CN.js"></script>
<script src="lib/bootstrap-table/bootstrap-table.js"></script>
<script src="js/common/common.js"></script>
<script src="js/app/apps_overview.js"></script>
22 changes: 11 additions & 11 deletions ...job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/detail_app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<div class="row">
<div class="col-sm-5">
<div class="form-group">
<label for="app-name" class="col-sm-6 control-label"><i>*</i>应用名称</label>
<label for="app-name" class="col-sm-6 control-label" data-lang="app-name"><i>*</i></label>
<div class="col-sm-6">
<input type="text" disabled="disabled" placeholder="yourappName" id="app-name" name="appName" class="form-control" data-toggle="tooltip" data-placement="bottom" title="应用名称"/>
</div>
</div>
</div>
<div class="col-sm-5" >
<div class="form-group">
<label for="bootstrap-script" class="col-sm-6 control-label"><i>*</i>启动脚本</label>
<label for="bootstrap-script" class="col-sm-6 control-label" data-lang="app-bootstrap-script"><i>*</i></label>
<div class="col-sm-6">
<input type="text" disabled="disabled" placeholder="bin/start.sh" id="bootstrap-script" name="bootstrapScript" class="form-control" data-toggle="tooltip" data-placement="bottom" title="启动脚本，如：bin\start.sh。"/>
</div>
Expand All @@ -22,43 +22,43 @@
<div class="row">
<div class="col-sm-5">
<div class="form-group">
<label for="cpu-count" class="col-sm-6 control-label"><i>*</i>CPU数量</label>
<label for="cpu-count" class="col-sm-6 control-label" data-lang="app-cpu-count"><i>*</i></label>
<div class="col-sm-6">
<input type="number" disabled="disabled" value="1.0" min="1.0" step="0.1" id="cpu-count" name="cpuCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title=""/>
<input type="number" disabled="disabled" value="1.0" min="1.0" step="0.1" id="cpu-count" name="cpuCount" class="form-control" />
</div>
</div>
</div>
<div class="col-sm-5">
<div class="form-group">
<label for="app-memory" class="col-sm-6 control-label"><i>*</i>应用内存(M)</label>
<label for="app-memory" class="col-sm-6 control-label" data-lang="app-memory"><i>*</i></label>
<div class="col-sm-6">
<input type="number" disabled="disabled" value="256" min="1" id="app-memory" name="appMemory" class="form-control" data-toggle="tooltip" data-placement="bottom" title=""/>
<input type="number" disabled="disabled" value="256" min="1" id="app-memory" name="appMemory" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-5">
<div class="form-group">
<label for="event-trace-sampling-count" class="col-sm-6 control-label"><i>*</i>作业事件采样次数(Daemon)</label>
<label for="event-trace-sampling-count" class="col-sm-6 control-label" data-lang="app-event-trace-sampling-count"><i>*</i></label>
<div class="col-sm-6">
<input type="number" disabled="disabled" id="event-trace-sampling-count" value="0" min="0" name="eventTraceSamplingCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title=""/>
<input type="number" disabled="disabled" id="event-trace-sampling-count" value="0" min="0" name="eventTraceSamplingCount" class="form-control" />
</div>
</div>
</div>
<div class="col-sm-5">
<div class="form-group">
<label for="app-cache-enable" class="col-sm-6 control-label">本地缓存应用</label>
<label for="app-cache-enable" class="col-sm-6 control-label" data-lang="app-cache-enable"></label>
<div class="col-sm-6">
<input type="checkbox" disabled="disabled" checked="checked" id="app-cache-enable" name="appCacheEnable" data-toggle="tooltip" data-placement="bottom" title="" />
<input type="checkbox" disabled="disabled" checked="checked" id="app-cache-enable" name="appCacheEnable" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="width-appURL">
<div class="form-group">
<label for="app-url" class="col-sm-2 control-label"><i>*</i>应用所在路径</label>
<label for="app-url" class="col-sm-2 control-label" data-lang="app-url"><i>*</i></label>
<div class="col-sm-8">
<div class="app-width-size">
<input type="text" disabled="disabled" placeholder="http://file_host:8080/foo-job.tar.gz" id="app-url" name="appURL" class="form-control" data-toggle="tooltip" data-placement="bottom" title="必须是可以通过网络访问到的路径。如：http://file_host:8080/your-job.tar.gz"/>
Expand Down
Loading

0 comments on commit eef8e6f

Please sign in to comment.