Skip to content

adapt pull/8 to joomla 4+ #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JLTRY merged 7 commits into from
Dec 30, 2024
Merged

adapt pull/8 to joomla 4+ #96

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
52ed4a9
adapt pull/8 to joomla 4+
Dec 29, 2024
af880a2
Greek translation
parapente Dec 30, 2024
d33ff2c
Update attachments_component/admin/config.xml
JLTRY Dec 30, 2024
4060b0b
Update attachments_component/site/tmpl/attachments/default.php
JLTRY Dec 30, 2024
70e810a
Update attachments_component/site/tmpl/attachments/default.php
JLTRY Dec 30, 2024
96194ae
Update attachments_component/site/tmpl/attachments/default.php
JLTRY Dec 30, 2024
4e279fc
Update attachments_component/site/tmpl/attachments/default.php
JLTRY Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions attachments_component/admin/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field name="hide_brackets_if_empty" type="radio" default="0" class="btn-group"
Comment thread
JLTRY marked this conversation as resolved.
Outdated
label="ATTACH_HIDE_BRACKETS_IF_EMPTY"
description="ATTACH_HIDE_BRACKETS_IF_EMPTY_DESCRIPTION">
<option value="1">JYES</option>
<option value="0">JNO</option>
</field>

<field name="show_creator_name" type="radio" default="0" layout="joomla.form.field.radio.switcher"
label="ATTACH_SHOW_ATTACHMENT_CREATOR"
description="ATTACH_SHOW_ATTACHMENT_CREATOR_DESCRIPTION">
Expand Down
3 changes: 3 additions & 0 deletions attachments_component/admin/language/en-GB/en-GB.com_attachments.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,3 +382,6 @@ COM_ATTACHMENTS_N_ITEMS_PUBLISHED="%d Attachments successfully published"
COM_ATTACHMENTS_N_ITEMS_PUBLISHED_1="Attachment successfully published"
COM_ATTACHMENTS_N_ITEMS_UNPUBLISHED="%d Attachments successfully unpublished"
COM_ATTACHMENTS_N_ITEMS_UNPUBLISHED_1="Attachment successfully unpublished"

ATTACH_HIDE_BRACKETS_IF_EMPTY="Hide brackets when empty"
ATTACH_HIDE_BRACKETS_IF_EMPTY_DESCRIPTION="Hide brackets when there is no value in 'description' or user defined fields"
59 changes: 45 additions & 14 deletions attachments_component/site/tmpl/attachments/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,43 +276,74 @@
// Add description (maybe)
if ( $this->show_description ) {
$description = htmlspecialchars(stripslashes($attachment->description));
if ( StringHelper::strlen($description) == 0)

$is_empty = 0;
if ( StringHelper::strlen($description) == 0) {
$description = '&nbsp;';
$is_empty = 1;
}

if ( $this->show_column_titles )
$html .= "<td class=\"at_description\">$description</td>";
else
$html .= "<td class=\"at_description\">[$description]</td>";
else {
if ($is_empty && $this->params->get('hide_brackets_if_empty'))
$html .= "<td class=\"at_description\">$description</td>";
Comment thread
JLTRY marked this conversation as resolved.
Outdated
else
$html .= "<td class=\"at_description\">[$description]</td>";
}

}
// Show the USER DEFINED FIELDs (maybe)
if ( $this->show_user_field_1 ) {
$user_field = stripslashes($attachment->user_field_1);
if ( StringHelper::strlen($user_field) == 0 )
$is_empty = 0;
if ( StringHelper::strlen($user_field) == 0 ) {
$user_field = '&nbsp;';
$is_empty = 1;
}

if ( $this->show_column_titles )
$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
else
$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
else {
if ($is_empty && $this->params->get('hide_brackets_if_empty'))
$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
Comment thread
JLTRY marked this conversation as resolved.
Outdated
else
$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
}
}
if ( $this->show_user_field_2 ) {
$user_field = stripslashes($attachment->user_field_2);
if ( StringHelper::strlen($user_field) == 0 )
$is_empty = 0;
if ( StringHelper::strlen($user_field) == 0 ) {
$user_field = '&nbsp;';
$is_empty = 1;
}

if ( $this->show_column_titles )
$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
else
$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
else {
if ($is_empty && $this->params->get('hide_brackets_if_empty'))
$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
Comment thread
JLTRY marked this conversation as resolved.
Outdated
else
$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
}
}
if ( $this->show_user_field_3 ) {
$user_field = stripslashes($attachment->user_field_3);
if ( StringHelper::strlen($user_field) == 0 )
$is_empty = 0;
if ( StringHelper::strlen($user_field) == 0 ) {
$user_field = '&nbsp;';
$is_empty = 1;
}

if ( $this->show_column_titles )
$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
else
$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
else {
if ($is_empty && $this->params->get('hide_brackets_if_empty'))
$html .= "<td class=\"at_user_field\">" . $user_field . "</td>";
Comment thread
JLTRY marked this conversation as resolved.
Outdated
else
$html .= "<td class=\"at_user_field\">[" . $user_field . "]</td>";
}

}
// Add the creator's username (if requested)
if ( $this->show_creator_name ) {
$html .= "<td class=\"at_creator_name\">{$attachment->creator_name}</td>";
Expand Down