Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AKPlanning
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dominik Weitz
AKPlanning
Compare revisions
main to fix-scheduling-drag
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
mollux/akplanning
Select target project
No results found
fix-scheduling-drag
Select Git revision
Swap
Target
kif/akplanning
Select target project
konstantin/akplanning
matedealer/akplanning
kif/akplanning
mirco/akplanning
lordofthevoid/akplanning
voidptr/akplanning
xayomer/akplanning-fork
mollux/akplanning
neumantm/akplanning
mmarx/akplanning
nerf/akplanning
felix_bonn/akplanning
sebastian.uschmann/akplanning
13 results
main
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (1)
Fix color and description/popup for AK Slots placed by dragging
· 3c268a59
Benjamin Hättasch
authored
4 years ago
3c268a59
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
AKScheduling/templates/admin/AKScheduling/scheduling.html
+1
-1
1 addition, 1 deletion
AKScheduling/templates/admin/AKScheduling/scheduling.html
with
1 addition
and
1 deletion
AKScheduling/templates/admin/AKScheduling/scheduling.html
View file @
3c268a59
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<div
class=
"col-md-2 col-lg-2"
id=
"unscheduled-slots"
>
<div
class=
"col-md-2 col-lg-2"
id=
"unscheduled-slots"
>
{% for slot in slots_unscheduled %}
{% for slot in slots_unscheduled %}
<div
class=
"unscheduled-slot badge badge-primary"
style=
'background-color: {{ slot.ak.category.color }}'
<div
class=
"unscheduled-slot badge badge-primary"
style=
'background-color: {{ slot.ak.category.color }}'
data-event=
'{ "title": "{{ slot.ak.short_name }}", "duration": {"hours": "{{ slot.duration|unlocalize }}"}, "description": "{{ slot.ak.
name
}}", "slotID": "{{ slot.pk }}"}'
data-details=
"{{ slot.ak.details }}"
>
{{ slot.ak.short_name }}
data-event=
'{ "title": "{{ slot.ak.short_name }}", "duration": {"hours": "{{ slot.duration|unlocalize }}"}, "description": "{{ slot.ak.
details | escapejs
}}", "slotID": "{{ slot.pk
}}", "backgroundColor": "{{ slot.ak.category.color
}}"}'
data-details=
"{{ slot.ak.details }}"
>
{{ slot.ak.short_name }}
({{ slot.duration }} h)
<br>
{{ slot.ak.owners_list }}
({{ slot.duration }} h)
<br>
{{ slot.ak.owners_list }}
</div>
</div>
{% endfor %}
{% endfor %}
...
...
This diff is collapsed.
Click to expand it.