Skip to content
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.

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

Update documentation site #3789

Merged
merged 3 commits into from
Oct 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Security

- TDB
- Fix security issues on the documentation website unsafe use of target blank
and potential clickjacking on legacy browsers (<https://github.com/openvinotoolkit/cvat/pull/3789>)

## \[1.6.0] - 2021-09-17

Expand Down
6 changes: 0 additions & 6 deletions site/assets/scss/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@
padding-top: 2rem !important;
}

/* Icon color for temporary page */

#temporary-page i {
color: lightgrey;
}

/* About page */

.logo-2 {
Expand Down
24 changes: 0 additions & 24 deletions site/content/en/_index.html

This file was deleted.

7 changes: 6 additions & 1 deletion site/layouts/404.html
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
<meta http-equiv="refresh" content="0; URL=/cvat/page_404">
<!DOCTYPE html>
<html lang="en" class="no-js">
<head>
<meta http-equiv="refresh" content="0; URL=/cvat/page_404">
</head>
</html>
6 changes: 6 additions & 0 deletions site/layouts/home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!DOCTYPE html>
<html lang="en" class="no-js">
<head>
<meta http-equiv="refresh" content="0; URL=/cvat/docs">
</head>
</html>
8 changes: 4 additions & 4 deletions site/layouts/partials/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
{{ end }}
</div>
<div class="col-12 col-sm-8 text-center order-sm-2">
{{ with .Site.Params.intel_privacy_notice }}<small class="mr-1"><a href="{{ . }}" target="_blank">{{ T "footer_intel_privacy_notice" }}</a></small>{{ end }}
{{ with .Site.Params.intel_privacy_notice }}<small class="mr-1"><a href="{{ . }}">{{ T "footer_intel_privacy_notice" }}</a></small>{{ end }}
|
{{ with .Site.Params.intel_terms_of_use }}<small class="mx-1"><a href="{{ . }}" target="_blank">{{ T "footer_intel_terms_of_use" }}</a></small>{{ end }}
{{ with .Site.Params.intel_terms_of_use }}<small class="mx-1"><a href="{{ . }}">{{ T "footer_intel_terms_of_use" }}</a></small>{{ end }}
|
{{ with .Site.Params.cvat_terms_of_use }}<small class="ml-1"><a href="{{ . }}" target="_blank">{{ T "footer_cvat_terms_of_use" }}</a></small>{{ end }}
{{ with .Site.Params.cvat_terms_of_use }}<small class="ml-1"><a href="{{ . }}">{{ T "footer_cvat_terms_of_use" }}</a></small>{{ end }}
<br/>
<div class="footer-disclaimer text-white ">
<small>Intel technologies may require enabled hardware, software or service activation. // No product or component can be absolutely secure. // Your costs and results may vary. // Performance varies by use, configuration and other factors. // See our complete legal <u><a href="https://edc.intel.com/content/www/us/en/products/performance/benchmarks/overview/?r=219444055">Notices and Disclaimers</a></u>. // Intel is committed to respecting human rights and avoiding complicity in human rights abuses. See Intel’s <a href="https://www.intel.com/content/www/us/en/policy/policy-human-rights.html"><u>Global Human Rights Principles</u></a>. Intel’s products and software are intended only to be used in applications that do not cause or contribute to a violation of an internationally recognized human right.</small>
Expand All @@ -37,7 +37,7 @@
<ul class="list-inline mb-0">
{{ range . }}
<li class="list-inline-item mx-2 h3" data-toggle="tooltip" data-placement="top" title="{{ .name }}" aria-label="{{ .name }}">
<a class="text-white" target="_blank" rel="noopener noreferrer" href="{{ .url }}">
<a class="text-white" rel="noopener noreferrer" href="{{ .url }}">
<i class="{{ .icon }}"></i>
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion site/layouts/partials/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{{ $post := .Post }}
{{ $url := urls.Parse .URL }}
{{ $baseurl := urls.Parse $.Site.Params.Baseurl }}
<a class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if ne $url.Host $baseurl.Host }}target="_blank" {{ end }}>{{ with .Pre}}{{ $pre }}{{ end }}<span{{if $active }} class="active"{{end}}>{{ .Name }}</span>{{ with .Post}}{{ $post }}{{ end }}</a>
<a class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if ne $url.Host $baseurl.Host }} {{ end }}>{{ with .Pre}}{{ $pre }}{{ end }}<span{{if $active }} class="active"{{end}}>{{ .Name }}</span>{{ with .Post}}{{ $post }}{{ end }}</a>
</li>
{{ end }}
{{ if .Site.Params.versions }}
Expand Down