Skip to content

Commit db26548

Browse files
authored
Merge branch 'master' into test/inverse-precedence-861-864
2 parents 7fbbeee + 881df63 commit db26548

8 files changed

Lines changed: 10 additions & 2 deletions

File tree

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockableResourcesRootAction/tableLabels/table.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ THE SOFTWARE.
4040
data-table-configuration='
4141
{
4242
"stateSave": true,
43+
"language": { "emptyTable": "${%table.empty}" },
4344
"lengthMenu": [
4445
[10, 25, 50, 100, -1],
4546
[10, 25, 50, 100, "${%table.settings.page.length.all}"]

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockableResourcesRootAction/tableLabels/table.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ labels.table.column.percentage=Free in %
2727
labels.free.tooltip={0} % free
2828

2929
# Table settings
30-
table.settings.page.length.all=ALL
30+
table.settings.page.length.all=ALL
31+
table.empty=No labels configured

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockableResourcesRootAction/tableQueue/table.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ THE SOFTWARE.
6464
data-table-configuration='
6565
{
6666
"stateSave": true,
67+
"language": { "emptyTable": "${%table.empty}" },
6768
"lengthMenu": [
6869
[10, 25, 50, 100, -1],
6970
[10, 25, 50, 100, "${%table.settings.page.length.all}"]

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockableResourcesRootAction/tableQueue/table.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ queue.table.column.reason=Reason
3838
queue.table.column.priority=Queue priority
3939
queue.table.column.action=Action
4040
queue.table.column.id=Queue ID
41+
table.empty=No entries in the queue
4142

4243
#status
4344
resource.status.locked=<strong class="jenkins-!-warning-color">Locked</strong> by <a class="jenkins-table__link model-link jenkins-table__badge" href="{0}">{1}</a>

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockableResourcesRootAction/tableResources/table.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ THE SOFTWARE.
5353
],
5454
"order": [ 0, "asc" ],
5555
"stateSave": true,
56+
"language": { "emptyTable": "${%table.empty}" },
5657
"lengthMenu": [
5758
[10, 25, 50, 100, -1],
5859
[10, 25, 50, 100, "${%table.settings.page.length.all}"]

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockableResourcesRootAction/tableResources/table.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,5 @@ btn.editNote=Note
6767
btn.editNote.detail=Edit resource note.
6868

6969
# Table settings
70-
table.settings.page.length.all=ALL
70+
table.settings.page.length.all=ALL
71+
table.empty=No resources configured

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockedResourcesBuildAction/index.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ THE SOFTWARE.
6060
data-table-configuration='
6161
{
6262
"stateSave": true,
63+
"language": { "emptyTable": "${%table.empty}" },
6364
"lengthMenu": [
6465
[10, 25, 50, 100, -1],
6566
[10, 25, 50, 100, "${%table.settings.page.length.all}"]

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockedResourcesBuildAction/index.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ table.column.step=Step
2929
table.column.timeStamp=Timestamp
3030
table.column.action=Action
3131
table.settings.page.length.all=ALL
32+
table.empty=No resources were used by this build

0 commit comments

Comments
 (0)