Minor changes and bugfixes #33
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Templates/timetable.blade.php
Outdated
| </div> | ||
| <div class="entry-copy-weekend-checkbox"> | ||
| <input type="checkbox" name="entryCopyWeekend" id="entry-copy-weekend" /> | ||
| <label for="entry-copy-weekend"><small>Inkluder weekender</small></label> |
There was a problem hiding this comment.
{{ __("Inkluder weekender") }}
| <div class="entry-copy-overwrite-checkbox"> | ||
| <input type="checkbox" name="entryCopyOverwrite" id="entry-copy-overwrite" /> | ||
| <label for="entry-copy-overwrite"><small>Overskriv allerede registrerede felter</small></label> | ||
| </div> |
There was a problem hiding this comment.
{{ __("Overskriv allerede registrerede felter") }}
| @@ -707,10 +755,10 @@ jQuery(document).ready(function ($) { | |||
| </div>`; | |||
| }, | |||
| option: function (item, escape) { | |||
| return `<div><span>${escape(item.text)} <span><i class="fa fa-angle-right fa-xs"></i> ${escape(item.projectName)} <small>(${escape(item.value)})</small> <small style="float: right;">${item.editorId === pluginSettings.userId ? '<i class="your-task far fa-user" title="To-do is assigned to you"></i>' : ""}(${escape(item.type)})</small></span></span></div>`; | |||
| return `<div><span>${escape(item.text)} <span><i class="fa fa-angle-right fa-xs"></i> ${escape(item.projectName)} <small>(${escape(item.value)})</small> <small style="float: right;">${item.editorId === pluginSettings.userId ? '<i class="your-task far fa-user" title="To-do is assigned to you"></i>' : ""}${item.type.toLowerCase() !== "task" ? `(${escape(item.type)})` : ""}</small></span></span></div>`; | |||
There was a problem hiding this comment.
It's the html definition of the options in the to-do search dropdown. The addition lowercases the type name, because we had instances of to-dos with the type "Task" and "task", causing problems cause letter case was not taken into consideration.
There was a problem hiding this comment.
And! We only want to display types not equal to "task".
It clutters a lot with "task" written on every to-do, so we figured that it would be better just to print it on to-dos with another type than task.
sinejespersen
requested changes
Jan 14, 2025
sinejespersen
approved these changes
Jan 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Link to ticket
#3238
Description
The following changes has been made:
Screenshot of the result
N/A
Checklist
If your code does not pass all the requirements on the checklist you have to add a comment explaining why this change
should be exempt from the list.
Additional comments or questions
If you have any further comments or questions for the reviewer please add them here.