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

Jump to bottom

refactor code for Locale #359

Merged
merged 9 commits into from
Jun 8, 2017
Merged

refactor code for Locale #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b2389e
doLocale
Zhangxinguo Jun 8, 2017
b49b4e3
doLocale
Zhangxinguo Jun 8, 2017
d154190
doLocale
Zhangxinguo Jun 8, 2017
8a53ccc
doLocale
Zhangxinguo Jun 8, 2017
27479ba
doLocale
Zhangxinguo Jun 8, 2017
dca53e8
doLocale
Zhangxinguo Jun 8, 2017
12858ea
doLocale
Zhangxinguo Jun 8, 2017
d5d4c7c
doLocale
Zhangxinguo Jun 8, 2017
efeca54
doLocale
Zhangxinguo Jun 8, 2017
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
39 changes: 24 additions & 15 deletions ...stic-job-lite-console/src/main/resources/console/html/global/event_trace_data_source.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,67 @@
<div class="index-content">
<section class="content-header">
<h4>事件追踪数据源配置总览</h4>
<h4 data-lang="event-trace-data-source"></h4>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-cogs"></i> 全局配置</li>
<li class="active">事件追踪数据源配置</li>
<li class="active"><i class="fa fa-cogs" data-lang="global-settings"></i></li>
<li class="active" data-lang="event-trace-data-source"></li>
</ol>
</section>
<section class="content">
<table id="data-sources" data-pagination="true" data-page-list="[10, 20, 50, 100]" data-search="true" data-show-refresh="true" data-show-toggle="true" data-striped="true"></table>
<button type="button" class="btn-xs btn-success" data-toggle="modal" id="add-data-source">添加</button>
<table id="data-sources" data-pagination="true" data-page-list="[10, 20, 50, 100]" data-search="true" data-show-refresh="true" data-show-toggle="true" data-striped="true">
<thead>
<tr>
<th data-field="name" data-sortable="true"><span data-lang="dataSource-name"></span></th>
<th data-field="driver" data-sortable="true"><span data-lang="dataSource-driver"></span></th>
<th data-field="url" data-sortable="true"><span data-lang="dataSource-url"></span></th>
<th data-field="username"><span data-lang="dataSource-username"></span></th>
<th data-field="operation" data-formatter="generateOperationButtons"><span data-lang="operation"></span></th>
</tr>
</thead>
</table>
<button type="button" class="btn-xs btn-success" data-toggle="modal" id="add-data-source" data-lang="add"></button>
</section>
</div>
<div id="add-data-source-center" class="modal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" id="close-add-data-source-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">添加事件追踪数据源</h4>
<h4 class="modal-title" data-lang="add-dataSource"></h4>
</div>
<form id="data-source-form">
<div class="modal-body">
<div class="form-group">
<label for="name" class="control-label">数据源名称：</label>
<label for="name" class="control-label" data-lang="dataSource-name"></label>
<input type="text" class="form-control" id="name" name="name" required autofocus>
</div>
<div class="form-group">
<label for="driver" class="control-label">数据库驱动：</label>
<label for="driver" class="control-label" data-lang="dataSource-driver"></label>
<select id="driver" name="driver" class="form-control">
MySQL:<option>com.mysql.jdbc.Driver</option>
</select>
</div>
<div class="form-group">
<label for="url" class="control-label">数据库连接地址：</label>
<label for="url" class="control-label" data-lang="dataSource-url"></label>
<input type="text" class="form-control" id="url" name="url" required>
</div>
<div class="form-group">
<label for="username" class="control-label">数据库用户名：</label>
<label for="username" class="control-label" data-lang="dataSource-username"></label>
<input type="text" class="form-control" id="username" name="username" required>
</div>
<div class="form-group">
<label for="password" class="control-label">数据库密码：</label>
<label for="password" class="control-label" data-lang="dataSource-password"></label>
<input type="password" class="form-control" id="password" name="password">
</div>
</div>
<div class="modal-footer">
<button id="connect-test" type="button" class="btn-xs btn-info">测试连接</button>
<button id="add-data-source-btn" type="button" class="btn-xs btn-primary">确认</button>
<button id="connect-test" type="button" class="btn-xs btn-info" data-lang="test-connection"></button>
<button id="add-data-source-btn" type="button" class="btn-xs btn-primary" data-lang="submit"></button>
</div>
</form>
</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="lib/BootstrapValidator/js/bootstrapValidator.js"></script>
<script src="lib/BootstrapValidator/js/bootstrapValidator_zh_CN.js"></script>
<script src="js/util/common.js"></script>
Expand Down
34 changes: 21 additions & 13 deletions ...lite/elastic-job-lite-console/src/main/resources/console/html/global/registry_center.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,59 @@
<div class="index-content">
<section class="content-header">
<h4>注册中心配置总览</h4>
<h4 data-lang="reg-center"></h4>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-cogs"></i> 全局配置</li>
<li class="active">注册中心配置</li>
<li class="active"><i class="fa fa-cogs" data-lang="global-settings"></i></li>
<li class="active" data-lang="reg-center"></li>
</ol>
</section>
<section class="content">
<table id="reg-centers" data-pagination="true" data-page-list="[10, 20, 50, 100]" data-search="true" data-show-refresh="true" data-show-toggle="true" data-striped="true"></table>
<button type="button" class="btn-xs btn-success" data-toggle="modal" id="add-register">添加</button>
<table id="reg-centers" data-pagination="true" data-page-list="[10, 20, 50, 100]" data-search="true" data-show-refresh="true" data-show-toggle="true" data-striped="true">
<thead>
<tr>
<th data-field="name" data-sortable="true"><span data-lang="regCenter-name"></span></th>
<th data-field="zkAddressList" data-sortable="true"><span data-lang="regCenter-zkAddress"></span></th>
<th data-field="namespace" data-sortable="true"><span data-lang="regCenter-namespace"></span></th>
<th data-field="operation" data-formatter="generateOperationButtons"><span data-lang="operation"></span></th>
</tr>
</thead>
</table>
<button type="button" class="btn-xs btn-success" data-toggle="modal" id="add-register" data-lang="add"></button>
</section>
</div>
<div id="add-reg-center" class="modal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" id="close-add-reg-form" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">添加注册中心</h4>
<h4 class="modal-title" data-lang="add-regCenter"></h4>
</div>
<form id="reg-center-form">
<div class="modal-body">
<div class="form-group">
<label for="name" class="control-label">注册中心名称：</label>
<label for="name" class="control-label" data-lang="regCenter-name"></label>
<input type="text" class="form-control" id="name" name="name" required autofocus>
</div>
<div class="form-group">
<label for="zk-address-list" class="control-label">注册中心地址：</label>
<label for="zk-address-list" class="control-label" data-lang="regCenter-zkAddress"></label>
<input type="text" class="form-control" id="zk-address-list" name="zkAddressList" placeholder="localhost:2181" required>
</div>
<div class="form-group">
<label for="namespace" class="control-label">命名空间：</label>
<label for="namespace" class="control-label" data-lang="regCenter-namespace"></label>
<input type="text" class="form-control" id="namespace" name="namespace">
</div>
<div class="form-group">
<label for="digest" class="control-label">登录凭证：</label>
<label for="digest" class="control-label" data-lang="regCenter-digest"></label>
<input type="password" class="form-control" id="digest" name="digest">
</div>
</div>
<div class="modal-footer">
<button id="add-reg-center-btn" type="submit" class="btn-xs btn-primary">确认</button>
<button id="add-reg-center-btn" type="submit" class="btn-xs btn-primary" data-lang="submit"></button>
</div>
</form>
</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="lib/BootstrapValidator/js/bootstrapValidator.js"></script>
<script src="lib/BootstrapValidator/js/bootstrapValidator_zh_CN.js"></script>
<script src="js/util/common.js"></script>
Expand Down
26 changes: 13 additions & 13 deletions elastic-job-lite/elastic-job-lite-console/src/main/resources/console/html/help/help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<div class="index-content">
<section class="content-header">
<ol class="breadcrumb">
<li class="active"><i class="fa fa-book"></i> 帮助</li>
<li class="active"><i class="fa fa-book" data-lang="help"></i></li>
</ol>
</section>
<section class="content">
<h2>设计理念</h2>
<h2 data-lang="design-concept"></h2>
<ol>
<li>本控制台和Elastic Job并无直接关系，是通过读取Elastic Job的注册中心数据展现作业状态，或更新注册中心数据修改全局配置。</li>
<li>控制台只能控制作业本身是否运行，但不能控制作业进程的启停，因为控制台和作业本身服务器是完全分布式的，控制台并不能控制作业服务器。</li>
<li data-lang="design1"></li>
<li data-lang="design2"></li>
</ol>
<h2>主要功能</h2>
<h2 data-lang="major-function"></h2>
<ol>
<li>作业状态查看</li>
<li>作业服务器状态查看</li>
<li>快捷的修改作业设置</li>
<li>控制作业暂停和恢复运行</li>
<li>跨注册中心查看作业</li>
<li>查看作业运行轨迹和运行状态</li>
<li data-lang="view-job-status"></li>
<li data-lang="view-job-server-status"></li>
<li data-lang="quick-update-job"></li>
<li data-lang="control-job-suspension-and-recovery-operation"></li>
<li data-lang="view-job-across-the-registry"></li>
<li data-lang="view-job-event-trace-and-status"></li>
</ol>
<h2>不支持项</h2>
<h2 data-lang="nonsupport-item"></h2>
<ol>
<li>添加作业。因为作业都是在首次运行时自动添加，使用控制台添加作业并无必要。直接在作业服务器启动包含Elastic Job的作业进程即可。</li>
<li data-lang="nonsupport-info"></li>
</ol>
</section>
</div>
39 changes: 19 additions & 20 deletions ...tic-job-lite-console/src/main/resources/console/html/history/job_event_trace_history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<div class="index-content">
<section class="content-header">
<h4>历史作业执行轨迹 </h4>
<h4 data-lang="job-event-trace-history"></h4>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-history"></i> 作业历史</li>
<li class="active">历史轨迹</li>
<li class="active"><i class="fa fa-history" data-lang="job-history"></i></li>
<li class="active" data-lang="job-event-trace-history"></li>
</ol>
</section>
<section class="content">
<div id="jobExecDetailToolbar">
<div class="form-inline" role="form">
<div class="form-group toolbar">
<label for="job-name">作业名称:</label>
<label for="job-name" data-lang="job-name"></label>
<input type="text" class="form-control" id="job-name" placeholder="">
</div>
<div class="form-group toolbar">
<label for="ip">主机IP:</label>
<label for="ip" data-lang="server-ip"></label>
<input type="text" class="form-control" data-inputmask="'alias': 'ip'" data-mask="" id="ip">
</div>
<br/>
<div class="form-group toolbar">
<label for="start-time">执行时间:</label>
<label for="start-time" data-lang="start-time"></label>
<input type="text" class="form-control pull-right custom-datepicker" id="start-time">
</div>
<div class="form-group toolbar">
<label for="end-time">至</label>
<label for="end-time" data-lang="end-time"></label>
<input type="text" class="form-control pull-right custom-datepicker" id="end-time">
</div>
<div class="form-group toolbar">
<label>执行结果:</label>
<input type="radio" name="isSuccess" value="1">成功
<input type="radio" name="isSuccess" value="0">失败
<input type="radio" name="isSuccess" value="" checked="checked">全部
<label data-lang="execute-result"></label>:
<input type="radio" name="isSuccess" value="1">Success
<input type="radio" name="isSuccess" value="0">Failure
<input type="radio" name="isSuccess" value="" checked="checked">All
</div>
</div>
</div>
Expand All @@ -52,20 +52,19 @@ <h4>历史作业执行轨迹 </h4>
data-toolbar="#jobExecDetailToolbar">
<thead>
<tr>
<th data-field="jobName" data-sortable="true">作业名称</th>
<th data-field="ip" data-sortable="true">宿主机IP</th>
<th data-field="shardingItem">分片项</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>
<th data-field="jobName" data-sortable="true"><span data-lang="job-name"></span></th>
<th data-field="ip" data-sortable="true"><span data-lang="server-ip"></span></th>
<th data-field="shardingItem"><span data-lang="sharding-item"></span></th>
<th data-field="success" data-sortable="true" data-formatter="successFormatter"><span data-lang="execute-result"></span></th>
<th data-field="failureCause.plainText" data-formatter="splitFormatter"><span data-lang="failure-reason"></span></th>
<th data-field="startTime" data-sortable="true" data-formatter="dateTimeFormatter"><span data-lang="execute-start-time"></span></th>
<th data-field="completeTime" data-sortable="true" data-formatter="dateTimeFormatter"><span data-lang="execute-end-time"></span></th>
</tr>
</thead>
</table>
</section>
</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="lib/daterangepicker/moment.min.js"></script>
<script src="lib/daterangepicker/daterangepicker.js"></script>
<script src="lib/input-mask/jquery.inputmask.js"></script>
Expand Down
Loading