Skip to content

Commit cf48ed9

Browse files
author
OpenShift Bot
authored
Merge pull request #876 from jwforres/long-date-format
Merged by openshift-bot
2 parents 91841a7 + 008ff70 commit cf48ed9

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎app/views/browse/_build-details.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h3>Status</h3>
1616
<dd>
1717
<span ng-if="build.status.startTimestamp">
1818
<relative-timestamp timestamp="build.status.startTimestamp"></relative-timestamp>
19-
<span><span class="text-muted">&ndash;</span> {{build.status.startTimestamp | date : 'MMM dd, yyyy h:mm a'}}</span>
19+
<span><span class="text-muted">&ndash;</span> {{build.status.startTimestamp | date : 'medium'}}</span>
2020
</span>
2121
<span ng-if="!build.status.startTimestamp"><em>not started</em></span>
2222
</dd>

‎app/views/browse/build.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ <h3>Environment Variables</h3>
123123
<span class="space-after">{{build.status.phase}}</span>
124124

125125
<div ng-if="build.status.startTimestamp && !logEmpty" class="log-timestamps">
126-
Log from {{build.status.startTimestamp | date : 'short'}}
126+
Log from {{build.status.startTimestamp | date : 'medium'}}
127127
<span ng-if="build.status.completionTimestamp">
128-
to {{build.status.completionTimestamp | date : 'short'}}
128+
to {{build.status.completionTimestamp | date : 'medium'}}
129129
</span>
130130
</div>
131131

‎app/views/browse/pod.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ <h3>Container {{container.name}} Environment Variables</h3>
115115
</span>
116116

117117
<span ng-if="containerStartTime && !logEmpty">
118-
<span class="log-timestamps">Log from {{containerStartTime | date : 'short'}} <span ng-if="containerEndTime">to {{containerEndTime | date : 'short'}}</span></span>
118+
<span class="log-timestamps">Log from {{containerStartTime | date : 'medium'}} <span ng-if="containerEndTime">to {{containerEndTime | date : 'medium'}}</span></span>
119119
</span>
120120

121121
</log-viewer>

‎app/views/logs/chromeless-build-log.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
name="build.metadata.name"
1919
context="projectContext"
2020
status="build.status.phase"
21-
time-start="build.status.startTimestamp | date : 'short'"
22-
time-end="build.status.completionTimestamp | date : 'short'"
21+
time-start="build.status.startTimestamp | date : 'medium'"
22+
time-end="build.status.completionTimestamp | date : 'medium'"
2323
chromeless="true"
2424
run="logCanRun"
2525
flex>

‎app/views/logs/chromeless-pod-log.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
context="projectContext"
2020
options="logOptions"
2121
status="pod.status.phase"
22-
time-start="pod.status.startTime | date : 'short'"
22+
time-start="pod.status.startTime | date : 'medium'"
2323
chromeless="true"
2424
run="logCanRun"
2525
flex>

‎app/views/monitoring.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ <h2>Builds</h2>
121121
full-log-url="(build | navigateResourceURL) + '?view=chromeless'">
122122

123123
<div ng-if="build.status.startTimestamp && !logEmpty.builds[build.metadata.name]" class="log-timestamps" style="margin-left: 0;">
124-
Log from {{build.status.startTimestamp | date : 'short'}}
124+
Log from {{build.status.startTimestamp | date : 'medium'}}
125125
<span ng-if="build.status.completionTimestamp">
126-
to {{build.status.completionTimestamp | date : 'short'}}
126+
to {{build.status.completionTimestamp | date : 'medium'}}
127127
</span>
128128
</div>
129129

@@ -336,7 +336,7 @@ <h2>Pods</h2>
336336
</span>
337337

338338
<span ng-if="containerStartTime && !logEmpty.pods[pod.metadata.name]">
339-
<span class="log-timestamps">Log from {{containerStartTime | date : 'short'}} <span ng-if="containerEndTime">to {{containerEndTime | date : 'short'}}</span></span>
339+
<span class="log-timestamps">Log from {{containerStartTime | date : 'medium'}} <span ng-if="containerEndTime">to {{containerEndTime | date : 'medium'}}</span></span>
340340
</span>
341341

342342
</log-viewer>

‎dist/scripts/templates.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
10741074
"<dd>\n" +
10751075
"<span ng-if=\"build.status.startTimestamp\">\n" +
10761076
"<relative-timestamp timestamp=\"build.status.startTimestamp\"></relative-timestamp>\n" +
1077-
"<span><span class=\"text-muted\">&ndash;</span> {{build.status.startTimestamp | date : 'MMM dd, yyyy h:mm a'}}</span>\n" +
1077+
"<span><span class=\"text-muted\">&ndash;</span> {{build.status.startTimestamp | date : 'medium'}}</span>\n" +
10781078
"</span>\n" +
10791079
"<span ng-if=\"!build.status.startTimestamp\"><em>not started</em></span>\n" +
10801080
"</dd>\n" +
@@ -1919,9 +1919,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
19191919
"<status-icon status=\"build.status.phase\"></status-icon>\n" +
19201920
"<span class=\"space-after\">{{build.status.phase}}</span>\n" +
19211921
"<div ng-if=\"build.status.startTimestamp && !logEmpty\" class=\"log-timestamps\">\n" +
1922-
"Log from {{build.status.startTimestamp | date : 'short'}}\n" +
1922+
"Log from {{build.status.startTimestamp | date : 'medium'}}\n" +
19231923
"<span ng-if=\"build.status.completionTimestamp\">\n" +
1924-
"to {{build.status.completionTimestamp | date : 'short'}}\n" +
1924+
"to {{build.status.completionTimestamp | date : 'medium'}}\n" +
19251925
"</span>\n" +
19261926
"</div>\n" +
19271927
"</log-viewer>\n" +
@@ -2947,7 +2947,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
29472947
"<span>{{containerStateReason || containerStatusKey | sentenceCase}}</span>\n" +
29482948
"</span>\n" +
29492949
"<span ng-if=\"containerStartTime && !logEmpty\">\n" +
2950-
"<span class=\"log-timestamps\">Log from {{containerStartTime | date : 'short'}} <span ng-if=\"containerEndTime\">to {{containerEndTime | date : 'short'}}</span></span>\n" +
2950+
"<span class=\"log-timestamps\">Log from {{containerStartTime | date : 'medium'}} <span ng-if=\"containerEndTime\">to {{containerEndTime | date : 'medium'}}</span></span>\n" +
29512951
"</span>\n" +
29522952
"</log-viewer>\n" +
29532953
"</uib-tab>\n" +
@@ -8706,7 +8706,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
87068706
"</div>\n" +
87078707
"</div>\n" +
87088708
"<div class=\"middle-content\">\n" +
8709-
"<log-viewer resource=\"builds/log\" name=\"build.metadata.name\" context=\"projectContext\" status=\"build.status.phase\" time-start=\"build.status.startTimestamp | date : 'short'\" time-end=\"build.status.completionTimestamp | date : 'short'\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
8709+
"<log-viewer resource=\"builds/log\" name=\"build.metadata.name\" context=\"projectContext\" status=\"build.status.phase\" time-start=\"build.status.startTimestamp | date : 'medium'\" time-end=\"build.status.completionTimestamp | date : 'medium'\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
87108710
"</log-viewer>\n" +
87118711
"</div>\n" +
87128712
"</div>\n" +
@@ -8758,7 +8758,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
87588758
"</div>\n" +
87598759
"</div>\n" +
87608760
"<div class=\"middle-content\">\n" +
8761-
"<log-viewer resource=\"pods/log\" name=\"pod.metadata.name\" context=\"projectContext\" options=\"logOptions\" status=\"pod.status.phase\" time-start=\"pod.status.startTime | date : 'short'\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
8761+
"<log-viewer resource=\"pods/log\" name=\"pod.metadata.name\" context=\"projectContext\" options=\"logOptions\" status=\"pod.status.phase\" time-start=\"pod.status.startTime | date : 'medium'\" chromeless=\"true\" run=\"logCanRun\" flex>\n" +
87628762
"</log-viewer>\n" +
87638763
"</div>\n" +
87648764
"</div>\n" +
@@ -9324,9 +9324,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
93249324
"\n" +
93259325
"<log-viewer ng-if=\"'builds/log' | canI : 'get'\" resource=\"builds/log\" name=\"build.metadata.name\" context=\"projectContext\" options=\"logOptions.builds[build.metadata.name]\" empty=\"logEmpty.builds[build.metadata.name]\" run=\"logCanRun.builds[build.metadata.name]\" fixed-height=\"250\" full-log-url=\"(build | navigateResourceURL) + '?view=chromeless'\">\n" +
93269326
"<div ng-if=\"build.status.startTimestamp && !logEmpty.builds[build.metadata.name]\" class=\"log-timestamps\" style=\"margin-left: 0\">\n" +
9327-
"Log from {{build.status.startTimestamp | date : 'short'}}\n" +
9327+
"Log from {{build.status.startTimestamp | date : 'medium'}}\n" +
93289328
"<span ng-if=\"build.status.completionTimestamp\">\n" +
9329-
"to {{build.status.completionTimestamp | date : 'short'}}\n" +
9329+
"to {{build.status.completionTimestamp | date : 'medium'}}\n" +
93309330
"</span>\n" +
93319331
"</div>\n" +
93329332
"</log-viewer>\n" +
@@ -9490,7 +9490,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
94909490
"<span>{{containerStateReason || containerStatusKey | sentenceCase}}</span>\n" +
94919491
"</span>\n" +
94929492
"<span ng-if=\"containerStartTime && !logEmpty.pods[pod.metadata.name]\">\n" +
9493-
"<span class=\"log-timestamps\">Log from {{containerStartTime | date : 'short'}} <span ng-if=\"containerEndTime\">to {{containerEndTime | date : 'short'}}</span></span>\n" +
9493+
"<span class=\"log-timestamps\">Log from {{containerStartTime | date : 'medium'}} <span ng-if=\"containerEndTime\">to {{containerEndTime | date : 'medium'}}</span></span>\n" +
94949494
"</span>\n" +
94959495
"</log-viewer>\n" +
94969496
"\n" +

0 commit comments

Comments
 (0)