Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@
</div>
<% if data.submit_args %>
<div class="card-body">
<p class="card-text">Submit Args: <pre class="card bg-light p-2 text-prewrap"><%= data.submit_args %></pre></p>
<p class="card-text"><%= t('dashboard.submit_args') %>: <pre class="card bg-light p-2 text-prewrap"><%= data.submit_args %></pre></p>
</div>
<% end %>
<% if data.output_path %>
<div class="card-body">
<%# FIXME: can use form element input with label and disabled %>
<p class="card-text">Output Location: <pre class="card bg-light p-2 text-prewrap"><%= data.output_path %></pre></p>
<p class="card-text"><%= t('dashboard.output_location') %>: <pre class="card bg-light p-2 text-prewrap"><%= data.output_path %></pre></p>
</div>
<% end %>
<div class="card-body">
<% if CurrentUser.name == data.username %>
<% if Configuration.can_access_files? %>
<%= link_to("#{fa_icon("folder-open", classes: nil)} Open in File Manager".html_safe, data.file_explorer_url, :class => "btn btn-outline-dark m-1") if data.file_explorer_url %>
<%= link_to("#{fa_icon("folder-open", classes: nil)} #{t('dashboard.active_jobs_open_in_file_manager')}".html_safe, data.file_explorer_url, :class => "btn btn-outline-dark m-1") if data.file_explorer_url %>
<% end %>
<% if Configuration.ood_bc_ssh_to_compute_node && Configuration.can_access_shell? %>
<%= link_to("#{fa_icon("terminal", classes: nil)} Open in Terminal".html_safe, data.shell_url, :class => "btn btn-outline-dark m-1") if data.shell_url %>
<%= link_to("#{fa_icon("terminal", classes: nil)} #{t('dashboard.active_jobs_open_in_terminal')}".html_safe, data.shell_url, :class => "btn btn-outline-dark m-1") if data.shell_url %>
<% end %>
<%= link_to("#{fa_icon("trash", classes: nil)} Delete".html_safe, delete_job_path(pbsid: data.pbsid, cluster: data.cluster), :class => "btn btn-outline-danger pull-right m-1", data: { method: "delete", confirm: "Are you sure you want to delete #{data.pbsid}" }) %>
<%= link_to("#{fa_icon("trash", classes: nil)} #{t('dashboard.delete')}".html_safe, delete_job_path(pbsid: data.pbsid, cluster: data.cluster), :class => "btn btn-outline-danger pull-right m-1", data: { method: "delete", confirm: t('dashboard.active_jobs_confirm_delete_job', pbsid: data.pbsid) }) %>
<% end %>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<div class="card mt-3">

<% if has_ganglia(data.cluster) %>
<div class="card-header">Node: <%= node %> <span class="float-end">Job: <%= data.pbsid %> </span></div>
<div class="card-header"><%= t('dashboard.node') %>: <%= node %> <span class="float-end"><%= t('dashboard.job') %>: <%= data.pbsid %> </span></div>
<div class="card-body">

<%= link_to image_tag( build_ganglia_link(data.cluster, data.starttime, 'cpu_report', node, 'small'), class:"img-responsive col-lg-auto col-md-auto col-sm-auto col-xs-auto", alt: "Ganglia image for CPU."), build_ganglia_link(data.cluster, data.starttime, 'cpu_report', node, 'large'), data: { lightbox: "cpu-report", title: "CPU Report " + node } %>
<%= link_to image_tag( build_ganglia_link(data.cluster, data.starttime, 'load_report', node, 'small'), class:"img-responsive col-lg-auto col-md-auto col-sm-auto col-xs-auto", alt: "Ganglia image for system load averages." ), build_ganglia_link(data.cluster, data.starttime, 'load_report', node, 'large'), data: { lightbox: "load-report", title: "Load Report " + node } %>
<%= link_to image_tag( build_ganglia_link(data.cluster, data.starttime, 'mem_report', node, 'small'), class:"img-responsive col-lg-auto col-md-auto col-sm-auto col-xs-auto", alt: "Ganglia image for Memory usage." ), build_ganglia_link(data.cluster, data.starttime, 'mem_report', node, 'large'), data: { lightbox: "mem-report", title: "Memory Report " + node } %>
<%= link_to image_tag( build_ganglia_link(data.cluster, data.starttime, 'network_report', node, 'small'), class:"img-responsive col-lg-auto col-md-auto col-sm-auto col-xs-auto", alt: "Ganglia image for network usage." ), build_ganglia_link(data.cluster, data.starttime, 'network_report', node, 'large'), data: { lightbox: "network-report", title: "Network Report " + node } %>
<%= link_to image_tag( build_ganglia_link(data.cluster, data.starttime, 'cpu_report', node, 'small'), class:"img-responsive col-lg-auto col-md-auto col-sm-auto col-xs-auto", alt: t('dashboard.active_jobs_ganglia_alt_cpu')), build_ganglia_link(data.cluster, data.starttime, 'cpu_report', node, 'large'), data: { lightbox: "cpu-report", title: "#{t('dashboard.cpu_report')} #{node}" } %>
<%= link_to image_tag( build_ganglia_link(data.cluster, data.starttime, 'load_report', node, 'small'), class:"img-responsive col-lg-auto col-md-auto col-sm-auto col-xs-auto", alt: t('dashboard.active_jobs_ganglia_alt_load') ), build_ganglia_link(data.cluster, data.starttime, 'load_report', node, 'large'), data: { lightbox: "load-report", title: "#{t('dashboard.load_report')} #{node}" } %>
<%= link_to image_tag( build_ganglia_link(data.cluster, data.starttime, 'mem_report', node, 'small'), class:"img-responsive col-lg-auto col-md-auto col-sm-auto col-xs-auto", alt: t('dashboard.active_jobs_ganglia_alt_memory') ), build_ganglia_link(data.cluster, data.starttime, 'mem_report', node, 'large'), data: { lightbox: "mem-report", title: "#{t('dashboard.memory_report')} #{node}" } %>
<%= link_to image_tag( build_ganglia_link(data.cluster, data.starttime, 'network_report', node, 'small'), class:"img-responsive col-lg-auto col-md-auto col-sm-auto col-xs-auto", alt: t('dashboard.active_jobs_ganglia_alt_network') ), build_ganglia_link(data.cluster, data.starttime, 'network_report', node, 'large'), data: { lightbox: "network-report", title: "#{t('dashboard.network_report')} #{node}" } %>
</div>
<% elsif has_grafana(data.cluster) %>
<div class="card-header">
Node: <%= node %>
<span class="ms-3">Job: <%= data.pbsid %></span>
<%= t('dashboard.node') %>: <%= node %>
<span class="ms-3"><%= t('dashboard.job') %>: <%= data.pbsid %></span>
<span class="ms-3">
<a href="<%= build_grafana_link(data.cluster, data.starttime, 'node', node, data.pbsid) %>">
<span class="fa fa-external-link-square-alt"></span> Detailed Metrics
<span class="fa fa-external-link-square-alt"></span> <%= t('dashboard.detailed_metrics') %>
</a>
</span>
</div>
Expand Down
26 changes: 13 additions & 13 deletions apps/dashboard/app/views/active_jobs/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</li>
<% end %>
<li class="divider"></li>
<li id="cluster-id-all" onclick="set_cluster_id('all');" data-title="All Clusters">
<a class="dropdown-item" href="#">All Clusters</a>
<li id="cluster-id-all" onclick="set_cluster_id('all');" data-title="<%= t('dashboard.all_clusters') %>">
<a class="dropdown-item" href="#"><%= t('dashboard.all_clusters') %></a>
</li>
</ul>
</div>
Expand All @@ -42,20 +42,20 @@
</div>
</div>
<div class="col-auto col-lg col-md-12 table-responsive">
<h2>Active Jobs</h2>
<h2><%= t('dashboard.active_jobs') %></h2>
<table id="job_status_table" class="table datatable table-hover" cellspacing="0" width="100%">
<thead>
<tr>
<th>Details</th>
<th>ID<span aria-hidden="true"></span></th>
<th>Name<span aria-hidden="true"></span></th>
<th>User<span aria-hidden="true"></span></th>
<th>Account<span aria-hidden="true"></span></th>
<th>Time Used<span aria-hidden="true"></span></th>
<th>Queue<span aria-hidden="true"></span></th>
<th>Status<span aria-hidden="true"></span></th>
<th>Cluster<span aria-hidden="true"></span></th>
<th>Actions<span aria-hidden="true"></span></th>
<th><%= t('dashboard.details') %></th>
<th><%= t('dashboard.id') %><span aria-hidden="true"></span></th>
<th><%= t('dashboard.name') %><span aria-hidden="true"></span></th>
<th><%= t('dashboard.user') %><span aria-hidden="true"></span></th>
<th><%= t('dashboard.account') %><span aria-hidden="true"></span></th>
<th><%= t('dashboard.time_used') %><span aria-hidden="true"></span></th>
<th><%= t('dashboard.queue') %><span aria-hidden="true"></span></th>
<th><%= t('dashboard.status') %><span aria-hidden="true"></span></th>
<th><%= t('dashboard.cluster') %><span aria-hidden="true"></span></th>
<th><%= t('dashboard.actions') %><span aria-hidden="true"></span></th>
</tr>
</thead>
</table>
Expand Down
27 changes: 27 additions & 0 deletions apps/dashboard/config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,32 @@ en:
used: "%{attribute} is already used"
dashboard:
active_jobs_close_details: "Close extended details panel."
active_jobs: Active Jobs
details: Details
id: ID
user: User
account: Account
time_used: Time Used
queue: Queue
status: Status
cluster: Cluster
node: Node
job: Job
detailed_metrics: Detailed Metrics
cpu_report: CPU Report
load_report: Load Report
memory_report: Memory Report
network_report: Network Report
active_jobs_ganglia_alt_cpu: Ganglia image for CPU.
active_jobs_ganglia_alt_load: Ganglia image for system load averages.
active_jobs_ganglia_alt_memory: Ganglia image for Memory usage.
active_jobs_ganglia_alt_network: Ganglia image for network usage.
submit_args: Submit Args
output_location: Output Location
active_jobs_open_in_file_manager: Open in File Manager
active_jobs_open_in_terminal: Open in Terminal
active_jobs_confirm_delete_job: Are you sure you want to delete %{pbsid}?
all_clusters: All Clusters
active_sessions_caption_html: <a href="%{all_sessions_url}"> view all (%{number_of_sessions})</a>
active_sessions_title: Active interactive sessions
add: Add
Expand Down Expand Up @@ -135,6 +161,7 @@ en:
close: Close
close_alert: Close this alert.
close_notice: Close this notice.
files_contents_of_directory: "Contents of directory %{path}"
custom_pages:
invalid: 'Invalid page code: %{page}. This page has not been configured'
date: Date
Expand Down
26 changes: 26 additions & 0 deletions apps/dashboard/config/locales/zh-CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,32 @@ zh-CN:
used: "%{attribute} 已被使用"
dashboard:
active_jobs_close_details: 关闭扩展详细信息面板。
active_jobs: 活动作业
details: 详细信息
id: ID
user: 用户
account: 账户
time_used: 已用时间
queue: 队列
status: 状态
cluster: 集群
node: 节点
job: 作业
detailed_metrics: 详细指标
cpu_report: CPU 报告
load_report: 负载报告
memory_report: 内存报告
network_report: 网络报告
active_jobs_ganglia_alt_cpu: Ganglia 的 CPU 图像。
active_jobs_ganglia_alt_load: Ganglia 的系统平均负载图像。
active_jobs_ganglia_alt_memory: Ganglia 的内存使用情况图像。
active_jobs_ganglia_alt_network: Ganglia 的网络使用情况图像。
submit_args: 提交参数
output_location: 输出位置
active_jobs_open_in_file_manager: 在文件管理器中打开
active_jobs_open_in_terminal: 在终端中打开
active_jobs_confirm_delete_job: 确定要删除 %{pbsid} 吗?
all_clusters: 所有集群
active_sessions_caption_html: <a href="%{all_sessions_url}"> 查看全部 (%{number_of_sessions})</a>
active_sessions_title: 活动交互会话
add: 添加
Expand Down
Loading