You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/08/01 02:13:01 UTC
git commit: Revert formated->formatted attempted typo correction.
Repository: incubator-aurora
Updated Branches:
refs/heads/master 3e86677ee -> 475fdd3a4
Revert formated->formatted attempted typo correction.
Bugs closed: AURORA-628
Reviewed at https://reviews.apache.org/r/24169/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/475fdd3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/475fdd3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/475fdd3a
Branch: refs/heads/master
Commit: 475fdd3a48ebcbffc5fbdfe315e8320b216c0912
Parents: 3e86677
Author: Bill Farner <wf...@apache.org>
Authored: Thu Jul 31 17:12:57 2014 -0700
Committer: Bill Farner <wf...@apache.org>
Committed: Thu Jul 31 17:12:57 2014 -0700
----------------------------------------------------------------------
.../aurora/scheduler/http/ui/js/directives.js | 12 ++++-----
.../aurora/scheduler/http/ui/roleLink.html | 25 ++++++++++---------
.../scheduler/http/ui/schedulingDetail.html | 26 ++++++++++----------
.../aurora/scheduler/http/ui/taskSandbox.html | 8 +++---
.../aurora/scheduler/http/ui/taskStatus.html | 6 ++---
5 files changed, 39 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/475fdd3a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
index 6cc31aa..7f05a55 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
@@ -18,14 +18,14 @@
auroraUI.directive('roleLink', function () {
return {
restrict: 'C',
- template: '<a ng-href="/scheduler/{{formattedValue}}">{{formattedValue}}</a>'
+ template: '<a ng-href="/scheduler/{{formatedValue}}">{{formatedValue}}</a>'
};
});
auroraUI.directive('roleEnvLink', function () {
return {
restrict: 'C',
- template: '<a ng-href="/scheduler/{{dataRow.role}}/{{formattedValue}}">{{formattedValue}}</a>'
+ template: '<a ng-href="/scheduler/{{dataRow.role}}/{{formatedValue}}">{{formatedValue}}</a>'
};
});
@@ -33,8 +33,8 @@
return {
restrict: 'C',
template:
- '<a ng-href="/scheduler/{{dataRow.role}}/{{dataRow.environment}}/{{formattedValue}}">' +
- '{{formattedValue}}</a>'
+ '<a ng-href="/scheduler/{{dataRow.role}}/{{dataRow.environment}}/{{formatedValue}}">' +
+ '{{formatedValue}}</a>'
};
});
@@ -74,8 +74,8 @@
auroraUI.directive('taskLink', function () {
return {
restrict: 'C',
- template: '<a class="col-md-8" ng-href="/structdump/task/{{formattedValue}}" ' +
- 'target="_self">{{formattedValue}}</a>'
+ template: '<a class="col-md-8" ng-href="/structdump/task/{{formatedValue}}" ' +
+ 'target="_self">{{formatedValue}}</a>'
};
});
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/475fdd3a/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html
index aa1af4a..995348b 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/roleLink.html
@@ -1,14 +1,15 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+<div class='role-link'>
+ <!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
- <div class='role-link'></div>
\ No newline at end of file
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/475fdd3a/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html
index 94ec1a5..eb88c1e 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html
@@ -1,17 +1,17 @@
- <div class='scheduling-detail'>
- <!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+<div class='scheduling-detail'>
+ <!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<ul class='unstyled'>
<li>resources:
cpu: {{dataRow.schedulingDetail.numCpus | toCores}},
@@ -33,4 +33,4 @@
contact: {{dataRow.schedulingDetail.contact}}
</li>
</ul>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/475fdd3a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
index 6b52467..5368838 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
@@ -1,4 +1,4 @@
- <div>
+<div>
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
limitations under the License.
-->
<span ng-if='dataRow.sandboxExists'>
- <a ng-href='http://{{formattedValue}}:1338/task/{{dataRow.taskId}}'>
- {{formattedValue}}
+ <a ng-href='http://{{formatedValue}}:1338/task/{{dataRow.taskId}}'>
+ {{formatedValue}}
</a>
</span>
<span ng-if='!dataRow.sandboxExists'>
<abbr title='This sandbox link is disabled because the sandbox disk space has been reclaimed.'>
- {{formattedValue}}
+ {{formatedValue}}
</abbr>
</span>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/475fdd3a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
index 77efb2a..ae32866 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
@@ -13,7 +13,7 @@
limitations under the License.
-->
<div>
- <span title='{{formattedValue | scheduleStatusTooltip}}'>
+ <span title='{{formatedValue | scheduleStatusTooltip}}'>
<span ng-if='!showDetails'>
<i class='glyphicon glyphicon-plus' ng-click="toggleShowDetails()"></i>
</span>
@@ -22,7 +22,7 @@
</span>
<span>
{{dataRow.latestActivity | toElapsedTime}} ago -
- <span class='schedulingStatus'>{{formattedValue}}</span>
+ <span class='schedulingStatus'>{{formatedValue}}</span>
<span ng-if='dataRow.statusMessage'>: {{dataRow.statusMessage}}</span>
</span>
</span>
@@ -37,4 +37,4 @@
</li>
</ul>
</div>
-</task-status>
\ No newline at end of file
+</task-status>