Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BudgetMaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
PlayWallDesktop wird heute 10 Jahre alt!
Show more breadcrumbs
Robert Goldmann
BudgetMaster
Commits
c9b98898
Commit
c9b98898
authored
May 31, 2021
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
fixed selenium tests
parent
a250fb41
No related branches found
No related tags found
No related merge requests found
Pipeline
#5127
failed
May 31, 2021
Stage: external
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/templates/categories/categoriesFunctions.ftl
+2
-2
2 additions, 2 deletions
...in/resources/templates/categories/categoriesFunctions.ftl
src/main/resources/templates/helpers/customSelectMacros.ftl
+3
-3
3 additions, 3 deletions
src/main/resources/templates/helpers/customSelectMacros.ftl
with
5 additions
and
5 deletions
src/main/resources/templates/categories/categoriesFunctions.ftl
+
2
−
2
View file @
c9b98898
...
...
@@ -15,14 +15,14 @@
</#if>
</#
function
>
<#
macro
categoryCircle category classes="" datasetValue=
""
enableSearchWrapper=false>
<#
macro
categoryCircle category classes="" datasetValue=
false
enableSearchWrapper=false>
<#assign categoryName=getCategoryName(category)>
<#if enableSearchWrapper>
<a href="<@s.url '/search?searchCategory=true&searchText=' + category.getName()/>">
</#if>
<div class="category-circle $
{
classes
}
<#if settings.getShowCategoriesAsCircles()?? && settings.getShowCategoriesAsCircles() == false>category-square</#if>" style="background-color: $
{
category
.color
}
" <#if datasetValue
?has_content
>data-value="$
{
category
.getID
()}
"</#if>>
<div class="category-circle $
{
classes
}
<#if settings.getShowCategoriesAsCircles()?? && settings.getShowCategoriesAsCircles() == false>category-square</#if>" style="background-color: $
{
category
.color
}
" <#if datasetValue>data-value="$
{
category
.getID
()}
"</#if>>
<span style="color: $
{
category
.getAppropriateTextColor
()}
">
<#if category.getIcon()?has_content>
<i class="$
{
category
.getIcon
()}
"></i>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/templates/helpers/customSelectMacros.ftl
+
3
−
3
View file @
c9b98898
...
...
@@ -22,7 +22,7 @@
<@customSelectStart "category-select-wrapper" categories inputClasses labelText "transaction-category" "label">
<div class="custom-select-trigger" tabindex="0">
<div class="custom-select-selected-item">
<#if selectedCategory??><@customSelectOptionCategoryContent selectedCategory "no-margin-left"/></#if>
<#if selectedCategory??><@customSelectOptionCategoryContent
category=
selectedCategory
classes=
"no-margin-left"
datasetValue=true
/></#if>
</div>
<div class="custom-select-arrow"></div>
</div>
...
...
@@ -140,8 +140,8 @@
</div>
</#
macro
>
<#
macro
customSelectOptionCategoryContent category classes="" datasetValue=
""
>
<@categoriesFunctions.categoryCircle category=category classes="category-circle-small $
{
classes
}
" datasetValue=
""
/>
<#
macro
customSelectOptionCategoryContent category classes="" datasetValue=
false
>
<@categoriesFunctions.categoryCircle category=category classes="category-circle-small $
{
classes
}
" datasetValue=
datasetValue
/>
<span class="custom-select-item-name">$
{
categoriesFunctions
.getCategoryName
(
category
)}
</span>
</#
macro
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment