Commit 3edfb01d authored by Pat Kira's avatar Pat Kira Committed by Aaron Wells

Typography styling (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ie02bb3bb178921bc16a6deae3016915f8ca3b51d
parent 737386ee
...@@ -106,7 +106,7 @@ var table = new TableRenderer( ...@@ -106,7 +106,7 @@ var table = new TableRenderer(
if (rowdata['isdefault'] == 't' || rowdata['isdefault'] == 1) { if (rowdata['isdefault'] == 't' || rowdata['isdefault'] == 1) {
options.checked = 'checked'; options.checked = 'checked';
} }
var label = LABEL({'class': 'accessible-hidden', 'for': 'setdefault_' + rowdata.id}, {$setdefault}); var label = LABEL({'class': 'accessible-hidden sr-only', 'for': 'setdefault_' + rowdata.id}, {$setdefault});
return TD({'class': 'defaultcell'}, INPUT(options), label); return TD({'class': 'defaultcell'}, INPUT(options), label);
}, },
function(rowdata) { function(rowdata) {
...@@ -120,7 +120,7 @@ var table = new TableRenderer( ...@@ -120,7 +120,7 @@ var table = new TableRenderer(
if (!rowdata.id) { if (!rowdata.id) {
options.disabled = 'disabled'; options.disabled = 'disabled';
} }
var label = LABEL({'class': 'accessible-hidden', 'for': 'markdelete_' + rowdata.id}, {$markfordeletion}); var label = LABEL({'class': 'accessible-hidden sr-only', 'for': 'markdelete_' + rowdata.id}, {$markfordeletion});
return TD({'class': 'deletecell'}, INPUT(options), label); return TD({'class': 'deletecell'}, INPUT(options), label);
} }
] ]
......
...@@ -1270,6 +1270,7 @@ function auth_get_login_form_elements() { ...@@ -1270,6 +1270,7 @@ function auth_get_login_form_elements() {
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success',
'value' => get_string('login') 'value' => get_string('login')
), ),
'register' => array( 'register' => array(
......
...@@ -66,12 +66,14 @@ if (get_config('allowgroupcategories') ...@@ -66,12 +66,14 @@ if (get_config('allowgroupcategories')
} }
$elements['search'] = array( $elements['search'] = array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success',
'value' => get_string('search')); 'value' => get_string('search'));
$searchform = pieform(array( $searchform = pieform(array(
'name' => 'search', 'name' => 'search',
'checkdirtychange' => false, 'checkdirtychange' => false,
'method' => 'post', 'method' => 'post',
'renderer' => 'oneline', 'renderer' => 'oneline',
'class' => 'form-inline',
'elements' => $elements 'elements' => $elements
) )
); );
......
...@@ -54,13 +54,14 @@ if (get_config('allowgroupcategories') ...@@ -54,13 +54,14 @@ if (get_config('allowgroupcategories')
} }
$elements['submit'] = array( $elements['submit'] = array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success',
'value' => get_string('filter')); 'value' => get_string('filter'));
$form = pieform(array( $form = pieform(array(
'name' => 'filter', 'name' => 'filter',
'checkdirtychange' => false, 'checkdirtychange' => false,
'method' => 'post', 'method' => 'post',
'renderer' => 'oneline', 'renderer' => 'oneline',
'class' => 'filter-form form-inline', 'class' => 'form-inline',
'elements' => $elements 'elements' => $elements
)); ));
......
...@@ -129,7 +129,7 @@ function globalErrorHandler(data) { ...@@ -129,7 +129,7 @@ function globalErrorHandler(data) {
function show_login_form(submit) { function show_login_form(submit) {
if($('ajax-login-form') == null) { if($('ajax-login-form') == null) {
var loginForm = DIV({id: 'ajax-login-form'}); var loginForm = DIV({id: 'ajax-login-form'});
loginForm.innerHTML = '<h2>' + get_string('login') + '</h2><a href="/">&laquo; ' + get_string('home') + '<\/a><div id="loginmessage">' + get_string('sessiontimedout') + '</div><form class="pieform" name="login" method="post" action="" id="login" onsubmit="' + submit + '(this, 42); return false;"><table cellspacing="0" border="0" class="maharatable"><tbody><tr id="login_login_username_header" class="required text"><th><label for="login_login_username">' + get_string('username') + ':<\/label><\/th><\/tr><tr id="login_login_username_container"><td><input type="text" class="required text autofocus" id="login_login_username" name="login_username" value=""><\/td><\/tr><tr><td class="description"> <\/td><\/tr><tr id="login_login_password_header" class="required password"><th><label for="login_login_password">' + get_string('password') + ':<\/label><\/th><\/tr><tr id="login_login_password_container"><td><input type="password" class="required password" id="login_login_password" name="login_password" value=""><\/td><\/tr><tr><td class="description"> <\/td><\/tr><tr id="login_submit_container"><td><input type="submit" class="submit" id="login_submit" name="submit" value="' + get_string('login') + '"><\/td><\/tr><\/tbody><\/table><div id="homepage"><\/div><input type="hidden" name="sesskey" value=""><input type="hidden" name="pieform_login" value=""><\/form><script type="application\/javascript">var login_btn = null;addLoadEvent(function() { connect($(\'login_submit\'), \'onclick\', function() { login_btn = \'login_submit\'; });});connect(\'login\', \'onsubmit\', function() { formStartProcessing(\'login\', login_btn); });<\/script>'; loginForm.innerHTML = '<h2>' + get_string('login') + '</h2><a href="/">&laquo; ' + get_string('home') + '<\/a><div id="loginmessage">' + get_string('sessiontimedout') + '</div><form class="pieform" name="login" method="post" action="" id="login" onsubmit="' + submit + '(this, 42); return false;"><table cellspacing="0" border="0" class="maharatable"><tbody><tr id="login_login_username_header" class="required text"><th><label for="login_login_username">' + get_string('username') + ':<\/label><\/th><\/tr><tr id="login_login_username_container"><td><input type="text" class="required text autofocus" id="login_login_username" name="login_username" value=""><\/td><\/tr><tr><td class="description"> <\/td><\/tr><tr id="login_login_password_header" class="required password"><th><label for="login_login_password">' + get_string('password') + ':<\/label><\/th><\/tr><tr id="login_login_password_container"><td><input type="password" class="required password" id="login_login_password" name="login_password" value=""><\/td><\/tr><tr><td class="description"> <\/td><\/tr><tr id="login_submit_container"><td><input type="submit" class="submit btn btn-success" id="login_submit" name="submit" value="' + get_string('login') + '"><\/td><\/tr><\/tbody><\/table><div id="homepage"><\/div><input type="hidden" name="sesskey" value=""><input type="hidden" name="pieform_login" value=""><\/form><script type="text\/javascript">var login_btn = null;addLoadEvent(function() { connect($(\'login_submit\'), \'onclick\', function() { login_btn = \'login_submit\'; });});connect(\'login\', \'onsubmit\', function() { formStartProcessing(\'login\', login_btn); });<\/script>';
appendChildNodes(document.body, DIV({id: 'overlay'})); appendChildNodes(document.body, DIV({id: 'overlay'}));
appendChildNodes(document.body, loginForm); appendChildNodes(document.body, loginForm);
$('login_login_username').focus(); $('login_login_username').focus();
......
...@@ -42,10 +42,15 @@ function pieform_renderer_div(Pieform $form, $element) {/*{{{*/ ...@@ -42,10 +42,15 @@ function pieform_renderer_div(Pieform $form, $element) {/*{{{*/
if (!empty($element['class'])) { if (!empty($element['class'])) {
// add form-group classes to all real form fields // add form-group classes to all real form fields
if ($element['class'] !== 'html') { if (strpos($element['class'],'html') === false) {
$element['class'] = $element['class'] . ' form-group'; $element['class'] = $element['class'] . ' form-group';
} }
// add bootstrap has-error class to any error fields
if (strpos($element['class'],'error') !== false) {
$element['class'] = $element['class'] . ' has-error';
}
$result .= ' class="' . Pieform::hsc($element['class']) . '"'; $result .= ' class="' . Pieform::hsc($element['class']) . '"';
} }
......
...@@ -47,6 +47,16 @@ function pieform_renderer_oneline(Pieform $form, $element) {/*{{{*/ ...@@ -47,6 +47,16 @@ function pieform_renderer_oneline(Pieform $form, $element) {/*{{{*/
$result .= ' id="' . $formname . '_' . Pieform::hsc($element['name']) . '_container"'; $result .= ' id="' . $formname . '_' . Pieform::hsc($element['name']) . '_container"';
} }
if (!empty($element['class'])) { if (!empty($element['class'])) {
// add form-group classes to all real form fields
if (strpos($element['class'],'html') === false) {
$element['class'] = $element['class'] . ' form-group-inline';
}
// add bootstrap has-error class to any error fields
if (strpos($element['class'],'error') !== false) {
$element['class'] = $element['class'] . ' has-error';
}
$result .= ' class="' . Pieform::hsc($element['class']) . '"'; $result .= ' class="' . Pieform::hsc($element['class']) . '"';
} }
$result .= '>'; $result .= '>';
......
...@@ -2105,6 +2105,7 @@ function acceptfriend_form($friendid) { ...@@ -2105,6 +2105,7 @@ function acceptfriend_form($friendid) {
'elements' => array( 'elements' => array(
'acceptfriend_submit' => array( 'acceptfriend_submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success',
'value' => get_string('approverequest', 'group'), 'value' => get_string('approverequest', 'group'),
), ),
'id' => array( 'id' => array(
......
...@@ -2079,11 +2079,7 @@ function get_help_icon($plugintype, $pluginname, $form, $element, $page='', $sec ...@@ -2079,11 +2079,7 @@ function get_help_icon($plugintype, $pluginname, $form, $element, $page='', $sec
json_encode($pluginname) . ',' . json_encode($page) . ',' . json_encode($pluginname) . ',' . json_encode($page) . ',' .
json_encode($section) json_encode($section)
. ',this); return false;' . ',this); return false;'
<<<<<<< HEAD
) . '"><img src="' . $THEME->get_image_url('help') . '" alt="' . get_string('Help') . '" title="' . get_string('Help') . '"></a></span>';
=======
) . '"><span class="glyphicon glyphicon-info-sign"></span><span class="sr-only">Help</span></a></span>'; ) . '"><span class="glyphicon glyphicon-info-sign"></span><span class="sr-only">Help</span></a></span>';
>>>>>>> Form styling (bootstrap)
} }
function pieform_get_help(Pieform $form, $element) { function pieform_get_help(Pieform $form, $element) {
......
{foreach from=$posts item=post} {foreach from=$posts item=post}
<div id="posttitle_{$post->id}" class="{if $post->published}published{else}draft{/if}"> <div id="posttitle_{$post->id}" class="{if $post->published}published{else}draft{/if} listrow">
<div class="fr"> <div class="pull-right">
<span id="poststatus{$post->id}" class="poststatus"> <span id="poststatus{$post->id}" class="poststatus">
{if $post->published} {if $post->published}
{str tag=published section=artefact.blog} {str tag=published section=artefact.blog}
...@@ -35,13 +35,14 @@ ...@@ -35,13 +35,14 @@
{if $post->tags}<div id="posttags_{$post->id}" class="tags">{str tag=tags}: {list_tags owner=$post->author tags=$post->tags}</div>{/if} {if $post->tags}<div id="posttags_{$post->id}" class="tags">{str tag=tags}: {list_tags owner=$post->author tags=$post->tags}</div>{/if}
{if $post->files} {if $post->files}
<div id="postfiles_{$post->id}"> <div id="postfiles_{$post->id}">
<table class="cb attachments fullwidth"> <table class="cb attachments fullwidth table table-striped">
<thead class="expandable-head"> <thead class="expandable-head">
<tr> <tr>
<td colspan="2"> <td colspan="2">
<a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a> <a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a>
<span class="fr"> <span class="pull-right">
<img class="fl" src="{theme_url filename='images/attachment.png'}" alt="{str tag=Attachments section=artefact.resume}"> <span class="glyphicon glyphicon-paperclip"></span>
<span class="sr-only">{str tag=Attachments section=artefact.resume}</span>
{$post->files|count} {$post->files|count}
</span> </span>
</td> </td>
......
{include file="header.tpl"} {include file="header.tpl"}
<div id="myblogs" class="rel"> <div id="myblogs" class="rel">
<div class="rbuttons"> <div class="pull-right">
<a class="btn addpost" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a> <a class="btn btn-success addpost" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
{if !$blog->get('locked')} {if !$blog->get('locked')}
<a class="btn settings" href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a> <a class="btn btn-success settings" href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
{/if} {/if}
</div> </div>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{if $blog->get('tags')}<div class="tags">{str tag=tags}: {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}</div>{/if} {if $blog->get('tags')}<div class="tags">{str tag=tags}: {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}</div>{/if}
{if $posts} {if $posts}
<div id="postlist" class="fullwidth"> <div id="postlist" class="fullwidth listing">
{$posts.tablerows|safe} {$posts.tablerows|safe}
</div> </div>
<div id="blogpost_page_container" class="hidden">{$posts.pagination|safe}</div> <div id="blogpost_page_container" class="hidden">{$posts.pagination|safe}</div>
......
{if !$filelist} {if !$filelist}
<p>{str tag=nofilesfound section=artefact.file}</p> <p>{str tag=nofilesfound section=artefact.file}</p>
{else} {else}
<table id="{$prefix}_filelist" class="tablerenderer filelist fullwidth table"> <table id="{$prefix}_filelist" class="tablerenderer filelist fullwidth table table-striped">
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
......
{include file="header.tpl"} {include file="header.tpl"}
<p>{str tag=notesdescription1 section=artefact.internal}</p> <p>{str tag=notesdescription1 section=artefact.internal}</p>
<table id="notes" class="fullwidth listing"> <table id="notes" class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>{str tag=Note section=artefact.internal}</th> <th>{str tag=Note section=artefact.internal}</th>
<th>{str tag=currenttitle section=artefact.internal}</th> <th>{str tag=currenttitle section=artefact.internal}</th>
<th>{str tag=containedin section=artefact.internal}</th> <th>{str tag=containedin section=artefact.internal}</th>
<th class="center"><img src="{theme_url filename="images/attachment.png"}" title="{str tag=Attachments section=artefact.resume}" alt="{str tag=Attachments section=artefact.resume}" /></th> <th class="text-center">
<span class="glyphicon glyphicon-paperclip"></span>
<span class="sr-only">{str tag=Attachments section=artefact.resume}</span>
</th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th> <th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
</tr> </tr>
</thead> </thead>
...@@ -15,9 +18,9 @@ ...@@ -15,9 +18,9 @@
<tr class="{cycle values='r1,r0'}"> <tr class="{cycle values='r1,r0'}">
<td class="note-name"> <td class="note-name">
{if $n->locked} {if $n->locked}
<h3 class="title"><a class="notetitle" href="" id="n{$n->id}">{$n->title|str_shorten_text:80:true} <span class="accessible-hidden sr-only">{str tag=clickformore}</span></a></h3> <h3><a class="notetitle" href="" id="n{$n->id}">{$n->title|str_shorten_text:80:true} <span class="accessible-hidden sr-only">{str tag=clickformore}</span></a></h3>
{else} {else}
<h3 class="title"><a class="notetitle" href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" id="n{$n->id}">{$n->title|str_shorten_text:80:true} <span class="accessible-hidden sr-only">{str tag=clickformore}</span></a></h3> <h3><a class="notetitle" href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" id="n{$n->id}">{$n->title|str_shorten_text:80:true} <span class="accessible-hidden sr-only">{str tag=clickformore}</span></a></h3>
{/if} {/if}
<div id="n{$n->id}_desc" class="hidden detail">{$n->description|clean_html|safe} <div id="n{$n->id}_desc" class="hidden detail">{$n->description|clean_html|safe}
{if $n->files} {if $n->files}
...@@ -27,7 +30,7 @@ ...@@ -27,7 +30,7 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a> <a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a>
<span class="fr"> <span class="pull-right">
<img class="fl" src="{theme_url filename='images/attachment.png'}" alt="{str tag=attachments section=artefact.blog}"> <img class="fl" src="{theme_url filename='images/attachment.png'}" alt="{str tag=attachments section=artefact.blog}">
{$n->files|count} {$n->files|count}
</span> </span>
...@@ -78,7 +81,10 @@ ...@@ -78,7 +81,10 @@
{if $n->locked} {if $n->locked}
<span class="s dull">{str tag=Submitted section=view}</span> <span class="s dull">{str tag=Submitted section=view}</span>
{else} {else}
<a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str(tag=editspecific arg1=$n->title)|escape:html|safe}"></a> <a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}">
<span class="glyphicon glyphicon-pencil"></span>
<span class="sr-only">{str(tag=editspecific arg1=$n->title)|escape:html|safe}</span>
</a>
{if $n->deleteform}{$n->deleteform|safe}{/if} {if $n->deleteform}{$n->deleteform|safe}{/if}
{/if} {/if}
</td> </td>
......
...@@ -19,9 +19,15 @@ ...@@ -19,9 +19,15 @@
<td><span>{$row->description}</span></td> <td><span>{$row->description}</span></td>
<td>{if $row->link}<a href="{$row->link}" title="{$row->link}" target="_blank" class="socialprofile">{/if}{$row->title}{if $row->link}</a>{/if}</td> <td>{if $row->link}<a href="{$row->link}" title="{$row->link}" target="_blank" class="socialprofile">{/if}{$row->title}{if $row->link}</a>{/if}</td>
{if $controls}<td class="right buttonscell btns2"> {if $controls}<td class="right buttonscell btns2">
<a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}" title="{str tag='edit'}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag='edit'}"></a> <a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}" title="{str tag='edit'}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="sr-only">{str tag='edit'}</span>
</a>
{if $candelete} {if $candelete}
<a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}&delete=1" title="{str tag='delete'}"><img src="{theme_url filename='images/btn_deleteremove.png'}" alt="{str tag='delete'}"></a> <a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}&delete=1" title="{str tag='delete'}" class="btn btn-danger btn-xs">
<span class="glyphicon glyphicon-trash"></span>
<span class="sr-only">{str tag='delete'}</span>
</a>
{/if} {/if}
</td>{/if} </td>{/if}
</tr> </tr>
......
{include file="header.tpl"} {include file="header.tpl"}
<div id="planswrap"> <div id="planswrap">
<div class="rbuttons"> <div class="align-right">
<a class="btn" href="{$WWWROOT}artefact/plans/new.php">{str section="artefact.plans" tag="newplan"}</a> <a class="btn btn-success" href="{$WWWROOT}artefact/plans/new.php">{str section="artefact.plans" tag="newplan"}</a>
</div> </div>
{if !$plans.data} {if !$plans.data}
<div class="message">{$strnoplansaddone|safe}</div> <div class="message">{$strnoplansaddone|safe}</div>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div>{$planstasksdescription}</div> <div>{$planstasksdescription}</div>
<div class="message">{$strnotasksaddone|safe}</div> <div class="message">{$strnotasksaddone|safe}</div>
{else} {else}
<table id="taskslist" class="fullwidth listing"> <table id="taskslist" class="fullwidth listing table table-striped">
<thead> <thead>
<tr> <tr>
<th>{str tag='completiondate' section='artefact.plans'}</th> <th>{str tag='completiondate' section='artefact.plans'}</th>
......
{foreach from=$plans.data item=plan} {foreach from=$plans.data item=plan}
<div class="{cycle values='r0,r1'} listrow"> <div class="{cycle values='r0,r1'} listrow">
<h3 class="title"><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{$plan->title}</a></h3> <h3 class="title pull-left"><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{$plan->title}</a></h3>
<div class="fr planstatus"> <div class="pull-right planstatus">
<a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" title="{str tag=edit}" > <a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" title="{str tag=edit}" class="btn btn-default btn-xs">
<img src="{theme_url filename='images/btn_edit.png'}" alt="{str(tag=editspecific arg1=$plan->title)|escape:html|safe}"></a> <span class="glyphicon glyphicon-pencil"></span>
<a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}" title="{str tag=managetasks section=artefact.plans}"> <span class="sr-only">{str(tag=editspecific arg1=$plan->title)|escape:html|safe}</span>
<img src="{theme_url filename='images/btn_configure.png'}" alt="{str(tag=managetasksspecific section=artefact.plans arg1=$plan->title)|escape:html|safe}"></a> </a>
<a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" title="{str tag=delete}"> <a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}" title="{str tag=managetasks section=artefact.plans}" class="btn btn-default btn-xs">
<img src="{theme_url filename='images/btn_deleteremove.png'}" alt="{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}"></a> <span class="glyphicon glyphicon-cog"></span>
<span class="sr-only">{str(tag=managetasksspecific section=artefact.plans arg1=$plan->title)|escape:html|safe}</span>
</a>
<a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" title="{str tag=delete}" class="btn btn-danger btn-xs">
<span class="glyphicon glyphicon-trash"></span>
<span class="sr-only">{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}</span>
</a>
</div> </div>
<div class="detail">{$plan->description|clean_html|safe}</div> <div class="detail">{$plan->description|clean_html|safe}</div>
......
...@@ -3,11 +3,14 @@ ...@@ -3,11 +3,14 @@
{contextualhelp plugintype='artefact' pluginname='resume' section='mygoals'} {contextualhelp plugintype='artefact' pluginname='resume' section='mygoals'}
{/if} {/if}
</legend>{/if} </legend>{/if}
<table id="goalslist{$suffix}" class="tablerenderer fullwidth"> <table id="goalslist{$suffix}" class="tablerenderer fullwidth table table-striped">
<thead> <thead>
<tr> <tr>
<th>{str tag='goals' section='artefact.resume'}</th> <th>{str tag='goals' section='artefact.resume'}</th>
<th class="resumeattachments center"><img src="{theme_url filename="images/attachment.png"}" title="{str tag=Attachments section=artefact.resume}" alt="{str tag=Attachments section=artefact.resume}" /></th> <th class="resumeattachments text-center">
<span class="glyphicon glyphicon-paperclip">
<span class="sr-only">{str tag=Attachments section=artefact.resume}</span>
</th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th> <th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
</tr> </tr>
</thead> </thead>
...@@ -16,7 +19,7 @@ ...@@ -16,7 +19,7 @@
<tr class="{cycle values='r0,r1'}"> <tr class="{cycle values='r0,r1'}">
<td class="goaltitle"> <td class="goaltitle">
{if $n->exists} {if $n->exists}
<h3 class="title"><a class="goaltitle" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" id="n{$n->id}">{str tag=$n->artefacttype section='artefact.resume'}</a></h3> <h3><a class="goaltitle" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" id="n{$n->id}">{str tag=$n->artefacttype section='artefact.resume'}</a></h3>
<div id="n{$n->id}_desc" class="hidden detail">{if $n->description != ''}{$n->description|clean_html|safe}{else}{str tag=nodescription section=artefact.resume}{/if} <div id="n{$n->id}_desc" class="hidden detail">{if $n->description != ''}{$n->description|clean_html|safe}{else}{str tag=nodescription section=artefact.resume}{/if}
{if $n->files} {if $n->files}
<div id="resume_{$n->id}"> <div id="resume_{$n->id}">
...@@ -39,18 +42,20 @@ ...@@ -39,18 +42,20 @@
</div> </div>
{/if} {/if}
{else} {else}
<h3 class="title">{str tag=$n->artefacttype section='artefact.resume'}</h3> <h3>{str tag=$n->artefacttype section='artefact.resume'}</h3>
{/if} {/if}
</td> </td>
<td align="center">{$n->count}</td> <td align="center">{$n->count}</td>
<td class="right buttonscell btns2"> <td class="right buttonscell btns2">
{if $n->exists} {if $n->exists}
<a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}"> <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}" class="btn btn-default btn-xs">
<img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}"> <span class="glyphicon glyphicon-pencil"></span>
<span class="sr-only">{str tag=edit}</span>
</a> </a>
{else} {else}
<a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit$n->artefacttype section=artefact.resume}"> <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit$n->artefacttype section=artefact.resume}" class="btn btn-default btn-xs">
<img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag=edit}"> <span class="glyphicon glyphicon-pencil"></span>
<span class="sr-only">{str tag=edit}</span>
</a> </a>
{/if} {/if}
</td> </td>
......
...@@ -3,11 +3,14 @@ ...@@ -3,11 +3,14 @@
{contextualhelp plugintype='artefact' pluginname='resume' section='myskills'} {contextualhelp plugintype='artefact' pluginname='resume' section='myskills'}
{/if} {/if}
</legend>{/if} </legend>{/if}
<table id="skillslist{$suffix}" class="tablerenderer fullwidth"> <table id="skillslist{$suffix}" class="tablerenderer fullwidth table table-striped">
<thead> <thead>
<tr> <tr>
<th>{str tag='skills' section='artefact.resume'}</th> <th>{str tag='skills' section='artefact.resume'}</th>
<th class="resumeattachments center"><img src="{theme_url filename="images/attachment.png"}" title="{str tag=Attachments section=artefact.resume}" alt="{str tag=Attachments section=artefact.resume}" /></th> <th class="resumeattachments text-center">
<span class="glyphicon glyphicon-paperclip"></span>
<span class="sr-only">{str tag=Attachments section=artefact.resume}</span>
</th>