Commit d37d67e6 authored by Pat Kira's avatar Pat Kira Committed by Aaron Wells

Resume blocks (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ia67b172d8f21c0e796063dbcc9ed3c79bcc1829e
parent 18d57d4d
......@@ -34,7 +34,7 @@ $compositetypes = array(
$inlinejs = ArtefactTypeResumeComposite::get_js($compositetypes);
$compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer', 'expandable'));
$smarty = smarty(array('tablerenderer'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEHEADING', TITLE);
......
......@@ -28,7 +28,7 @@ $compositetypes = array('employmenthistory', 'educationhistory');
$inlinejs = ArtefactTypeResumeComposite::get_js($compositetypes);
$compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer', 'expandable'));
$smarty = smarty(array('tablerenderer'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEHEADING', TITLE);
......
......@@ -891,6 +891,7 @@ abstract class ArtefactTypeResumeComposite extends ArtefactTypeResume implements
$f = artefact_instance_from_id($attachment->id);
$attachment->size = $f->describe_size();
$attachment->iconpath = $f->get_icon(array('id' => $attachment->id, 'viewid' => isset($options['viewid']) ? $options['viewid'] : 0));
$attachment->artefacttype = $f->get_artefact_type($attachment->id);
$attachment->viewpath = get_config('wwwroot') . 'artefact/artefact.php?artefact=' . $attachment->id . '&view=' . (isset($options['viewid']) ? $options['viewid'] : 0);
$attachment->downloadpath = get_config('wwwroot') . 'artefact/file/download.php?file=' . $attachment->id;
$attachment->description = $f->description;
......
......@@ -109,6 +109,7 @@ function getstylesheets($stylesheets){
return $stylesheets;
}
/**
* This function creates a Smarty object and sets it up for use within our
* podclass app, setting up some variables.
......
......@@ -14669,10 +14669,6 @@ a.label.label-default:hover, a.label.label-default:focus,
right: 3px;
}
/* line 5, ../../../raw/static/sass/components/_list-group.scss */
.list-group a {
color: inherit;
}
/* line 7, ../../../raw/static/sass/components/_list-group.scss */
.list-group a.tag {
display: inline-block;
......@@ -14717,60 +14713,64 @@ a.label.label-default:hover, a.label.label-default:focus,
.list-group-item-heading a:hover .metadata {
color: #2d6da3;
}
/* line 55, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-heading a.collapsible {
display: block;
}
/* line 58, ../../../raw/static/sass/components/_list-group.scss */
/* line 61, ../../../raw/static/sass/components/_list-group.scss */
h4.list-group-item-heading {
font-size: 16px;
}
/* line 63, ../../../raw/static/sass/components/_list-group.scss */
/* line 66, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-warning .list-group-item-heading, .list-group-item.draft .list-group-item-heading {
color: #8a6d3b;
}
/* line 69, ../../../raw/static/sass/components/_list-group.scss */
/* line 72, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-link {
padding: 0;
}
/* line 71, ../../../raw/static/sass/components/_list-group.scss */
/* line 74, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-link a {
font-size: 0.9em;
display: block;
padding: 10px 15px;
color: #666;
}
/* line 76, ../../../raw/static/sass/components/_list-group.scss */
/* line 79, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-link a:hover {
background: #ededed;
text-decoration: none;
color: #285f8f;
}
/* line 81, ../../../raw/static/sass/components/_list-group.scss */
/* line 84, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-link a small {
color: #2d6da3;
}
/* line 84, ../../../raw/static/sass/components/_list-group.scss */
/* line 87, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-link a .file-icon {
display: inline-block;
width: 22px;
height: 22px;
}
/* line 89, ../../../raw/static/sass/components/_list-group.scss */
/* line 92, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-link a .file-title {
display: inline-block;
vertical-align: middle;
}
/* line 93, ../../../raw/static/sass/components/_list-group.scss */
/* line 96, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-link a .file-size {
float: right;
color: #868686;
}
/* line 106, ../../../raw/static/sass/components/_list-group.scss */
/* line 109, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item.published {
background: #fefefe;
}
/* line 109, ../../../raw/static/sass/components/_list-group.scss */
/* line 112, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item.list-group-item-lite {
-moz-border-radius: 0;
-webkit-border-radius: 0;
......@@ -14779,7 +14779,7 @@ h4.list-group-item-heading {
border-right: 0;
}
@media (max-width: 768px) {
/* line 115, ../../../raw/static/sass/components/_list-group.scss */
/* line 118, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item .btn-title {
position: absolute;
width: 1px;
......@@ -14793,28 +14793,28 @@ h4.list-group-item-heading {
}
}
/* line 121, ../../../raw/static/sass/components/_list-group.scss */
/* line 124, ../../../raw/static/sass/components/_list-group.scss */
.list-group-item-default {
background-color: rgba(236, 236, 236, 0.5);
}
/* line 128, ../../../raw/static/sass/components/_list-group.scss */
/* line 131, ../../../raw/static/sass/components/_list-group.scss */
.panel > .block > .list-group {
margin-bottom: 0;
}
/* line 132, ../../../raw/static/sass/components/_list-group.scss */
/* line 135, ../../../raw/static/sass/components/_list-group.scss */
.panel > .block .list-group .list-group-item {
border-width: 1px 0;
border-radius: 0;
}
/* line 136, ../../../raw/static/sass/components/_list-group.scss */
/* line 139, ../../../raw/static/sass/components/_list-group.scss */
.panel > .block .list-group:last-child .list-group-item:last-child {
border-bottom: 0;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
}
/* line 145, ../../../raw/static/sass/components/_list-group.scss */
/* line 148, ../../../raw/static/sass/components/_list-group.scss */
.panel-heading + .block > .list-group .list-group-item:first-child {
border-top-width: 0;
}
......@@ -16026,6 +16026,11 @@ a.user-icon:hover:after, a.user-icon:focus:after, a .user-icon:hover:after, a .u
}
/* line 26, ../../../raw/static/sass/lib/_tinymce.scss */
.tinymce-large iframe {
min-height: 500px;
}
/* line 31, ../../../raw/static/sass/lib/_tinymce.scss */
label.sr-only + div.mce-tinymce, .list-group .btn-group label.hide-small + div.mce-tinymce,
.panel-heading .btn-group label.hide-small + div.mce-tinymce, .cell-chooser .cell-row label.pseudolabel + div.mce-tinymce, .modal-tinymce label.hidden-xs + div.mce-tinymce {
max-width: 100%;
......@@ -16170,3 +16175,13 @@ label.sr-only + div.mce-tinymce, .list-group .btn-group label.hide-small + div.m
width: 500px;
}
}
/* line 49, ../../../raw/static/sass/_custom.scss */
.resume-content {
background-color: #fcfcfc;
padding: 10px;
}
/* line 52, ../../../raw/static/sass/_custom.scss */
.resume-content .list-group-item {
background-color: transparent !important;
}
<div class="panel-body">
{$content|safe}
</div>
\ No newline at end of file
{$content|safe}
\ No newline at end of file
{if $controls}
<div class="panel panel-default">
{if !$hidetitle}
<h3 class="resumeh3 panel-heading">
......@@ -7,74 +8,32 @@
{/if}
</h3>
{/if}
<div>
<table id="certificationlist{$suffix}" class="tablerenderer resumefour resumecomposite fullwidth table">
<thead>
<tr>
{if $controls}<th class="resumecontrols">
<span class="accessible-hidden sr-only">{str tag=move}</span>
</th>{/if}
<th>{str tag='title' section='artefact.resume'}</th>
<th class="resumeattachments text-center">
<span>{str tag=Attachments section=artefact.resume}</span>
</th>
{if $controls}<th class="resumecontrols">
<span class="accessible-hidden sr-only">{str tag=edit}</span>
</th>{/if}
</tr>
</thead>
<!-- This markup is rendered inside blockinstance on page -->
<tbody>
{foreach from=$rows item=row}
<tr>
{if $controls}<td class="control-buttons"></td>{/if}
<td>
<div class="expandable-head">
{if $row->description || $row->attachments}<a class="toggle textonly" href="#">{else}<strong>{/if}
{$row->title}
{if $row->description || $row->attachments}</a>{else}</strong>{/if}
<div>{$row->date}</div>
</div>
<div class="expandable-body">
<div class="compositedesc">{$row->description}</div>
{if $row->attachments}
<table class="attachments table">
<thead>
<tr>
<th colspan="2">
<span class="icon icon-paperclip prs"></span>
<span>{str tag='attachedfiles' section='artefact.blog'}</span>
</th>
</tr>
</thead>
<tbody>
{foreach from=$row->attachments item=item}
<tr>
{if $icons}
<td class="iconcell">
<img src="{$item->iconpath}" alt=""></td>
{/if}
<td class="text-small">
<a href="{$item->viewpath}">
{$item->title}
</a> ({$item->size}) - <strong><a href="{$item->downloadpath}">{str tag=Download section=artefact.file}</a></strong>
</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
</div>
</td>
<td class="text-center">{$row->clipcount}</td>
{if $controls}
<td class="control-buttons"></td>
{/if}
</tr>
{/foreach}
</tbody>
</table>
</div>
<table id="certificationlist{$suffix}" class="tablerenderer resumefour resumecomposite fullwidth table">
<thead>
<tr>
{if $controls}
<th class="resumecontrols">
<span class="accessible-hidden sr-only">{str tag=move}</span>
</th>
{/if}
<th>{str tag='title' section='artefact.resume'}</th>
<th class="resumeattachments text-center">
<span>{str tag=Attachments section=artefact.resume}</span>
</th>
{if $controls}
<th class="resumecontrols">
<span class="accessible-hidden sr-only">{str tag=edit}</span>
</th>
{/if}
</tr>
</thead>
<!-- Table body is rendered by javascript on content-> resume -->
</table>
{if $controls}
<div class="panel-footer has-form">
<div id="certificationform" class="collapse mtl mlm" data-action='reset-on-collapse'>
......@@ -100,3 +59,72 @@
</div>
{/if}
</div>
{/if}
<!-- Render certificationt blockinstance on page view -->
<div class="list-group list-group-lite">
{foreach from=$rows item=row}
<div class="list-group-item">
<h4 class="mt0 list-group-item-heading">
{if $row->description || $row->attachments}
<a href="#certification-content-{$row->id}-{$id}" class="text-left collapsed collapsible" aria-expanded="false" data-toggle="collapse">
{$row->title}
<span class="icon pts icon-chevron-down pull-right collapse-indicator"></span>
<br />
<span class="text-small text-muted">
{$row->date}
</span>
</a>
{else}
{$row->title}
<br />
<span class="text-small text-muted">
{$row->date}
</span>
{/if}
</h4>
<div id="certification-content-{$row->id}-{$id}" class="collapse resume-content mtm">
{if $row->description}
<p class="compositedesc">
{$row->description}
</p>
{/if}
{if $row->attachments}
<h5 class="plm">
<span class="icon icon-paperclip prs"></span>
<span>{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount})
</h5>
<ul class="list-group mb0">
{foreach from=$row->attachments item=item}
<li class="list-group-item">
<a href="{$item->downloadpath}" class="outer-link icon-on-hover">
<span class="sr-only">{str tag=Download section=artefact.file} {$item->title}</span>
</a>
{if $item->iconpath}
<img src="{$item->iconpath}" alt="">
{else}
<span class="icon icon-{$item->artefacttype} icon-lg text-default"></span>
{/if}
<span class="title plm text-inline">
<a href="{$item->viewpath}" class="inner-link">
{$item->title}
</a>
<span class="metadata"> -
[{$item->size}]
</span>
</span>
<span class="icon icon-download icon-lg pull-right pts text-watermark icon-action inner-link"></span>
</li>
{/foreach}
</ul>
{/if}
</div>
</div>
{/foreach}
</div>
\ No newline at end of file
{if $controls}
<div class="panel panel-default">
{if !$hidetitle}
<h3 class="resumeh3 panel-heading">
......@@ -23,62 +24,8 @@
</th>{/if}
</tr>
</thead>
<!-- This markup is rendered inside blockinstance on page -->
<tbody>
{foreach from=$rows item=row}
<tr>
{if $controls}<td class="control-buttons"></td>{/if}
<td>
<div class="expandable-head">
{if $row->qualdescription || $row->attachments}<a class="toggle textonly" href="#">{else}<strong>{/if}
{$row->qualification}git
{if $row->qualdescription || $row->attachments}</a>{else}</strong>{/if}
<div>{$row->startdate}{if $row->enddate} - {$row->enddate}{/if}</div>
</div>
<div class="expandable-body">
<div class="compositedesc">{$row->qualdescription}</div>
{if $row->attachments}
<table class="attachments table">
<thead>
<tr>
<th colspan="2">
<span class="icon icon-paperclip prs"></span>
<span>{str tag='attachedfiles' section='artefact.blog'}</span>
</tr>
</thead>
<tbody>
{foreach from=$row->attachments item=item}
<tr>
{if $icons}
<td class="iconcell">
<img src="{$item->iconpath}" alt="">
</td>
{/if}
<td class="text-small">
<a href="{$item->viewpath}">
{$item->title}
</a> ({$item->size}) -
<strong>
<a href="{$item->downloadpath}">
{str tag=Download section=artefact.file}
</a>
</strong>
</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
</div>
</td>
<td class="text-center">{$row->clipcount}</td>
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
{/foreach}
</tbody>
</table>
</div>
<!-- Table body is rendered by javascript on content-> resume -->
</table>
{if $controls}
<div class="panel-footer has-form">
<div id="educationhistoryform" class="collapse mtl mlm" data-action='reset-on-collapse'>
......@@ -103,3 +50,74 @@
</div>
{/if}
</div>
{/if}
<!-- Render education blockinstance on page view -->
<div class="list-group list-group-lite">
{foreach from=$rows item=row}
<div class="list-group-item collapsible" data-resume-collapsible>
{if $row->qualdescription || $row->attachments}
<a href="#" class="text-left collapsed list-group-item-heading">
{$row->qualification}
<span class="icon pts icon-chevron-down pull-right collapse-indicator"></span>
<br />
<span class="text-small text-muted">
{$row->startdate}
{if $row->enddate} - {$row->enddate}{/if}
</span>
</a>
{else}
<span class="list-group-item-heading">
{$row->qualification}
<br />
<span class="text-small text-muted">
{$row->startdate}
{if $row->enddate} - {$row->enddate}{/if}
</span>
</span>
{/if}
<div id="education-content-{$row->id}" class="collapse resume-content mtm" data-action="collapse">
{if $row->qualdescription}
<p class="compositedesc">
{$row->qualdescription}
</p>
{/if}
{if $row->attachments}
<div class="plm">
<span class="icon icon-paperclip prs"></span>
<span>{str tag='attachedfiles' section='artefact.blog'}</span>
({$row->clipcount})
</div>
<ul class="list-group mb0">
{foreach from=$row->attachments item=item}
<li class="list-group-item">
<a href="{$item->downloadpath}" class="outer-link icon-on-hover">
<span class="sr-only">{str tag=Download section=artefact.file} {$item->title}</span>
</a>
{if $item->iconpath}
<img src="{$item->iconpath}" alt="">
{else}
<span class="icon icon-{$item->artefacttype} icon-lg text-default"></span>
{/if}
<span class="title plm text-inline">
<a href="{$item->viewpath}" class="inner-link">
{$item->title}
</a>
<span class="metadata"> -
[{$item->size}]
</span>
</span>
<span class="icon icon-download icon-lg pull-right pts text-watermark icon-action inner-link"></span>
</li>
{/foreach}
</ul>
{/if}
</div>
</div>
{/foreach}
</div>
{if $controls}
<div class="panel panel-default">
{if !$hidetitle}
<h3 class="resumeh3 panel-heading">
{str tag='employmenthistory' section='artefact.resume'}
{if $controls}
{contextualhelp plugintype='artefact' pluginname='resume' section='addemploymenthistory'}
{contextualhelp plugintype='artefact' pluginname='resume' section='addemploymenthistory'}
{/if}
</h3>
{/if}
<div>
<table id="employmenthistorylist{$suffix}" class="tablerenderer resumefive resumecomposite fullwidth table">
<thead>
<tr>
{if $controls}<th class="resumecontrols">
<span class="accessible-hidden sr-only">{str tag=move}</span>
</th>{/if}
<th>{str tag='position' section='artefact.resume'}</th>
<th class="resumeattachments text-center">
<span>{str tag=Attachments section=artefact.resume}</span>
</th>
{if $controls}<th class="resumecontrols">
<span class="accessible-hidden sr-only">{str tag=edit}</span>
</th>{/if}
</tr>
</thead>
<!-- This markup is rendered inside blockinstance on page -->
<tbody>
{foreach from=$rows item=row}
<tr>
{if $controls}<td class="buttonscell"></td>{/if}
<td>
<div class="expandable-head">
{if $row->positiondescription || $row->attachments}<a class="toggle textonly" href="#">{else}<strong>{/if}
{$row->jobtitle}: {$row->employer}
{if $row->positiondescription || $row->attachments}</a>{else}</strong>{/if}
<div>{$row->startdate}{if $row->enddate} - {$row->enddate}{/if}</div>
</div>
<div class="expandable-body">
<div class="compositedesc">{$row->positiondescription}</div>
{if $row->attachments}
<table class="attachments table">
<thead>
<tr>
<th colspan="2">
<span class="icon icon-paperclip prs"></span>
<span>{str tag='attachedfiles' section='artefact.blog'}</span>
</th>
</tr>
</thead>
<tbody>
{foreach from=$row->attachments item=item}
<tr>
{if $icons}
<td class="iconcell">
<img src="{$item->iconpath}" alt="">
</td>
{/if}
<td class="text-small">
<a href="{$item->viewpath}">
{$item->title}
</a>
({$item->size}) -
<strong>
<a href="{$item->downloadpath}">{str tag=Download section=artefact.file}
</a>
</strong>
</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
</div>
</td>
<td class="text-center">
{$row->clipcount}
</td>
{if $controls}<td class="control-buttons"></td>{/if}
</tr>
{/foreach}
</tbody>