Commit 8df0061e authored by Lisa Seeto's avatar Lisa Seeto

Bug 1827811: Resume changes

added the modal_link for resume field attachments
fixed the modal)link typo in employmenthistory template
update commentlink to modal_link for goals and skills template

Change-Id: I8b203628dc47d7019ee75165cb11bc392ddefa03
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
parent ece65af4
......@@ -906,7 +906,6 @@ abstract class ArtefactTypeResumeComposite extends ArtefactTypeResume implements
$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;
}
......@@ -1996,7 +1995,6 @@ class ArtefactTypeResumeGoalAndSkill extends ArtefactTypeResume {
$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->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,7 +109,7 @@
{/if}
<span class="title text-inline">
<a href="{$item->viewpath}" class="text-small inner-link">
<a class="modal_link text-small inner-link" data-toggle="modal-docked" data-target="#configureblock" href="#" data-artefactid="{$item->id}">
{$item->title}
</a>
<span class="metadata"> -
......
......@@ -104,7 +104,7 @@
{/if}
<span class="title text-inline">
<a href="{$item->viewpath}" class="text-small inner-link">
<a class="modal_link text-small inner-link" data-toggle="modal-docked" data-target="#configureblock" href="#" data-artefactid="{$item->id}">
{$item->title}
</a>
<span class="metadata"> -
......
......@@ -109,7 +109,7 @@
{/if}
<span class="title text-inline">
<a href="{$item->viewpath}" class="text-small inner-link">
<a class="modal_link text-small inner-link" data-toggle="modal-docked" data-target="#configureblock" href="#" data-artefactid="{$item->id}">
{$item->title}
</a>
<span class="metadata"> -
......@@ -126,4 +126,4 @@
</div>
{/foreach}
</div>
{/if}
\ No newline at end of file
{/if}
......@@ -108,7 +108,7 @@
{/if}
<span class="title text-inline">
<a href="{$item->viewpath}" class="text-small inner-link">
<a class="modal_link text-small inner-link" data-toggle="modal-docked" data-target="#configureblock" href="#" data-artefactid="{$item->id}">
{$item->title}
</a>
<span class="metadata"> -
......@@ -125,4 +125,4 @@
</div>
{/foreach}
</div>
{/if}
\ No newline at end of file
{/if}
......@@ -31,7 +31,7 @@
{/if}
<span class="title list-group-item-heading">
<a href="{$item->viewpath}" class="inner-link">
<a class="modal_link inner-link" data-toggle="modal-docked" data-target="#configureblock" href="#" data-blockid="{$blockid}" data-artefactid="{$item->id}">
{$item->title}
</a>
<span class="metadata"> -
......
......@@ -107,7 +107,7 @@
{/if}
<span class="title text-inline">
<a href="{$item->viewpath}" class="text-small inner-link">
<a class="modal_link text-small inner-link" data-toggle="modal-docked" data-target="#configureblock" href="#" data-artefactid="{$item->id}">
{$item->title}
</a>
<span class="metadata"> -
......
......@@ -36,7 +36,7 @@
{/if}
<span class="title list-group-item-heading text-inline">
<a href="{$item->viewpath}" class="inner-link">
<a class="modal_link inner-link" data-toggle="modal-docked" data-target="#configureblock" href="#" data-blockid="{$blockid}" data-artefactid="{$item->id}">
{$item->title}
</a>
<span class="metadata"> -
......
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