Skip to content

Localized dashboard/files page (#1960) #5359

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

Open
SimonX1a0 wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Localized dashboard/files page (#1960) #5359

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
efa15b8
feat: localized files page toolbar and breadcrumb
SimonX1a0 Apr 24, 2026
bd13a56
feat: localize files/turbo_frames files
SimonX1a0 Apr 24, 2026
35af694
Localized the table in files page
SimonX1a0 Apr 24, 2026
99e2518
feat: localize files/edit page
SimonX1a0 Apr 24, 2026
a40eb17
chore: move ondemand.yml out of git tree
SimonX1a0 Apr 24, 2026
7a11797
chore: simplify i18n key names for /files/edit
SimonX1a0 Apr 24, 2026
e517cb8
chore: simplified i18n keys in /files
SimonX1a0 Apr 24, 2026
aa083a9
Merge branch 'master' into localization-1960
Bubballoo3 Apr 30, 2026
0361e9c
chore: localize active_jobs page (#5363)
SimonX1a0 May 5, 2026
147e9b2
add #{node} to the localization
SimonX1a0 May 6, 2026
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
10 changes: 5 additions & 5 deletions apps/dashboard/app/views/active_jobs/_extended_data_table.html.erb
View file
Open in desktop
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
16 changes: 8 additions & 8 deletions apps/dashboard/app/views/active_jobs/_job_details_node_view.html.erb
View file
Open in desktop
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}" } %>
Copy link
Copy Markdown
Contributor

@Bubballoo3 Bubballoo3 May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's pass the node info to the localization in case the order changes for other languages

<%= 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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion apps/dashboard/app/views/apps/_app_group_rows.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<td>
<div class="btn-group dropend">
<%= link_to app.links.first.url, class: 'btn btn-primary' do %>
<span title="FontAwesome icon specified: folder" aria-hidden="true" class="fas fa-folder fa-fw"></span> Files
<span title=<%= t('dashboard.apps_folder_icon') %> aria-hidden="true" class="fas fa-folder fa-fw"></span> <%= t('dashboard.files') %>
<% end %>

<button type="button" class="btn dropdown-toggle dropdown-toggle-split btn-primary" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Expand Down
6 changes: 3 additions & 3 deletions apps/dashboard/app/views/files/_breadcrumb.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% if file_counter == 0 %>
<li class="breadcrumb-item">
<a href="<%= files_path(@filesystem, full_path.parent) %>" class="d btn btn-outline-dark btn-sm me-3" title="Go up directory">
<a href="<%= files_path(@filesystem, full_path.parent) %>" class="d btn btn-outline-dark btn-sm me-3" title="<%= t('dashboard.files_go_up_directory')%>">
<span class="fa fa-arrow-up"></span></a>
</li>
<% end %>
Expand All @@ -10,10 +10,10 @@
<%= path_segment_with_slash(@filesystem, file.basename.to_s, file_counter, file_count) %>
</li>
<li class="breadcrumb-item ms-3">
<button id="goto-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fas fa-edit" aria-hidden="true"></i> Change directory</button>
<button id="goto-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fas fa-edit" aria-hidden="true"></i> <%= t('dashboard.files_change_directory')%></button>
</li>
<li class="breadcrumb-item ms-auto">
<button id="copy-path" class="btn btn-outline-dark btn-sm " data-clipboard-text="<%= file.to_s %>"><span class="fa fa-clipboard"></span> Copy path</button>
<button id="copy-path" class="btn btn-outline-dark btn-sm " data-clipboard-text="<%= file.to_s %>"><span class="fa fa-clipboard"></span> <%= t('dashboard.files_copy_path')%></button>
</li>
<% else %>
<li class="breadcrumb-item">
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/app/views/files/_download_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%- if Configuration.download_enabled? -%>
<button id="download-btn" type="button" class="btn btn-primary btn-sm">
<i class="fas fa-download" aria-hidden="true"></i> Download
<i class="fas fa-download" aria-hidden="true"></i> <%= t('dashboard.download') %>
</button>
<%- end -%>
20 changes: 10 additions & 10 deletions apps/dashboard/app/views/files/_files_table.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
</ol>

<div role="region" aria-label="Directory contents">
<span id="select_all_label" class="d-none">Select All</span>
<span id="select_all_label" class="d-none"><%= t('dashboard.files_select_all') %></span>
<table class="table table-striped table-condensed w-100" id="directory-contents">
<caption id="directory-contents_caption" class="sr-only" aria-live='polite'> <%= "Contents of directory #{@path}" %> </caption>
<caption id="directory-contents_caption" class="sr-only" aria-live='polite'><%= t('dashboard.files_contents_of_directory', path: @path) %></caption>
<thead>
<tr>
<th>
<input type="checkbox" id="select_all" class="file-select" aria-describedby="select_all_label">
<span class="sr-only">Select</span>
<span class="sr-only"><%= t('dashboard.select') %></span>
</th>
<th>Type</th>
<th>Name</th>
<th><span class="sr-only">Actions</span></th>
<th>Size</th>
<th>Modified at</th>
<th>Owner</th>
<th>Mode</th>
<th><%= t('dashboard.type') %></th>
<th><%= t('dashboard.name') %></th>
<th><span class="sr-only"><%= t('dashboard.actions') %></span></th>
<th><%= t('dashboard.size') %></th>
<th><%= t('dashboard.files_modified_at') %></th>
<th><%= t('dashboard.owner') %></th>
<th><%= t('dashboard.mode') %></th>
</tr>
</thead>
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/app/views/files/_spinner.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="text-center text-primary d-none p-5" id="tloading_spinner">
<div class="spinner-border">
<span class="sr-only">Loading...</span>
<span class="sr-only"><%= t('dashboard.loading') %></span>
</div>
</div>
2 changes: 1 addition & 1 deletion apps/dashboard/app/views/files/_upload_button.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%- if Configuration.upload_enabled? -%>
<button id="upload-btn" type="button" class="btn btn-primary btn-sm">
<i class="fas fa-upload" aria-hidden="true"></i> Upload
<i class="fas fa-upload" aria-hidden="true"></i> <%= t('dashboard.upload') %>
</button>
<%- end -%>
18 changes: 9 additions & 9 deletions apps/dashboard/app/views/files/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
<div class="d-grid gap-2">
<button class="btn btn-primary" id="save-button">
<i class="fas fa-save pe-2" aria-hidden="true"></i>
<span>Save</span>
<span><%= t('dashboard.save') %></span>
</button>
</div>
</div>


<ul class="list-group list-group-flush border-bottom-0">
<li class="list-group-item hidden-xs hidden-sm hidden-md px-2 form-group form-inline m-0">
<label class="control-label navbar-text px-1" for="keybindings">Key Bindings</label>
<label class="control-label navbar-text px-1" for="keybindings"><%= t('dashboard.editor_key_bindings') %></label>
<select class="form-control input-xs" id="keybindings">
<option value="default">Default</option>
<option value="default"><%= t('dashboard.editor_key_bindings_default') %></option>
<option value="ace/keyboard/vim">Vim</option>
<option value="ace/keyboard/emacs">Emacs</option>
</select>
</li>
<li class="list-group-item hidden-xs px-2 form-group form-inline m-0">
<label class="control-label hidden-sm hidden-md navbar-text px-1" for="fontsize">Font Size</label>
<label class="control-label hidden-sm hidden-md navbar-text px-1" for="fontsize"><%= t('dashboard.editor_font_size') %></label>
<select class="form-control input-xs" id="fontsize">
<option value="8px">8px</option>
<option value="9px">9px</option>
Expand All @@ -46,7 +46,7 @@
</select>
</li>
<li class="list-group-item hidden-xs px-2 form-group form-inline m-0">
<label class="control-label hidden-sm hidden-md navbar-text px-1" for="mode">Mode</label>
<label class="control-label hidden-sm hidden-md navbar-text px-1" for="mode"><%= t('dashboard.mode') %></label>
<select class="form-control input-xs" id="mode">
<option value="abap">ABAP</option>
<option value="abc">ABC</option>
Expand Down Expand Up @@ -181,9 +181,9 @@
</select>
</li>
<li class="list-group-item hidden-xs px-2 form-group form-inline px-1 m-0">
<label class="control-label hidden-sm hidden-md px-1 navbar-text" for="theme">Theme</label>
<label class="control-label hidden-sm hidden-md px-1 navbar-text" for="theme"><%= t('dashboard.theme') %></label>
<select class="form-control input-xs" id="theme">
<optgroup label="Bright">
<optgroup label="<%= t('dashboard.bright') %>">
<option value="ace/theme/chrome">Chrome</option>
<option value="ace/theme/clouds">Clouds</option>
<option value="ace/theme/crimson_editor">Crimson Editor</option>
Expand All @@ -200,7 +200,7 @@
<option value="ace/theme/katzenmilch">KatzenMilch</option>
<option value="ace/theme/sqlserver">SQL Server</option>
</optgroup>
<optgroup label="Dark">
<optgroup label="<%= t('dashboard.dark') %>">
<option value="ace/theme/ambiance">Ambiance</option>
<option value="ace/theme/chaos">Chaos</option>
<option value="ace/theme/clouds_midnight">Clouds Midnight</option>
Expand All @@ -224,7 +224,7 @@
</select>
</li>
<li class="list-group-item hidden-xs px-2 form-group form-inline m-0">
<label class="control-label hidden-md hidden-lg navbar-text px-1" for="wordwrap">Wrap</label>
<label class="control-label hidden-md hidden-lg navbar-text px-1" for="wordwrap"><%= t('dashboard.wrap') %></label>
<div class="form-switch">
<input class="form-check-input" role="switch" type="checkbox" id="wordwrap" value="">
</div>
Expand Down
10 changes: 5 additions & 5 deletions apps/dashboard/app/views/files/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<%= render partial: 'shell_dropdown' %>
<% end %>

<button id="refresh-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fa fa-rotate-right" aria-hidden="true"></i> Refresh</button>
<button id="new-file-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fas fa-plus" aria-hidden="true"></i> New File</button>
<button id="new-dir-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fas fa-folder-plus" aria-hidden="true"></i> New Directory</button>
<button id="refresh-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fa fa-rotate-right" aria-hidden="true"></i> <%= t('dashboard.files_refresh') %></button>
<button id="new-file-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fas fa-plus" aria-hidden="true"></i> <%= t('dashboard.files_new_file') %></button>
<button id="new-dir-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fas fa-folder-plus" aria-hidden="true"></i> <%= t('dashboard.files_new_directory') %></button>
<%= render(partial: 'upload_button') %>
<%= render(partial: 'download_button') %>
<% if Configuration.globus_endpoints %>
Expand All @@ -18,8 +18,8 @@
<% if @user_configuration.files_select_target %>
<%= render partial: 'send_to_target_button' %>
<% end %>
<button id="copy-move-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fas fa-copy" aria-hidden="true"></i> Copy/Move</button>
<button id="delete-btn" type="button" class="btn btn-danger btn-sm"><i class="fas fa-trash" aria-hidden="true"></i> Delete</button>
<button id="copy-move-btn" type="button" class="btn btn-outline-dark btn-sm"><i class="fas fa-copy" aria-hidden="true"></i> <%= t('dashboard.files_copy_move') %></button>
<button id="delete-btn" type="button" class="btn btn-danger btn-sm"><i class="fas fa-trash" aria-hidden="true"></i> <%= t('dashboard.files_delete') %></button>
</div>

<hr>
Expand Down
18 changes: 9 additions & 9 deletions apps/dashboard/app/views/files/turbo_frames/_directory.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<table class="table table-striped table-condensed w-100 table-hover caption-right">
<thead>
<tr>
<th><span class="sr-only">Type</span></th>
<th>Name</th>
<th><span class="sr-only">Actions</span></th>
<th><span class="sr-only"><%= t('dashboard.type') %></span></th>
<th><%= t('dashboard.name') %></th>
<th><span class="sr-only"><%= t('dashboard.actions') %></span></th>
<% private_dir = path.to_s.start_with?(CurrentUser.home) %>
<% if private_dir %>
<th>Size</th>
<th>Date</th>
<th><%= t('dashboard.size') %></th>
<th><%= t('dashboard.date') %></th>
<% else %>
<th class='d-above-xl'>Size</th>
<th class='d-above-xl'>Date</th>
<th>Owner</th>
<th>Mode</th>
<th class='d-above-xl'><%= t('dashboard.size') %></th>
<th class='d-above-xl'><%= t('dashboard.date') %></th>
<th><%= t('dashboard.owner') %></th>
<th><%= t('dashboard.mode') %></th>
<% end %>
</tr>
</thead>
Expand Down
Loading
Loading