Skip to content

Fix to issue #4606 : Links leading outside Studio need to have a pop out icon #4622

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
AllanOXDi merged 11 commits into from
Aug 9, 2024
Merged

Fix to issue #4606 : Links leading outside Studio need to have a pop out icon #4622

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f02a8dd
found two ways to fix issue
shivam-daksh Aug 2, 2024
638d49d
Issue fixed by replacing KExternalLink Component with ActionLink
shivam-daksh Aug 2, 2024
e71cc90
Preserve Link Targets
shivam-daksh Aug 2, 2024
957f872
docker-compose.yml changes reverted
shivam-daksh Aug 3, 2024
fe70b34
ActionLink is changed back to KExternalLink and added openInNewTab pr…
shivam-daksh Aug 4, 2024
854790b
fixed minor changes and working fine
shivam-daksh Aug 4, 2024
c8ce5ca
Insert space after period in Settings>Storage page
shivam-daksh Aug 6, 2024
ba7eb92
Cleaning and simplifying the code
shivam-daksh Aug 7, 2024
ba6a0bf
Remove margin-left from KExternalLink
shivam-daksh Aug 7, 2024
64c06a3
added margin-left in Settings->About Studio's external links
shivam-daksh Aug 7, 2024
922b49e
yarn lint-frontend:format changes
shivam-daksh Aug 9, 2024
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: 7 additions & 3 deletions contentcuration/contentcuration/frontend/settings/pages/Account/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@
<p>
{{ $tr('apiTokenMessage') }}
<KExternalLink
class="kexternal-redirect"
href="https://ricecooker.readthedocs.io/en/latest/index.html"
target="_blank"
openInNewTab="true"
:text="$tr('apiDocumentation')"
rel="noopener noreferrer"
/>
Expand Down Expand Up @@ -233,5 +234,8 @@
.row {
padding: 8px 0;
}

</style>
.kexternal-redirect{
margin-left: -8px;
display: inline !important;
}
</style>
13 changes: 8 additions & 5 deletions contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@

<p>

<span>{{ $tr('requestMoreSpaceMessage') }}</span>
<span>{{ $tr('requestMoreSpaceMessage') + " " }}</span>

<KExternalLink
style="display: inline;"
class="kexternal-redirect"
:text="$tr('learnMoreAboutImportingContentFromChannels')"
href="https://kolibri-studio.readthedocs.io/en/latest/add_content.html#import-content-from-other-channels"
target="_blank"
openInNewTab="true"
/>

</p>
Expand Down Expand Up @@ -160,5 +160,8 @@
height: 8px !important;
}
}

</style>
.kexternal-redirect{
margin-left: -8px;
display: inline !important;
Copy link
Copy Markdown
Member

@AllanOXDi AllanOXDi Aug 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The !important property might not be necessary if there are no conflicting styles. It's generally best to avoid !important unless absolutely necessary. In fact, if you use the !important property , it will override all previous styling rules for that specific property on that element :)

Copy link
Copy Markdown
Contributor Author

@shivam-daksh shivam-daksh Aug 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And display property was indeed unnecessary, so I've removed it.

}
</style>
17 changes: 12 additions & 5 deletions contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
</p>
<p>
<KExternalLink
class="kexternal-redirect"
href="https://kolibri-studio.readthedocs.io/en/latest/index.html"
target="_blank"
openInNewTab="true"
:text="$tr('userDocsLink')"
rel="noopener noreferrer"
/>
Expand All @@ -50,9 +51,10 @@
<li>{{ $tr('bestPractice5') }}</li>
<li>
<KExternalLink
class="kexternal-redirect"
href="https://ricecooker.readthedocs.io/en/latest/video_compression.html"
:text="$tr('bestPractice6')"
target="_blank"
openInNewTab="true"
rel="noopener noreferrer"
/>
</li>
Expand All @@ -64,16 +66,18 @@
<!-- Issues -->
<h2>{{ $tr('notableIssues') }}</h2>
<KExternalLink
class="kexternal-redirect"
href="https://github.com/learningequality/studio/issues/3992"
:text="$tr('issueLink1')"
target="_blank"
openInNewTab="true"
rel="noopener noreferrer"
/>
<p>{{ $tr('issue1') }}</p>
<KExternalLink
class="kexternal-redirect"
href="https://github.com/learningequality/studio/issues"
:text="$tr('issuesPageLink')"
target="_blank"
openInNewTab="true"
Copy link
Copy Markdown
Member

@AllanOXDi AllanOXDi Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The openInNewTab="true" is used correctly. However, in Vue, boolean props can be passed without a value. So it could be simplified to just openInNewTab. or :openInNewTab="true"
Screenshot 2024-08-06 at 22 37 05

Copy link
Copy Markdown
Contributor Author

@shivam-daksh shivam-daksh Aug 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for letting me know. I've changed it to simplified.

rel="noopener noreferrer"
/>
</div>
Expand Down Expand Up @@ -141,4 +145,7 @@
h2 {
margin-top: 32px;
}
</style>
.kexternal-redirect{
margin-left: -8px;
Comment thread
MisRob marked this conversation as resolved.
}
</style>