Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Roadmap
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
Show more breadcrumbs
Robert Goldmann
Roadmap
Commits
841fed36
Commit
841fed36
authored
Nov 13, 2020
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
#40
- show start node in rendered roadmap (but only if start date is set)
parent
1b0b821a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
client/logic/Localization.py
+2
-1
2 additions, 1 deletion
client/logic/Localization.py
client/templates/roadmap.html
+39
-4
39 additions, 4 deletions
client/templates/roadmap.html
with
41 additions
and
5 deletions
client/logic/Localization.py
+
2
−
1
View file @
841fed36
...
@@ -9,5 +9,6 @@ LOCALIZATION = {
...
@@ -9,5 +9,6 @@ LOCALIZATION = {
'
error_task_not_existing
'
:
'
ERROR: no task with this ID existing
'
,
'
error_task_not_existing
'
:
'
ERROR: no task with this ID existing
'
,
'
error_subtask_not_existing
'
:
'
ERROR: no subtask with this ID existing
'
,
'
error_subtask_not_existing
'
:
'
ERROR: no subtask with this ID existing
'
,
'
error_no_milestones
'
:
'
ERROR: no milestones for this roadmap
'
,
'
error_no_milestones
'
:
'
ERROR: no milestones for this roadmap
'
,
'
unauthorized
'
:
'
Invalid password
'
'
unauthorized
'
:
'
Invalid password
'
,
'
start
'
:
'
Start
'
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
client/templates/roadmap.html
+
39
−
4
View file @
841fed36
{% macro createTrainmapMedAndUp(localization, numberOfOpenMilestones, numberOfMilestones) -%}
{% macro createTrainmapMedAndUp(localization, numberOfOpenMilestones, numberOfMilestones
, includeStartNode
) -%}
{% for i in range(numberOfOpenMilestones) %}
{% for i in range(numberOfOpenMilestones) %}
<div
class=
"train-circle train-circle-light"
></div>
<div
class=
"train-circle train-circle-light"
></div>
{% if numberOfOpenMilestones != numberOfMilestones or i != (numberOfOpenMilestones-1) %}
{% if numberOfOpenMilestones != numberOfMilestones or i != (numberOfOpenMilestones-1) %}
...
@@ -12,9 +12,19 @@
...
@@ -12,9 +12,19 @@
<div
class=
"train-line"
></div>
<div
class=
"train-line"
></div>
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% if includeStartNode %}
{% if numberOfMilestones == numberOfOpenMilestones %}
<div
class=
"train-line dotted"
></div>
<div
class=
"train-circle train-circle-light"
></div>
{% else %}
<div
class=
"train-line"
></div>
<div
class=
"train-circle blue"
></div>
{% endif %}
{% endif %}
{%- endmacro %}
{%- endmacro %}
{% macro createTrainmapSmall(localization, numberOfOpenMilestones, numberOfMilestones) -%}
{% macro createTrainmapSmall(localization, numberOfOpenMilestones, numberOfMilestones
, includeStartNode
) -%}
{% for i in range(numberOfOpenMilestones) %}
{% for i in range(numberOfOpenMilestones) %}
<div
class=
"train-circle train-circle-light train-circle-small"
></div>
<div
class=
"train-circle train-circle-light train-circle-small"
></div>
{% if numberOfOpenMilestones != numberOfMilestones or i != (numberOfOpenMilestones-1) %}
{% if numberOfOpenMilestones != numberOfMilestones or i != (numberOfOpenMilestones-1) %}
...
@@ -28,6 +38,16 @@
...
@@ -28,6 +38,16 @@
<div
class=
"train-line train-line-small"
></div>
<div
class=
"train-line train-line-small"
></div>
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% if includeStartNode %}
{% if numberOfMilestones == numberOfOpenMilestones %}
<div
class=
"train-line dotted-small train-line-small"
></div>
<div
class=
"train-circle train-circle-light train-circle-small"
></div>
{% else %}
<div
class=
"train-line train-line-small"
></div>
<div
class=
"train-circle blue train-circle-small"
></div>
{% endif %}
{% endif %}
{%- endmacro %}
{%- endmacro %}
{% macro printMilestoneIndevAndNoTasks(localization, milestone, color) -%}
{% macro printMilestoneIndevAndNoTasks(localization, milestone, color) -%}
...
@@ -210,10 +230,10 @@
...
@@ -210,10 +230,10 @@
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col s1 m2 l2 offset-m1 offset-l1 no-padding"
>
<div
class=
"col s1 m2 l2 offset-m1 offset-l1 no-padding"
>
<div
class=
"hide-on-small-only trainmap"
>
<div
class=
"hide-on-small-only trainmap"
>
{{ createTrainmapMedAndUp(localization, roadmap["numberOfOpenMilestones"], roadmap["milestones"]|length) }}
{{ createTrainmapMedAndUp(localization, roadmap["numberOfOpenMilestones"], roadmap["milestones"]|length
, roadmap["StartDate"] != "-"
) }}
</div>
</div>
<div
class=
"hide-on-med-and-up trainmap-small"
>
<div
class=
"hide-on-med-and-up trainmap-small"
>
{{ createTrainmapSmall(localization, roadmap["numberOfOpenMilestones"], roadmap["milestones"]|length) }}
{{ createTrainmapSmall(localization, roadmap["numberOfOpenMilestones"], roadmap["milestones"]|length
, roadmap["StartDate"] != "-"
) }}
</div>
</div>
</div>
</div>
<div
class=
"col s11 m7 l6"
>
<div
class=
"col s11 m7 l6"
>
...
@@ -244,10 +264,25 @@
...
@@ -244,10 +264,25 @@
{% endif %}
{% endif %}
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% if roadmap["StartDate"] != "-" %}
{{ printStartNode(localization, roadmap["StartDate"]) }}
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{%- endmacro %}
{% macro printStartNode(localization, startDate) -%}
<div
class=
"card padding white milestone"
>
<div
class=
"card-content no-padding"
>
<div
class=
"{{ color }} center-align"
>
<span
class=
"card-title bold padding-left-and-right truncate no-margin-bottom"
>
{{ localization["start"] }} - {{ startDate }}
</span>
</div>
</div>
</div>
</div>
{%- endmacro %}
{%- endmacro %}
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