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.

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

Jump to bottom

Fix Link on CPG Tutorial Not Opening in Browser From Electron #4202

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Fix Link on CPG Tutorial Not Opening in Browser From Electron #4202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions CSETWebNg/main-electron.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function createWindow() {
height: 800,
webPreferences: { nodeIntegration: true, webSecurity: false },
icon: path.join(__dirname, 'dist/favicon_' + installationMode.toLowerCase() + '.ico'),
title: appName === appName
title: appName
});

// Default Electron application menu is immutable; have to create new one and modify from there
Expand Down Expand Up @@ -329,7 +329,7 @@ function createWindow() {
overrideBrowserWindowOptions: {
parent: mainWindow,
icon: path.join(__dirname, 'dist/favicon_' + installationMode.toLowerCase() + '.ico'),
title: details.frameName === 'csetweb-ng' || '_blank' ? `${appName}` : details.frameName
title: details.frameName.includes('web-ng') || details.frameName === '_blank' ? `${appName}` : details.frameName
}
};
})
Expand Down
46 changes: 23 additions & 23 deletions CSETWebNg/src/app/assessment/prepare/maturity/tutorial-cpg/tutorial-cpg.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<!----------------------
<!----------------------

Copyright 2024 Battelle Energy Alliance, LLC
Copyright 2024 Battelle Energy Alliance, LLC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-------------------------->
<div class="white-panel d-flex justify-content-start flex-column flex-11a tutorial"
*transloco="let t; read: 'tutorials.cpg'">
Expand All @@ -43,7 +43,7 @@ <h5 >{{k('titles.assessment')}}</h5>
<div class="img-frame">
<img src="assets/images/CPG/tutorial/Picture1.png" style="width: 550px">
</div>

<h6>{{k('tutorials.function')}}</h6>
<div class="img-frame">
<img src="assets/images/CPG/tutorial/Picture2.png" style="width: 350px">
Expand Down Expand Up @@ -101,7 +101,7 @@ <h6>{{k('titles.cset icons')}}</h6>
<div class="img-frame">
<img src="assets/images/CPG/tutorial/Picture7.png" style="width: 400px">
</div>

<h6>{{k('titles.answer buttons')}}</h6>
<div class="img-frame">
<img src="assets/images/CPG/tutorial/Picture8.png" style="width: 300px">
Expand All @@ -115,7 +115,7 @@ <h6>{{k('titles.answer buttons')}}</h6>
</ul>
<h5>{{k('titles.additional resources')}}</h5>
<p>{{k('tutorials.additional resources')}}</p>
<p>{{k('tutorials.please visit')}} <a href ="https://www.cisa.gov/cpgs">https://www.cisa.gov/cpgs</a> {{k('tutorials.for more information')}}</p>
<p>{{k('tutorials.please visit')}} <a href="https://www.cisa.gov/cpgs" target="_blank">https://www.cisa.gov/cpgs</a> {{k('tutorials.for more information')}}</p>
</div>
<app-nav-back-next [page]="'tutorial-cpg'"></app-nav-back-next>
</div>
</div>
Loading