Skip to content

GitLab

Commit c0cc88de authored by Evonne's avatar Evonne Committed by Robert Lyon
Browse files

Bug 1845104 Various theme fixes part 4 

Fixing plans blocktype markup, inbox blocktype redundant classes,
alignment of add blocks button, modal thumbnail not floating right,
resume attachment inconsistencies (to be continued)

behatnotneeded

Change-Id: Ic7c0cc5498dbd3f95f140581cc71b175e944a0d9
parent b084c205
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 98 deletions
htdocs/theme/raw/plugintype/artefact/plans/templates/view/plantasks.tpl
View file @ c0cc88de
......@@ -7,86 +7,81 @@
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/delete.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a>
</div>
{/if}
{if $task->description || $task->tags} <a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">{/if}
<span class="overdue-task">
<div class="collapse-inline">
<span class="icon icon-times text-danger icon-lg left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
<span class="text-danger">{$task->title}</span>
{if $task->completiondate} -
<span class="text-small text-midtone">
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
</span>
{/if}
</div>
{if $task->description || $task->tags}
<span class="icon icon-chevron-down right collapse-indicator float-right" role="presentation" aria-hidden="true"></span>
{if $task->description || $task->tags}
<a class="outer-link collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
<span class="sr-only">{$task->title}</span>
<span class="icon icon-chevron-down right collapse-indicator float-right" role="presentation" aria-hidden="true"></span>
</a>
{/if}
<span class="overdue-task">
<span class="icon icon-times text-danger icon-lg left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
<div class="plan-task-heading">
<span class="text-danger">{$task->title}</span>
{if $task->completiondate}
<br />
<span class="text-small text-midtone">
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
</span>
{/if}
</span>
{if $task->description || $task->tags}</a>{/if}
</div>
{if $task->description || $task->tags}
<div class="collapse" id="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
<div class="card-body">
{if $task->description}
{$task->description|clean_html|safe}
{/if}
{if $task->tags}
<div class="tags text-small">
<strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
</div>
{/if}
</div>
{if $task->description || $task->tags}
<div class="collapse plan-task-detail" id="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
{if $task->description}
{$task->description|clean_html|safe}
{/if}
{if $task->tags}
<div class="tags text-small">
<strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
</div>
{/if}
</div>
{/if}
{/if}
</span>
</div>
{else}
<div class="task-item list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
<div class="task-item list-group-item">
{if $editing}
<div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/edit.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil-alt text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/task/delete.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a>
</div>
{/if}
{if $task->description || $task->tags}<a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">{/if}
<span class="complete-task">
<div class="collapse-inline">
{if $task->completed == 1}
<span class="icon icon-regular icon-check-square icon-lg text-success left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
<span class="sr-only">{str tag=completed section=artefact.plans}</span>
{else}
<span class="icon-regular icon-square icon icon-lg text-midtone left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
<span class="sr-only">{str tag=incomplete section=artefact.plans}</span>
{/if}
<span class="text-default">{$task->title}</span>
{if $task->completiondate} -
<span class="text-midtone text-small">
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
</span>
{/if}
</div>
{if $task->description || $task->tags}
<span class="icon icon-chevron-down right collapse-indicator float-right" role="presentation" aria-hidden="true"></span>
{if $task->description || $task->tags}
<a class="outer-link collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
<span class="sr-only">{$task->title}</span>
<span class="icon icon-chevron-down right collapse-indicator float-right" role="presentation" aria-hidden="true"></span>
</a>
{/if}
<span class="complete-task">
{if $task->completed == 1}
<span class="icon icon-regular icon-check-square icon-lg text-success left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
<span class="sr-only">{str tag=completed section=artefact.plans}</span>
{else}
<span class="icon-regular icon-square icon icon-lg text-midtone left task{$task->id}{if $editing || $canedit} plan-task-icon{/if}" role="presentation" aria-hidden="true" data-task="{$task->id}"></span>
<span class="sr-only">{str tag=incomplete section=artefact.plans}</span>
{/if}
<div class="plan-task-heading">
<span class="text-default">{$task->title}</span>
{if $task->completiondate}
<br />
<span class="text-midtone text-small">
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
</span>
{/if}
</span>
{if $task->description || $task->tags}</a>{/if}
</div>
</span>
{if $task->description || $task->tags}
<div class="collapse" id="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
<div class="card-body">
{if $task->description}
{$task->description|clean_html|safe}
{/if}
{if $task->tags}
<div class="tags text-small">
<strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
</div>
{/if}
<div class="collapse plan-task-detail" id="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">
{if $task->description}
{$task->description|clean_html|safe}
{/if}
{if $task->tags}
<div class="tags text-small">
<strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
</div>
</div>
{/if}
</div>
{/if}
</div>
{/if}
......
htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/book.tpl
View file @ c0cc88de
......@@ -90,7 +90,7 @@
{/if}
{if $row->attachments}
<h5 class="has-attachment list-group-item-heading">
<h5 class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount})
......
htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/certification.tpl
View file @ c0cc88de
......@@ -85,7 +85,7 @@
{/if}
{if $row->attachments}
<h5 class="has-attachment list-group-item-heading">
<h5 class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount})
......
htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/educationhistory.tpl
View file @ c0cc88de
......@@ -90,7 +90,7 @@
{/if}
{if $row->attachments}
<div class="has-attachment list-group-item-heading">
<div class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount})
......
htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/employmenthistory.tpl
View file @ c0cc88de
......@@ -89,7 +89,7 @@
{/if}
{if $row->attachments}
<div class="has-attachment list-group-item-heading">
<div class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount})
......
htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/membership.tpl
View file @ c0cc88de
......@@ -88,7 +88,7 @@
{/if}
{if $row->attachments}
<h5 class="has-attachment list-group-item-heading">
<h5 class="list-group-item-heading attachment-title">
<span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>
<span class="text-small">{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount})
......
htdocs/theme/raw/plugintype/blocktype/inbox/templates/inboxmr.tpl
View file @ c0cc88de
......@@ -5,7 +5,7 @@
{else}
<div id="inboxblock" class="inboxblock list-group">
{foreach from=$items item=i}
<div class="has-attachment card collapsible list-group-item{if !$i->read} js-card-unread{/if}" data-requesturl="{$WWWROOT}module/multirecipientnotification/indexin.json.php">
<div class="collapsible list-group-item{if !$i->read} js-card-unread{/if}" data-requesturl="{$WWWROOT}module/multirecipientnotification/indexin.json.php">
{if $i->message}
<a class="collapsed link-block{if !$i->read} unread{/if}" data-toggle="collapse" href="#message_content_{$i->type}_{$i->id}" data-id="{$i->id}" data-list="{$i->table}" aria-expanded="false">
{if $i->type == 'usermessage'}
......
htdocs/theme/raw/sass/_custom.scss
View file @ c0cc88de
......@@ -21,30 +21,32 @@
margin: 20px 0;
}
// Plans
.task-item {
.complete-task,
.overdue-task {
margin-left: 15px;
.icon {
margin-left: -22px; // correct alignment
padding-right: 2px;
}
// Plan
.card.card-secondary .list-group .task-item {
&:first-child {
border-top: 1px solid $list-group-border-color;
}
a[data-toggle="collapse"] .collapse-indicator,
a[data-toggle="collapse"].collapsed .collapse-indicator {
margin-right: 90px;
margin-top: 17px;
}
.plan-task-icon {
vertical-align: top;
padding-top: 4px;
}
.plan-task-heading {
max-width: 60%;
display: inline-block;
}
.card-body {
padding-bottom: 0;
.plan-task-detail {
margin-left: 22px;
margin-top: 10px;
.tags {
margin-bottom: 0;
}
}
}
.task-item .btn-group {
margin-right: -8px; // correct alignment
a {
font-size: 10px;
padding: 2px 8px;
}
}
.no-results {
@extend .lead;
......
htdocs/theme/raw/sass/components/_btn.scss
View file @ c0cc88de
......@@ -298,6 +298,11 @@ td.action-list-copy {
margin-left: 5px;
}
}
.hide-title-collapsed {
.title {
margin-left: 2px;
}
}
.block-icon {
display: inline-block;
@include media-breakpoint-up(lg) {
......
htdocs/theme/raw/sass/components/_list-group.scss
View file @ c0cc88de
......@@ -427,3 +427,12 @@
}
}
}
// filelist in modal
.modal-body {
.list-group-item {
.list-group-item-heading {
float: none;
}
}
}
htdocs/theme/raw/sass/layout/card/_card-collapse.scss
View file @ c0cc88de
......@@ -222,3 +222,7 @@
}
}
}
.post .has-attachment {
margin-bottom: 10px;
}
htdocs/theme/raw/sass/layout/card/_card-secondary.scss
View file @ c0cc88de
......@@ -87,14 +87,26 @@
padding: 0;
}
&.bt-resumefield {
.resume-content {
border: 1px solid $card-border-color;
padding: 10px 15px;
&.bt-resumefield,
&.bt-entireresume {
.resume-content {
padding: 8px 0;
.list-group-item-heading {
font-size: .75001rem;
.attachment-title {
font-family: $font-family-sans-serif;
font-weight: 700;
font-size: $font-size-sm;
.icon {
font-size: 1rem;
}
}
.file-icon {
vertical-align: top;
}
.title {
max-width: 80%;
display: inline-block;
}
}
}
}
}
htdocs/theme/raw/templates/view/blocktypelist.tpl
View file @ c0cc88de
......@@ -3,7 +3,7 @@
<div class='btn-group-vertical'>
{/if}
{foreach from=$blocktypes item=blocktype}{strip}
<a class="{if !$accessible} not-accessible{/if} blocktype-drag blocktypelink btn btn-primary hide-title-collapsed text-left" href="#" title="{$blocktype.title}">
<a class="{if !$accessible} not-accessible{/if} blocktype-drag blocktypelink btn btn-primary hide-title-collapsed" href="#" title="{$blocktype.title}">
<input type="radio" id="blocktype-list-radio-{$blocktype.name}" class="blocktype-radio" name="blocktype" value="{$blocktype.name}">
<span class="icon icon-{$blocktype.cssicon} {$blocktype.cssicontype} icon-lg" title="{$blocktype.title}" role="presentation" aria-hidden="true"></span>
<label for="blocktype-list-radio-{$blocktype.name}" class="blocktypetitle title">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment