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

update properties for Locale #360

Merged
merged 2 commits into from
Jun 9, 2017
Merged

update properties for Locale #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd1262a
Refactor code for Locale
Zhangxinguo Jun 9, 2017
8e6abc6
Refactor code for Locale
Zhangxinguo Jun 9, 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
4 changes: 4 additions & 0 deletions elastic-job-lite/elastic-job-lite-console/src/main/resources/console/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,7 @@
#modal-dialog-width{
width: 60%;
}
#execute-result {
float: top;
padding-left: 20px;
}
32 changes: 16 additions & 16 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,61 +1,61 @@
<div class="index-content">
<section class="content-header">
<h4 data-lang="event-trace-data-source"></h4>
<h4 data-lang="sidebar-event-trace-data-source"></h4>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-cogs" data-lang="global-settings"></i></li>
<li class="active" data-lang="event-trace-data-source"></li>
<li class="active"><i class="fa fa-cogs" data-lang="sidebar-global-settings"></i></li>
<li class="active" data-lang="sidebar-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">
<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="name" data-sortable="true"><span data-lang="event-trace-data-source-name"></span></th>
<th data-field="driver" data-sortable="true"><span data-lang="event-trace-data-source-driver"></span></th>
<th data-field="url" data-sortable="true"><span data-lang="event-trace-data-source-url"></span></th>
<th data-field="username"><span data-lang="event-trace-data-source-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>
<button type="button" class="btn-xs btn-success" data-toggle="modal" id="add-data-source" data-lang="operation-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" data-lang="add-dataSource"></h4>
<h4 class="modal-title" data-lang="add-event-trace-data-source"></h4>
</div>
<form id="data-source-form">
<div class="modal-body">
<div class="form-group">
<label for="name" class="control-label" data-lang="dataSource-name"></label>
<label for="name" class="control-label" data-lang="event-trace-data-source-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" data-lang="dataSource-driver"></label>
<label for="driver" class="control-label" data-lang="event-trace-data-source-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" data-lang="dataSource-url"></label>
<label for="url" class="control-label" data-lang="event-trace-data-source-url"></label>
<input type="text" class="form-control" id="url" name="url" required>
</div>
<div class="form-group">
<label for="username" class="control-label" data-lang="dataSource-username"></label>
<label for="username" class="control-label" data-lang="event-trace-data-source-username"></label>
<input type="text" class="form-control" id="username" name="username" required>
</div>
<div class="form-group">
<label for="password" class="control-label" data-lang="dataSource-password"></label>
<label for="password" class="control-label" data-lang="event-trace-data-source-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" data-lang="test-connection"></button>
<button id="add-data-source-btn" type="button" class="btn-xs btn-primary" data-lang="submit"></button>
<button id="connect-test" type="button" class="btn-xs btn-info" data-lang="operation-test-connect"></button>
<button id="add-data-source-btn" type="button" class="btn-xs btn-primary" data-lang="operation-submit"></button>
</div>
</form>
</div>
Expand Down
26 changes: 13 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,53 +1,53 @@
<div class="index-content">
<section class="content-header">
<h4 data-lang="reg-center"></h4>
<h4 data-lang="sidebar-registry-center"></h4>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-cogs" data-lang="global-settings"></i></li>
<li class="active" data-lang="reg-center"></li>
<li class="active"><i class="fa fa-cogs" data-lang="sidebar-global-settings"></i></li>
<li class="active" data-lang="sidebar-registry-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">
<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="name" data-sortable="true"><span data-lang="registry-center-name"></span></th>
<th data-field="zkAddressList" data-sortable="true"><span data-lang="registry-center-zk-address"></span></th>
<th data-field="namespace" data-sortable="true"><span data-lang="registry-center-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>
<button type="button" class="btn-xs btn-success" data-toggle="modal" id="add-register" data-lang="operation-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" data-lang="add-regCenter"></h4>
<h4 class="modal-title" data-lang="add-registry-center"></h4>
</div>
<form id="reg-center-form">
<div class="modal-body">
<div class="form-group">
<label for="name" class="control-label" data-lang="regCenter-name"></label>
<label for="name" class="control-label" data-lang="registry-center-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" data-lang="regCenter-zkAddress"></label>
<label for="zk-address-list" class="control-label" data-lang="registry-center-zk-address"></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" data-lang="regCenter-namespace"></label>
<label for="namespace" class="control-label" data-lang="registry-center-namespace"></label>
<input type="text" class="form-control" id="namespace" name="namespace">
</div>
<div class="form-group">
<label for="digest" class="control-label" data-lang="regCenter-digest"></label>
<label for="digest" class="control-label" data-lang="registry-center-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" data-lang="submit"></button>
<button id="add-reg-center-btn" type="submit" class="btn-xs btn-primary" data-lang="operation-submit"></button>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 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,7 +1,7 @@
<div class="index-content">
<section class="content-header">
<ol class="breadcrumb">
<li class="active"><i class="fa fa-book" data-lang="help"></i></li>
<li class="active"><i class="fa fa-book" data-lang="sidebar-help"></i></li>
</ol>
</section>
<section class="content">
Expand Down
28 changes: 15 additions & 13 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,9 +1,9 @@
<div class="index-content">
<section class="content-header">
<h4 data-lang="job-event-trace-history"></h4>
<h4 data-lang="sidebar-job-event-trace-history"></h4>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-history" data-lang="job-history"></i></li>
<li class="active" data-lang="job-event-trace-history"></li>
<li class="active"><i class="fa fa-history" data-lang="sidebar-job-history"></i></li>
<li class="active" data-lang="sidebar-job-event-trace-history"></li>
</ol>
</section>
<section class="content">
Expand All @@ -20,17 +20,19 @@ <h4 data-lang="job-event-trace-history"></h4>
<br/>
<div class="form-group toolbar">
<label for="start-time" data-lang="start-time"></label>
<input type="text" class="form-control pull-right custom-datepicker" id="start-time">
<input type="text" class="form-control custom-datepicker" id="start-time">
</div>
<div class="form-group toolbar">
<label for="end-time" data-lang="end-time"></label>
<input type="text" class="form-control pull-right custom-datepicker" id="end-time">
<input type="text" class="form-control custom-datepicker" id="end-time">
</div>
<div class="form-group toolbar">
<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 class="form-group">
<div id="execute-result">
<label data-lang="execute-result"></label>:
<input type="radio" name="isSuccess" value="1"><label data-lang="execute-result-success"></label>
<input type="radio" name="isSuccess" value="0"><label data-lang="execute-result-failure"></label>
<input type="radio" name="isSuccess" value="" checked="checked"><label data-lang="execute-result-all"></label>
</div>
</div>
</div>
</div>
Expand All @@ -54,11 +56,11 @@ <h4 data-lang="job-event-trace-history"></h4>
<tr>
<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="shardingItem"><span data-lang="job-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>
<th data-field="startTime" data-sortable="true" data-formatter="dateTimeFormatter"><span data-lang="start-time"></span></th>
<th data-field="completeTime" data-sortable="true" data-formatter="dateTimeFormatter"><span data-lang="end-time"></span></th>
</tr>
</thead>
</table>
Expand Down
22 changes: 11 additions & 11 deletions .../elastic-job-lite-console/src/main/resources/console/html/history/job_status_history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="index-content">
<section class="content-header">
<h4 data-lang="job-status-history"></h4>
<h4 data-lang="sidebar-job-status-history"></h4>
<ol class="breadcrumb">
<li class="active"><i class="fa fa-history" data-lang="job-history"></i></li>
<li class="active" data-lang="job-status-history"></li>
<li class="active"><i class="fa fa-history" data-lang="sidebar-job-history"></i></li>
<li class="active" data-lang="sidebar-job-status-history"></li>
</ol>
</section>
<section class="content">
Expand All @@ -16,13 +16,13 @@ <h4 data-lang="job-status-history"></h4>
<div class="form-group toolbar">
<label for="state" data-lang="status"></label>
<select id="state" name="state" class="form-control" data-toggle="tooltip" data-placement="bottom" >
<option value="" data-lang="all"></option>
<option value="TASK_STAGING" data-lang="task-staging"></option>
<option value="TASK_FAILED" data-lang="task-failed"></option>
<option value="TASK_FINISHED" data-lang="task-finished"></option>
<option value="TASK_RUNNING" data-lang="running"></option>
<option value="TASK_ERROR" data-lang="task-error"></option>
<option value="TASK_KILLED" data-lang="task-killed"></option>
<option value="" data-lang="execute-result-all"></option>
<option value="TASK_STAGING" data-lang="status-staging"></option>
<option value="TASK_FAILED" data-lang="status-task-failed"></option>
<option value="TASK_FINISHED" data-lang="status-task-finished"></option>
<option value="TASK_RUNNING" data-lang="status-running"></option>
<option value="TASK_ERROR" data-lang="status-task-error"></option>
<option value="TASK_KILLED" data-lang="status-task-killed"></option>
</select>
</div>
<br/>
Expand Down Expand Up @@ -55,7 +55,7 @@ <h4 data-lang="job-status-history"></h4>
<thead>
<tr>
<th data-field="jobName" data-sortable="true"><span data-lang="job-name"></span></th>
<th data-field="shardingItems"><span data-lang="sharding-item"></span></th>
<th data-field="shardingItems"><span data-lang="job-sharding-item"></span></th>
<th data-field="state" data-sortable="true" data-formatter="stateFormatter"><span data-lang="status"></span></th>
<th data-field="creationTime" data-sortable="true" data-formatter="dateTimeFormatter"><span data-lang="start-time"></span></th>
<th data-field="message" data-formatter="splitRemarkFormatter"><span data-lang="comments"></span></th>
Expand Down
Loading