Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AKPlanning
Manage
Activity
Members
Labels
Plan
Issues
60
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
10
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
KIF
AKPlanning
Commits
c52ebde0
Commit
c52ebde0
authored
3 years ago
by
Benjamin Hättasch
Browse files
Options
Downloads
Plain Diff
Merge branch 'mollux/akplanning-fix-ak-times-above-folg' into main
parents
423b6576
f88a1ceb
No related branches found
No related tags found
1 merge request
!105
Move calendar below the time slot table
Pipeline
#22819
passed with stage
Stage: test
in 1 minute and 30 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
AKSubmission/templates/AKSubmission/ak_detail.html
+6
-5
6 additions, 5 deletions
AKSubmission/templates/AKSubmission/ak_detail.html
with
6 additions
and
5 deletions
AKSubmission/templates/AKSubmission/ak_detail.html
+
6
−
5
View file @
c52ebde0
...
...
@@ -166,11 +166,6 @@
<p
style=
"margin-top: 30px;margin-bottom: 30px;"
>
{{ ak.description|linebreaks }}
</p>
{% if 'AKPlan'|check_app_installed %}
<div
id=
'akSlotCalendar'
style=
"margin-bottom: 50px;"
></div>
{% endif %}
<table
class=
"table"
>
<thead>
<tr>
...
...
@@ -237,6 +232,12 @@
</div>
{% endif %}
{% if 'AKPlan'|check_app_installed %}
<div
id=
'akSlotCalendar'
style=
"margin-top: 50px;margin-bottom: 50px;"
></div>
{% endif %}
<h4
style=
"margin-top: 30px;"
>
{% trans "Possible Times" %}
</h4>
<table
class=
"table"
>
<thead>
...
...
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