Skip to content

Fix HTML license; standardize HTML code #11067

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

Merged
DaanHoogland merged 4 commits into from
Jul 23, 2025
Merged

Fix HTML license; standardize HTML code #11067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d64428a
Fix HTML license; standardize HTML code
jbampton Jun 20, 2025
ecde95a
Merge branch 'main' into modernize-html-code
jbampton Jul 23, 2025
96302df
Update systemvm/agent/noVNC/vnc.html
jbampton Jul 23, 2025
6950229
Update systemvm/agent/noVNC/vnc_lite.html
jbampton Jul 23, 2025
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 systemvm/agent/ui/viewer.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ under the License.
-->
<html>
<head>
<script type="text/javascript" language="javascript" src="/resource/js/jquery.js"></script>
<script type="text/javascript" language="javascript" src="/resource/js/ajaxviewer.js"></script>
<script type="text/javascript" language="javascript" src="/resource/js/ajaxkeys.js"></script>
<script type="text/javascript" language="javascript" src="/resource/js/handler.js"></script>
<script src="/resource/js/jquery.js"></script>
<script src="/resource/js/ajaxviewer.js"></script>
<script src="/resource/js/ajaxkeys.js"></script>
<script src="/resource/js/handler.js"></script>
<link rel="stylesheet" type="text/css" href="/resource/css/ajaxviewer.css"></link>
<title>${title}</title>
</head>
Expand All @@ -44,7 +44,7 @@ under the License.

<div id="main_panel" tabindex="1"></div>

<script language="javascript">
<script>

var tileMap = [ ${tileSequence} ];
var ajaxViewer = new AjaxViewer('main_panel', '${imgUrl}', '${updateUrl}', tileMap,
Expand Down
2 changes: 1 addition & 1 deletion tools/apidoc/generatecommands.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ version="1.0">
</div><!-- #BeginLibraryItem "/libraries/footer.lbi" -->
<div id="footer">
<div id="comments_thread">
<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=test" async="true">
<script src="https://comments.apache.org/show_comments.lua?site=test" async="true">
</script>
<noscript>
<iframe width="930" height="500" src="https://comments.apache.org/iframe.lua?site=test&amp;page=4.2.0/rootadmin"></iframe>
Expand Down
106 changes: 55 additions & 51 deletions tools/ngui/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
#Licensed to the Apache Software Foundation (ASF) under one
#or more contributor license agreements. See the NOTICE file
#distributed with this work for additional information
#regarding copyright ownership. The ASF licenses this file
#to you 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
#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.
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you 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

<!DOCTYPE html>
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.
-->

<!doctype html>
<html lang="en" ng-app="cloudstack">
<head>
<meta charset="utf-8">
Expand Down Expand Up @@ -102,41 +106,41 @@ <h3>CloudStack UI using Angular.js and Twitter Bootstrap</h3>
</table>
</script>

<script type="text/javascript" src="static/js/lib/jquery-1.7.2.js"></script>
<script type="text/javascript" src="static/js/lib/angular.js"></script>
<script type="text/javascript" src="static/js/app/app.js"></script>
<script type="text/javascript" src="static/js/common/resources/virtualmachines.js"></script>
<script type="text/javascript" src="static/js/app/instances/instances.js"></script>
<script type="text/javascript" src="static/js/common/resources/volumes.js"></script>
<script type="text/javascript" src="static/js/common/resources/snapshots.js"></script>
<script type="text/javascript" src="static/js/app/storage/storage.js"></script>
<script type="text/javascript" src="static/js/common/resources/networks.js"></script>
<script type="text/javascript" src="static/js/app/networks/networks.js"></script>
<script type="text/javascript" src="static/js/common/resources/templates.js"></script>
<script type="text/javascript" src="static/js/app/templates/templates.js"></script>
<script type="text/javascript" src="static/js/common/resources/events.js"></script>
<script type="text/javascript" src="static/js/app/events/events.js"></script>
<script type="text/javascript" src="static/js/common/resources/accounts.js"></script>
<script type="text/javascript" src="static/js/app/accounts/accounts.js"></script>
<script type="text/javascript" src="static/js/common/resources/domains.js"></script>
<script type="text/javascript" src="static/js/app/domains/domains.js"></script>
<script type="text/javascript" src="static/js/app/globalsettings/globalsettings.js"></script>
<script type="text/javascript" src="static/js/app/serviceofferings/serviceofferings.js"></script>
<script type="text/javascript" src="static/js/common/resources/serviceofferings.js"></script>
<script type="text/javascript" src="static/js/common/resources/projects.js"></script>
<script type="text/javascript" src="static/js/app/projects/projects.js"></script>
<script type="text/javascript" src="static/js/common/resources/configurations.js"></script>
<script type="text/javascript" src="static/js/common/services/breadcrumbs.js"></script>
<script type="text/javascript" src="static/js/common/services/helperfunctions.js"></script>
<script type="text/javascript" src="static/js/common/services/requester.js"></script>
<script type="text/javascript" src="static/js/common/services/notifications.js"></script>
<script type="text/javascript" src="static/js/common/directives/confirm.js"></script>
<script type="text/javascript" src="static/js/common/directives/modal-form.js"></script>
<script type="text/javascript" src="static/js/common/directives/label.js"></script>
<script type="text/javascript" src="static/js/common/directives/edit-in-place.js"></script>
<script type="text/javascript" src="static/js/common/dictionary.js"></script>
<script type="text/javascript" src="static/js/common/resources/zones.js"></script>
<script type="text/javascript" src="static/js/common/resources/diskofferings.js"></script>
<script type="text/javascript" src="static/js/lib/angular-ui.min.js"></script>
<script src="static/js/lib/jquery-1.7.2.js"></script>
<script src="static/js/lib/angular.js"></script>
<script src="static/js/app/app.js"></script>
<script src="static/js/common/resources/virtualmachines.js"></script>
<script src="static/js/app/instances/instances.js"></script>
<script src="static/js/common/resources/volumes.js"></script>
<script src="static/js/common/resources/snapshots.js"></script>
<script src="static/js/app/storage/storage.js"></script>
<script src="static/js/common/resources/networks.js"></script>
<script src="static/js/app/networks/networks.js"></script>
<script src="static/js/common/resources/templates.js"></script>
<script src="static/js/app/templates/templates.js"></script>
<script src="static/js/common/resources/events.js"></script>
<script src="static/js/app/events/events.js"></script>
<script src="static/js/common/resources/accounts.js"></script>
<script src="static/js/app/accounts/accounts.js"></script>
<script src="static/js/common/resources/domains.js"></script>
<script src="static/js/app/domains/domains.js"></script>
<script src="static/js/app/globalsettings/globalsettings.js"></script>
<script src="static/js/app/serviceofferings/serviceofferings.js"></script>
<script src="static/js/common/resources/serviceofferings.js"></script>
<script src="static/js/common/resources/projects.js"></script>
<script src="static/js/app/projects/projects.js"></script>
<script src="static/js/common/resources/configurations.js"></script>
<script src="static/js/common/services/breadcrumbs.js"></script>
<script src="static/js/common/services/helperfunctions.js"></script>
<script src="static/js/common/services/requester.js"></script>
<script src="static/js/common/services/notifications.js"></script>
<script src="static/js/common/directives/confirm.js"></script>
<script src="static/js/common/directives/modal-form.js"></script>
<script src="static/js/common/directives/label.js"></script>
<script src="static/js/common/directives/edit-in-place.js"></script>
<script src="static/js/common/dictionary.js"></script>
<script src="static/js/common/resources/zones.js"></script>
<script src="static/js/common/resources/diskofferings.js"></script>
<script src="static/js/lib/angular-ui.min.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion ui/public/example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
<!DOCTYPE html>
<!doctype html>
<html lang="en-gb">
<head>
<meta charset="utf-8">
Expand Down
2 changes: 1 addition & 1 deletion ui/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
<!DOCTYPE html>
<!doctype html>
<html lang="en-gb">
<head>
<meta charset="utf-8">
Expand Down
Loading