Строка 129: |
Строка 129: |
| local lifetime = '' | | local lifetime = '' |
| local term_link = '' | | local term_link = '' |
− | local bts = '<span style="border-bottom: 1px dotted gray; cursor:help;" title="Большой теософский словарь">БТС</span>' | + | local ctd_title = '<span style="border-bottom: 1px dotted gray; cursor:help;" title="Большой теософский словарь">БТС</span>' |
| | | |
| -- split 'text@view' value of parameter 'userparam' in two variables | | -- split 'text@view' value of parameter 'userparam' in two variables |
Строка 180: |
Строка 180: |
| origin = origin .. frame.args['origin'] | | origin = origin .. frame.args['origin'] |
| end | | end |
− | if not isempty(frame.args['origin']) and not isempty(frame.args['lifetime']) then | + | if not isempty(frame.args['origin']) and |
| + | not isempty(frame.args['lifetime']) or not isempty(frame.args['published'])then |
| origin = origin .. ', ' | | origin = origin .. ', ' |
| end | | end |
| if not isempty(frame.args['lifetime']) then | | if not isempty(frame.args['lifetime']) then |
| origin = origin .. frame.args['lifetime'] | | origin = origin .. frame.args['lifetime'] |
| + | elseif not isempty(frame.args['published']) then |
| + | origin = origin .. frame.args['published'] |
| end | | end |
| origin = origin .. ')' | | origin = origin .. ')' |
Строка 190: |
Строка 193: |
| | | |
| -- construct lifetime string for pop-up message | | -- construct lifetime string for pop-up message |
− | if not isempty(frame.args['lifetime']) then | + | if not isempty(frame.args['lifetime']) |
| + | or not isempty(frame.args['published']) then |
| if term_type == 'личность' then | | if term_type == 'личность' then |
− | lifetime = ' Время жизни: ' | + | lifetime = ' Время жизни: '.. frame.args['lifetime'] |
| elseif term_type == 'выражение' then | | elseif term_type == 'выражение' then |
− | lifetime = ' Время применения: ' | + | lifetime = ' Время применения: '.. frame.args['lifetime'] |
| + | elseif term_type == 'литература' then |
| + | lifetime = ' Время публикации: '.. frame.args['published'] |
| else | | else |
− | lifetime = ' Время существования: ' | + | lifetime = ' Время существования: '.. frame.args['lifetime'] |
| end | | end |
− | lifetime = lifetime .. frame.args['lifetime'] .. '.' | + | lifetime = lifetime .. '.' |
| end | | end |
| | | |
Строка 211: |
Строка 217: |
| end | | end |
| if view == 'сноска' or view == 'сноска и подсказка' or view == 'подсказка и сноска' then | | if view == 'сноска' or view == 'сноска и подсказка' or view == 'подсказка и сноска' then |
− | reference = term_to_show .. origin .. ' – ' .. description .. ' ('.. bts ..').' | + | reference = term_to_show .. origin .. ' – ' .. description .. ' ('.. ctd_title ..').' |
| if not isempty(style) then -- there is only one additional style for now, so ignore the value | | if not isempty(style) then -- there is only one additional style for now, so ignore the value |
| reference = '<span style="color: gray;">' .. reference ..'</span>' | | reference = '<span style="color: gray;">' .. reference ..'</span>' |