Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-17 22:36:14 +00:00
Code Issues Actions Projects Releases Wiki Activity

change interface single task

Browse Source
This commit is contained in:
Julie Lenaerts 2022-06-16 10:45:53 +02:00
parent 977c034b64
commit 98419e3533
3 changed files with 55 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
View File

@ -11,14 +11,13 @@
box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px !important;
padding:1.7rem;
margin-top: .5rem;
h1, h2, h3 {
margin-bottom: .5rem;
.subtitle {
background-color: $chill-ll-gray;
border-radius:3px;
padding:.5rem;
margin-top: 1rem;
}
// margin-left: auto;
// margin-right: auto;
// width: 97%;
&:last-child {
margin-bottom: 1rem;
}

3
src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
View File

@ -7,15 +7,12 @@
&.place-new {
background-color: $chill-yellow;
}
&.place-in_progress {
background-color: $chill-green;
}
&.place-closed {
background-color: $chill-blue;
}
&.place-canceled {
background-color: $chill-beige;
}

107
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
View File

@ -1,71 +1,68 @@
<div class="task-show">
<h1>{{ 'Task'|trans }}</h1>
{# <h1 class="content-title">{{ 'Task'|trans }}</h1> #}
<h2>{{ task.title }}
<h2 style="margin-bottom: 1rem;">{{ task.title }}
{% for place in workflow_marked_places(task) %}
<span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
<span class="task-status badge rounded-pill box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
{% endfor %}
</h2>
<dl class="chill_view_data">
<dt class="inline">{{ 'Description'|trans }}</dt>
<dd>
{% if task.description is empty %}
<span class="chill-no-data-statement">{{"No description"|trans}}</span>
{% else %}
<blockquote class="chill-user-quote">
{{ task.description|chill_markdown_to_html }}
</blockquote>
{% endif %}
</dd>
<dt class="inline">{{ 'Assignee'|trans }}</dt>
<dd>
{% if task.assignee is null %}
<span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
{% else %}
{{ task.assignee }}
{% endif %}
</dd>
{% if task.scope is not null %}
<dt class="inline">{{ 'Scope'|trans }}</dt>
<div class="pop-item">
<dl class="chill_view_data">
<dt class="inline">{{ 'Description'|trans }}</dt>
<dd>
<span class="scope">{{ task.scope.name|localize_translatable_string }}</span>
{% if task.description is empty %}
<span class="chill-no-data-statement">{{"No description"|trans}}</span>
{% else %}
<blockquote class="chill-user-quote">
{{ task.description|chill_markdown_to_html }}
</blockquote>
{% endif %}
</dd>
{% endif %}
<h3>{{"Dates"|trans}}</h3>
{% if task.startDate is null and task.endDate is null and task.warningDate is null %}
<dt></dt>
<dd>
<span class="chill-no-data-statement">{{"No dates specified"|trans}}</span>
<dt class="inline">{{ 'Assignee'|trans }}</dt>
<dd class="info-field">
{% if task.assignee is null %}
<span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
{% else %}
{{ task.assignee }}
{% endif %}
</dd>
</dt>
{% else %}
{% if task.startDate is not null %}
<dt class="inline">{{ 'Start'|trans }}</dt>
<dd>{{ task.startDate|format_date('long') }}</dd>
{% if task.scope is not null %}
<dt class="inline">{{ 'Scope'|trans }}</dt>
<dd class="info-field">
<span class="scope">{{ task.scope.name|localize_translatable_string }}</span>
</dd>
{% endif %}
<h3 class="subtitle">{{"Dates"|trans}}</h3>
{% if task.startDate is null and task.endDate is null and task.warningDate is null %}
<dt></dt>
<dd class="info-field">
<span class="chill-no-data-statement">{{"No dates specified"|trans}}</span>
</dd>
</dt>
{% else %}
{% if task.startDate is not null %}
<dt class="inline">{{ 'Start'|trans }}</dt>
<dd class="info-field">{{ task.startDate|format_date('long') }}</dd>
{% endif %}
{% if task.endDate is not null %}
<dt class="inline">{{ 'End'|trans }}</dt>
<dd class="info-field">{{ task.endDate|format_date('long') }}</dd>
{% endif %}
{% if task.warningDate is not null %}
<dt class="inline">{{ 'Warning'|trans }}</dt>
<dd class="info-field">{{ task.warningDate|format_date('long') }}</dd>
{% endif %}
{% endif %}
{% if task.endDate is not null %}
<dt class="inline">{{ 'End'|trans }}</dt>
<dd>{{ task.endDate|format_date('long') }}</dd>
{% endif %}
{% if task.warningDate is not null %}
<dt class="inline">{{ 'Warning'|trans }}</dt>
<dd>{{ task.warningDate|format_date('long') }}</dd>
{% endif %}
{% endif %}
</dl>
</dl>
</div>
{% if timeline is not null %}
<h3>{{"Timeline"|trans}}</h3>
{{ timeline|raw }}
<div class="pop-item">
<h3 class="subtitle">{{"Timeline"|trans}}</h3>
{{ timeline|raw }}
</div>
{% endif %}
<ul class="record_actions sticky-form-buttons">