Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
60771d00
Commit
60771d00
authored
Nov 20, 2017
by
Robert Lyon
Committed by
Gerrit Code Review
Nov 20, 2017
Browse files
Merge "Bug 1529750: add address detail in resume block"
parents
92f7cd9e
67a95652
Changes
6
Hide whitespace changes
Inline
Side-by-side
htdocs/artefact/resume/blocktype/entireresume/lang/en.utf8/blocktype.entireresume.php
View file @
60771d00
...
...
@@ -11,6 +11,8 @@
defined
(
'INTERNAL'
)
||
die
();
$string
[
'addresstag'
]
=
'Address: %s'
;
$string
[
'address'
]
=
'Address'
;
$string
[
'title'
]
=
'My entire résumé'
;
$string
[
'description'
]
=
'A quick way to show your whole résumé'
;
...
...
htdocs/artefact/resume/lib.php
View file @
60771d00
...
...
@@ -1036,10 +1036,10 @@ EOF;
return
$js
;
}
static
function
get_tablerenderer_title_js
(
$titlestring
,
$extrastring
,
$bodystring
,
$attachstring
)
{
static
function
get_tablerenderer_title_js
(
$titlestring
,
$extrastring
,
$bodystring
,
$attachstring
,
$addressstring
=
'false'
)
{
return
<<<EOF
function (row, data) {
if (!{$bodystring} && !{$attachstring}) {
if (!{$bodystring} && !{$attachstring}
&& !{$addressstring}
) {
return jQuery('<td>').append(
jQuery('<span>').append({$titlestring}),
jQuery('<div>', {'class': 'detail text-midtone'}).append({$extrastring})
...
...
@@ -1048,7 +1048,7 @@ EOF;
var link = jQuery('<a>', {'class': 'toggle textonly', 'href': ''}).append({$titlestring})[0];
jQuery(link).on('click', function (e) {
e.preventDefault();
return showhideComposite(row, {$bodystring}, {$attachstring});
return showhideComposite(row, {$bodystring}, {$attachstring}
, {$addressstring}
);
});
var extra = jQuery('<div>', {'class': 'detail text-midtone'}).append({$extrastring});
return jQuery('<td>', {'id': 'composite-' + row.artefact + '-' + row.id}).append(
...
...
@@ -1060,7 +1060,7 @@ EOF;
static
function
get_showhide_composite_js
()
{
return
<<<EOF
function showhideComposite(row, content, attachments) {
function showhideComposite(row, content, attachments
, address
) {
// get the reference for the title we just clicked on
var titleTD = jQuery('#composite-' + row.artefact + '-' + row.id);
var bodyNode = jQuery('#composite-body-' + row.artefact + '-' + row.id);
...
...
@@ -1070,6 +1070,7 @@ EOF;
}
var newNode = jQuery('<div>', {'id': 'composite-body-' + row.artefact + '-' + row.id}).append(
jQuery('<div>', {'class':'content-text'}).append(content),
address,
attachments
);
newNode.insertAfter(titleTD.find('.expandable-head').first());
...
...
@@ -1261,7 +1262,8 @@ class ArtefactTypeEmploymenthistory extends ArtefactTypeResumeComposite {
self
::
get_tablerenderer_title_js_string
(),
self
::
get_tablerenderer_date_js_string
(),
self
::
get_tablerenderer_body_js_string
(),
self
::
get_tablerenderer_attachments_js_string
()
self
::
get_tablerenderer_attachments_js_string
(),
self
::
get_tablerenderer_address_js_string
()
)
.
",
function (row, data) {
return jQuery('<td>',
{
'style':'text-align:center'
}
).append(row.clipcount);
...
...
@@ -1289,6 +1291,13 @@ class ArtefactTypeEmploymenthistory extends ArtefactTypeResumeComposite {
return
" listAttachments(row.attachments)"
;
}
public
static
function
get_tablerenderer_address_js_string
()
{
$address
=
get_string
(
'address'
,
'blocktype.resume/entireresume'
);
return
<<<EOF
(row.employeraddress) ? jQuery('<p>', {'text' : "{$address}: " + row.employeraddress}) : ""
EOF;
}
public
static
function
get_addform_elements
()
{
return
array
(
'startdate'
=>
array
(
...
...
@@ -1403,7 +1412,8 @@ class ArtefactTypeEducationhistory extends ArtefactTypeResumeComposite {
self
::
get_tablerenderer_title_js_string
(),
self
::
get_tablerenderer_date_js_string
(),
self
::
get_tablerenderer_body_js_string
(),
self
::
get_tablerenderer_attachments_js_string
()
self
::
get_tablerenderer_attachments_js_string
(),
self
::
get_tablerenderer_address_js_string
()
)
.
",
function (row, data) {
return jQuery('<td>',
{
'style':'text-align:center'
}
).append(row.clipcount);
...
...
@@ -1449,6 +1459,13 @@ class ArtefactTypeEducationhistory extends ArtefactTypeResumeComposite {
return
" listAttachments(row.attachments)"
;
}
public
static
function
get_tablerenderer_address_js_string
()
{
$address
=
get_string
(
'address'
,
'blocktype.resume/entireresume'
);
return
<<<EOF
(row.institutionaddress) ? jQuery('<p>', {'text' : "{$address}: " + row.institutionaddress}) : ""
EOF;
}
public
static
function
get_addform_elements
()
{
global
$USER
;
return
array
(
...
...
@@ -1706,7 +1723,8 @@ class ArtefactTypeBook extends ArtefactTypeResumeComposite {
self
::
get_tablerenderer_title_js_string
(),
self
::
get_tablerenderer_date_js_string
(),
self
::
get_tablerenderer_body_js_string
(),
self
::
get_tablerenderer_attachments_js_string
()
self
::
get_tablerenderer_attachments_js_string
(),
self
::
get_tablerenderer_urladdress_js_string
()
)
.
",
function (row, data) {
return jQuery('<td>',
{
'style':'text-align:center'
}
).append(row.clipcount);
...
...
@@ -1727,18 +1745,19 @@ class ArtefactTypeBook extends ArtefactTypeResumeComposite {
}
public
static
function
get_tablerenderer_body_js_string
()
{
return
" row.description"
;
}
public
static
function
get_tablerenderer_attachments_js_string
()
{
return
" listAttachments(row.attachments)"
;
}
public
static
function
get_tablerenderer_urladdress_js_string
()
{
return
<<<EOF
jQuery('<div>').append(
row.description,
jQuery('<div>', {'id':'composite-book-url'}).append(
jQuery('<a>', {'href':row.url, 'text' : row.url})
)
)[0]
EOF;
}
public
static
function
get_tablerenderer_attachments_js_string
()
{
return
" listAttachments(row.attachments)"
;
}
public
static
function
get_addform_elements
()
{
...
...
htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/educationhistory.tpl
View file @
60771d00
...
...
@@ -55,7 +55,7 @@
{
foreach
from
=
$rows
item
=
row
}
<div
class=
"list-group-item"
>
<h4
class=
"list-group-item-heading"
>
{
if
$row
->
qualdescription
||
$row
->
attachments
}
{
if
$row
->
qualdescription
||
$row
->
attachments
||
$row
->
institutionaddress
}
<a
href=
"#education-content-
{
$row
->
id
}{
if
$artefactid
}
-
{
$artefactid
}{/
if
}
"
class=
"text-left collapsed collapsible"
aria-expanded=
"false"
data-toggle=
"collapse"
>
{
$row
->
qualification
}
<span
class=
"icon icon-chevron-down pull-right collapse-indicator"
role=
"presentation"
aria-hidden=
"true"
></span>
...
...
@@ -84,6 +84,12 @@
</p>
{/
if
}
{
if
$row
->
institutionaddress
}
<span
class=
"text-small text-muted"
>
{
str
tag
=
addresstag
section
=
'blocktype.resume/entireresume'
arg1
=
$row
->
institutionaddress
}
</span>
{/
if
}
{
if
$row
->
attachments
}
<div
class=
"list-group-item-heading"
>
<span
class=
"icon icon-paperclip left"
role=
"presentation"
aria-hidden=
"true"
></span>
...
...
htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/employmenthistory.tpl
View file @
60771d00
...
...
@@ -56,7 +56,7 @@
{
foreach
from
=
$rows
item
=
row
}
<div
class=
"list-group-item"
>
<h5
class=
"list-group-item-heading"
>
{
if
$row
->
positiondescription
||
$row
->
attachments
}
{
if
$row
->
positiondescription
||
$row
->
attachments
||
$row
->
employeraddress
}
<a
href=
"#employment-content-
{
$row
->
id
}{
if
$artefactid
}
-
{
$artefactid
}{/
if
}
"
class=
"text-left collapsed collapsible"
aria-expanded=
"false"
data-toggle=
"collapse"
>
{
$row
->
jobtitle
}
{
str
tag
=
"at"
}
{
$row
->
employer
}
<span
class=
"icon icon-chevron-down pull-right collapse-indicator"
role=
"presentation"
aria-hidden=
"true"
></span>
...
...
@@ -83,6 +83,12 @@
</p>
{/
if
}
{
if
$row
->
employeraddress
}
<span
class=
"text-small text-muted"
>
{
str
tag
=
addresstag
section
=
'blocktype.resume/entireresume'
arg1
=
$row
->
employeraddress
}
</span>
{/
if
}
{
if
$row
->
attachments
}
<div
class=
"list-group-item-heading"
>
<span
class=
"icon icon-paperclip left"
role=
"presentation"
aria-hidden=
"true"
></span>
...
...
htdocs/theme/raw_old/plugintype/artefact/resume/templates/fragments/educationhistory.tpl
View file @
60771d00
...
...
@@ -84,6 +84,12 @@
</p>
{/
if
}
{
if
$row
->
institutionaddress
}
<span
class=
"text-small text-muted"
>
{
str
tag
=
addresstag
section
=
'blocktype.resume/entireresume'
arg1
=
$row
->
institutionaddress
}
</span>
{/
if
}
{
if
$row
->
attachments
}
<div
class=
"list-group-item-heading"
>
<span
class=
"icon icon-paperclip left"
role=
"presentation"
aria-hidden=
"true"
></span>
...
...
htdocs/theme/raw_old/plugintype/artefact/resume/templates/fragments/employmenthistory.tpl
View file @
60771d00
...
...
@@ -83,6 +83,12 @@
</p>
{/
if
}
{
if
$row
->
employeraddress
}
<span
class=
"text-small text-muted"
>
{
str
tag
=
addresstag
section
=
'blocktype.resume/entireresume'
arg1
=
$row
->
employeraddress
}
</span>
{/
if
}
{
if
$row
->
attachments
}
<div
class=
"list-group-item-heading"
>
<span
class=
"icon icon-paperclip left"
role=
"presentation"
aria-hidden=
"true"
></span>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment