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

Avoid using hash sign for url #196

Merged
merged 3 commits into from
May 16, 2024
Merged

Avoid using hash sign for url #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e55eae7
replace # with ''
AnonymousWalker May 16, 2024
a926fb8
use javascript:void(0) for href with empty url
AnonymousWalker May 16, 2024
52c5f32
Merge branch 'mm-hl-support-refactor' into aw-avoid-hashtag
mXaln May 16, 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
2 changes: 1 addition & 1 deletion ...r-web/src/main/kotlin/org/bibletranslationtools/fetcher/web/controllers/BookController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private fun booksView(
"languagesNavUrl" to "/$GL_ROUTE",
"fileTypesNavTitle" to product.titleKey,
"fileTypesNavUrl" to "/$GL_ROUTE/${params.languageCode}",
"booksNavUrl" to "javascript:void(0)"
"booksNavUrl" to ""
),
locale = getPreferredLocale(contentLanguage, "books")
)
Expand Down
2 changes: 1 addition & 1 deletion ...b/src/main/kotlin/org/bibletranslationtools/fetcher/web/controllers/LanguageController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private fun languagesView(
template = "languages",
model = mapOf(
"languageList" to languageList,
"languagesNavUrl" to "javascript:void(0)",
"languagesNavUrl" to "",
"gatewayCount" to languageList.size
),
locale = getPreferredLocale(contentLanguage, "languages")
Expand Down
2 changes: 1 addition & 1 deletion ...eb/src/main/kotlin/org/bibletranslationtools/fetcher/web/controllers/ProductController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private fun productsView(
"productList" to productList,
"languagesNavTitle" to language.localizedName,
"languagesNavUrl" to "/$GL_ROUTE",
"fileTypesNavUrl" to "javascript:void(0)"
"fileTypesNavUrl" to ""
),
locale = getPreferredLocale(contentLanguage, "products")
)
Expand Down
16 changes: 8 additions & 8 deletions fetcher-web/src/main/resources/templates/fragments/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
</head>
<body>
<div th:fragment="navbar(languagesNavUrl, fileTypesNavUrl, booksNavUrl)" class="navbar">
<a class="navbar__item" href="javascript:void(0)"
th:classappend="${languagesNavUrl == null}? 'unavailable' : (${languagesNavUrl == #strings.toString('javascript:void(0)')}? 'navbar\_\_item--active' : 'navbar\_\_item--available')"
th:href="${languagesNavUrl != null}? ${languagesNavUrl} : 'javascript:void(0)'">
<a class="navbar__item" href=""
th:classappend="${languagesNavUrl == null}? 'unavailable' : (${languagesNavUrl == #strings.toString('')}? 'navbar\_\_item--active' : 'navbar\_\_item--available')"
th:href="${languagesNavUrl != null}? ${languagesNavUrl != '' ? languagesNavUrl : 'javascript:void(0)' } : 'javascript:void(0)'">
<em class="material-icons">translate </em>
<span th:if="${languagesNavTitle == null}" th:text="#{languages}">Language</span>
<span th:unless="${languagesNavTitle == null}" th:text="${languagesNavTitle}">Selected Language</span>
</a>

<a class="navbar__item" href="javascript:void(0)"
th:classappend="${fileTypesNavUrl == null}? 'unavailable' : (${fileTypesNavUrl == #strings.toString('javascript:void(0)')}? 'navbar\_\_item--active' : 'navbar\_\_item--available')"
th:href="${fileTypesNavUrl != null}? ${fileTypesNavUrl} : 'javascript:void(0)'">
<a class="navbar__item" href="#"
th:classappend="${fileTypesNavUrl == null}? 'unavailable' : (${fileTypesNavUrl == #strings.toString('')}? 'navbar\_\_item--active' : 'navbar\_\_item--available')"
th:href="${fileTypesNavUrl != null}? ${fileTypesNavUrl != '' ? fileTypesNavUrl : 'javascript:void(0)' } : 'javascript:void(0)'">
<em class="material-icons">apps </em>
<span th:if="${fileTypesNavTitle == null}" th:text="#{file_types}">File Types</span>
<span th:unless="${fileTypesNavTitle == null}" th:text="#{${fileTypesNavTitle}}">Selected Tool</span>
</a>

<a class="navbar__item"
th:classappend="${booksNavUrl == null}? 'unavailable' : (${booksNavUrl == #strings.toString('javascript:void(0)')}? 'navbar\_\_item--active' : 'navbar\_\_item--available')"
th:href="${booksNavUrl != null}? ${booksNavUrl} : 'javascript:void(0)'">
th:classappend="${booksNavUrl == null}? 'unavailable' : (${booksNavUrl == #strings.toString('')}? 'navbar\_\_item--active' : 'navbar\_\_item--available')"
th:href="${booksNavUrl != null}? ${booksNavUrl != '' ? booksNavUrl : 'javascript:void(0)' } : 'javascript:void(0)'">
<em class="material-icons">book </em>
<span th:if="${booksNavTitle == null}" th:text="#{books}">Books</span>
<span th:unless="${booksNavTitle == null}" th:text="${booksNavTitle}">Selected Book</span>
Expand Down
2 changes: 1 addition & 1 deletion fetcher-web/src/main/resources/templates/fragments/productcard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<a th:fragment="productcard(iconUrl, productTitle, productDescription, url)"
class="product-card"
th:classappend="${url == null}? 'unavailable' "
th:href="${url == null}? '#' : ${url}">
th:href="${url == null}? 'javascript:void(0)' : ${url}">
<div class="product-card__icon-container" th:classappend="${url == null}? 'unavailable' ">
<img alt="product_image" class="product-card__product-icon" th:src="${'/static/' + iconUrl}"/>
</div>
Expand Down
Loading