Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions components/ILIAS/Like/classes/class.ilLikeGUI.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public function getHTML(): string
$ctrl->setParameter($this, "repl_sig", $popover->getReplaceContentSignal()->getId());
$asyn_url = $ctrl->getLinkTarget($this, "renderEmoticons", "", true, false);
$popover = $popover->withAsyncContentUrl($asyn_url);
$button = $f->button()->shy($lng->txt("like"), '#')
$button = $f->button()->standard($lng->txt("like"), '#')
->withOnClick($popover->getShowSignal());

$tpl->setVariable("LIKE", $r->render([$popover, $button]));
Expand Down Expand Up @@ -190,10 +190,6 @@ protected function renderEmoCounters(
$tpl->setVariable("ID", $this->dom_id);
}

if (count($comps) > 0 && $modal_signal !== null) {
$tpl->setVariable("SEP", $r->render($f->divider()->vertical()));
}

return $tpl->get();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<span id="{ID}_ec" style="text-align:left;">{MODAL_TRIGGER}{SEP}</span>
<span id="{ID}_ec">{MODAL_TRIGGER}</span>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- BEGIN badge --><div class="ilTimelineBadge"><p class="ilTimelineDay">{DAY}</p><p class="ilTimelineMonth">{MONTH}</p></div><!-- END badge -->
<div class="ilTimelinePanel">
{CONTENT}
<div style="position: relative;">
<div class="ilTimelinePanelFooter">
{FOOTER}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public function render(): string
$obj_id = $this->news_item->getContextObjId();

// edited?
if ($this->news_item->getCreationDate() !== $this->news_item->getUpdateDate()) {
if ($this->news_item->getCreationDate() != $this->news_item->getUpdateDate()) {
$tpl->setCurrentBlock("edited");
$update_date = new ilDateTime($this->news_item->getUpdateDate()->format('c'), IL_CAL_DATETIME);
$tpl->setVariable("TXT_EDITED", $this->lng->txt("cont_news_edited"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div>
<div class="ilNewsTimelineHeader">
<div class="ilNewsTimelineUserImage">
{USER_AVATAR}
<!-- <img class="media-object" src="{USER_IMAGE}" alt="{USER_TITLE}"> -->
Expand Down
7 changes: 1 addition & 6 deletions components/ILIAS/Notes/Comment/class.ilCommentGUI.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,7 @@ public function getCommentsHTML(): string

protected function getNoEntriesText(bool $search): string
{
if (!$search) {
$mess_txt = $this->lng->txt("notes_no_comments");
} else {
$mess_txt = $this->lng->txt("notes_no_comments_found");
}
return $mess_txt;
return $search ? $this->lng->txt("notes_no_comments_found") : "";
}

protected function getItemGroupTitle(int $obj_id = 0): string
Expand Down
47 changes: 24 additions & 23 deletions components/ILIAS/Notes/Note/class.ilNoteGUI.php
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,7 @@ protected function getNotes(): array
}
}

$ascending = $this->manager->getSortAscending();
if ($this->only_latest) {
$order = false;
}
$ascending = !$this->only_latest && $this->manager->getSortAscending();
$author_id = ($this->note_type === Note::PRIVATE)
? $ilUser->getId()
: 0;
Expand Down Expand Up @@ -520,15 +517,19 @@ public function getNoteListHTML(
$mess_txt = "";
if ($this->show_empty_list_message) {
$mess_txt = $this->getNoEntriesText($this->search_text !== "");
$mess = $f->messageBox()->info($mess_txt);
//$html = $this->renderComponents([$panel, $mess]);
$html = $this->renderComponents([$mess]);
$tpl->setVariable("NOTES_LIST", $html);
if ($mess_txt !== "") {
$mess = $f->messageBox()->info($mess_txt);
//$html = $this->renderComponents([$panel, $mess]);
$html = $this->renderComponents([$mess]);
$tpl->setVariable("NOTES_LIST", $html);
}
}
} elseif ($this->search_text !== "") {
$mess_txt = $this->getNoEntriesText(true);
$mess = $f->messageBox()->info($mess_txt);
$tpl->setVariable("NOTES_LIST", $this->renderComponents([$mess]));
if ($mess_txt !== "") {
$mess = $f->messageBox()->info($mess_txt);
$tpl->setVariable("NOTES_LIST", $this->renderComponents([$mess]));
}
}

ilDatePresentation::setUseRelativeDates($reldates);
Expand Down Expand Up @@ -1515,22 +1516,22 @@ public function getWidget(): string
$code .= "$(\"#$id\").click(function(event) { ilNotes.clickTrigger(event)});";
return $code;
});
$comps[] = $f->divider()->vertical();
$tpl->setVariable("GLYPH", $r->render($comps));
$tpl->setVariable("TXT_LATEST", $this->getLatestItemText());
}

$b = $f->button()->shy($this->getAddEditItemText(), "#")->withAdditionalOnLoadCode(function ($id) use ($hash, $query_url) {
$code = "$('#$id').attr('data-note-key','$hash');\n";
$code .= "$('#$id').attr('data-note-ui-type','trigger');\n";
$code .= "$('#$id').attr('data-note-query-url','" . $query_url . "');\n";
$code .= "$(\"#$id\").click(function(event) { ilNotes.clickTrigger(event)});";
return $code;
});
if ($ctrl->isAsynch()) {
$tpl->setVariable("SHY_BUTTON", $r->renderAsync($b));
} else {
$tpl->setVariable("SHY_BUTTON", $r->render($b));
$b = $f
->button()
->standard($this->getAddEditItemText(), "#")
->withAdditionalOnLoadCode(
fn(string $id) => <<<JS
$('#{$id}').attr('data-note-key','{$hash}');
$('#{$id}').attr('data-note-ui-type','trigger');
$('#{$id}').attr('data-note-query-url','{$query_url}');
$('#{$id}').click((event) => ilNotes.clickTrigger(event));
JS
);

$tpl->setVariable("SHY_BUTTON", $ctrl->isAsynch() ? $r->renderAsync($b) : $r->render($b));
}

$this->widget_header = $tpl->get();
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_ar.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#My Comments
notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_bg.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_cs.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#Mé komentáře
notes#:#notes_no_comments#:#Zatím nebyl přidán žádný komentář.
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_da.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#Mine kommentarer
notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
5 changes: 2 additions & 3 deletions lang/ilias_de.lang
Original file line number Diff line number Diff line change
Expand Up @@ -11052,7 +11052,7 @@ lhist#:#lhist_period#:#Period
lhist#:#lhist_selected#:#Selected
lhist#:#lhist_show_more#:#Mehr anzeigen
lhist#:#lhist_type_of_achievement#:#Typ des Lernerfolgs
like#:#like#:#Like
like#:#like#:#Reagieren
like#:#reaction#:#Reaktion
link#:#link_chapters#:#Kapitel
link#:#link_link#:#Link
Expand Down Expand Up @@ -13110,7 +13110,7 @@ notes#:#note_update_note#:#Notiz bearbeiten
notes#:#note_without_object#:#Ohne Objektbezug
notes#:#notes_activate_comments#:#Öffentliches Kommentieren aktivieren
notes#:#notes_add_comment#:#Kommentar hinzufügen
notes#:#notes_add_edit_comment#:#Kommentar hinzufügen/editieren
notes#:#notes_add_edit_comment#:#Kommentieren
notes#:#notes_add_edit_message#:#Mitteilung hinzufügen/editieren
notes#:#notes_add_edit_note#:#Notiz hinzufügen/editieren
notes#:#notes_all_comments#:#Alle Kommentare
Expand All @@ -13131,7 +13131,6 @@ notes#:#notes_message_author_you#:#Sie
notes#:#notes_message_deleted#:#Die Mitteilung wurde gelöscht.
notes#:#notes_messages#:#Mitteilungen
notes#:#notes_my_comments#:#Meine Kommentare
notes#:#notes_no_comments#:#Bisher wurde noch kein Kommentar abgegeben.
notes#:#notes_no_comments_found#:#Es wurden keine Kommentare gefunden, die den Suchkriterien entsprechen.
notes#:#notes_no_messages#:#Bisher wurde noch keine Mitteilung hinzugefügt.
notes#:#notes_no_messages_found#:#Es wurden keine Mitteilungen gefunden, die den Suchkriterien entsprechen.
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_el.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13026,7 +13026,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#My Comments
notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
5 changes: 2 additions & 3 deletions lang/ilias_en.lang
Original file line number Diff line number Diff line change
Expand Up @@ -11026,7 +11026,7 @@ lhist#:#lhist_period#:#Period
lhist#:#lhist_selected#:#Selected
lhist#:#lhist_show_more#:#Show More
lhist#:#lhist_type_of_achievement#:#Type of Achievement
like#:#like#:#Like
like#:#like#:#React
like#:#reaction#:#Reaction
link#:#link_chapters#:#Chapters
link#:#link_link#:#Link
Expand Down Expand Up @@ -13084,7 +13084,7 @@ notes#:#note_update_note#:#Update Note
notes#:#note_without_object#:#Without Reference
notes#:#notes_activate_comments#:#Activate Public Comments
notes#:#notes_add_comment#:#Add Comment
notes#:#notes_add_edit_comment#:#Add/Edit Comment
notes#:#notes_add_edit_comment#:#Comment
notes#:#notes_add_edit_message#:#Add/Edit Message
notes#:#notes_add_edit_note#:#Add/Edit Note
notes#:#notes_all_comments#:#All Comments
Expand All @@ -13105,7 +13105,6 @@ notes#:#notes_message_author_you#:#You
notes#:#notes_message_deleted#:#Message deleted.
notes#:#notes_messages#:#Messages
notes#:#notes_my_comments#:#My Comments
notes#:#notes_no_comments#:#No comments have been posted yet.
notes#:#notes_no_comments_found#:#No comments found that match your search criteria.
notes#:#notes_no_messages#:#No messages have been left yet.
notes#:#notes_no_messages_found#:#No messages found that match your search criteria.
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_es.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13086,7 +13086,6 @@ notes#:#notes_message_author_counterpart#:#Remitente
notes#:#notes_message_author_you#:#Usted
notes#:#notes_messages#:#Mensajes
notes#:#notes_my_comments#:#Mis comentarios
notes#:#notes_no_comments#:#Aún no se ha publicado ningún comentario.
notes#:#notes_no_comments_found#:#No se han encontrado comentarios que coincidan con sus criterios de búsqueda.
notes#:#notes_no_messages#:#Aún no se ha adjuntado ningún mensaje.
notes#:#notes_no_messages_found#:#No se han encontrado mensajes que coincidan con sus criterios de búsqueda.
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_et.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#Minu kommentaarid
notes#:#notes_no_comments#:#No comment has been posted yet.
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_fa.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#نظرهای من
notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_fr.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13010,7 +13010,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###31 10 2023 new variable
notes#:#notes_message_author_you#:#You###31 10 2023 new variable
notes#:#notes_messages#:#Messages###31 10 2023 new variable
notes#:#notes_my_comments#:#Mes Commentaires
notes#:#notes_no_comments#:#Aucun commentaire actuellement.
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###31 10 2023 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###31 10 2023 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###31 10 2023 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_hr.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#My Comments
notes#:#notes_no_comments#:#No comment has been posted yet.
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_hu.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#Az én megjegyzéseim
notes#:#notes_no_comments#:#Még egy megjegyzés sem érkezett.
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_it.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13028,7 +13028,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###30 04 2024 new variable
notes#:#notes_message_author_you#:#You###30 04 2024 new variable
notes#:#notes_messages#:#Messages###30 04 2024 new variable
notes#:#notes_my_comments#:#I miei commenti
notes#:#notes_no_comments#:#Nessun commento è stato ancora pubblicato.
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###31 03 2023 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###30 04 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###30 04 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_ja.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13099,7 +13099,6 @@ notes#:#notes_message_author_you#:#あなた
notes#:#notes_message_deleted#:#Message deleted.###21 04 2026 new variable
notes#:#notes_messages#:#メッセージ
notes#:#notes_my_comments#:#マイコメント
notes#:#notes_no_comments#:#コメントが投稿された形跡はまだありません。
notes#:#notes_no_comments_found#:#検索条件で一致するコメントは見つかりませんでした。
notes#:#notes_no_messages#:#メッセージはまだ添付されたいません。
notes#:#notes_no_messages_found#:#検索基準に適合するメッセージは見つかりませんでした。
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_ka.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#ჩემი კომენტარები
notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_lt.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#My Comments###02 06 2008 new variable
notes#:#notes_no_comments#:#No comment has been posted yet.###30 12 2013 new variable
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_nl.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#Mijn commentaar
notes#:#notes_no_comments#:#Er is nog geen commentaar geplaatst.
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
1 change: 0 additions & 1 deletion lang/ilias_pl.lang
Original file line number Diff line number Diff line change
Expand Up @@ -13025,7 +13025,6 @@ notes#:#notes_message_author_counterpart#:#Respondent###26 08 2024 new variable
notes#:#notes_message_author_you#:#You###26 08 2024 new variable
notes#:#notes_messages#:#Messages###26 08 2024 new variable
notes#:#notes_my_comments#:#Moje komentarze
notes#:#notes_no_comments#:#Do tej pory nie dodano żadnego komentarza.
notes#:#notes_no_comments_found#:#No comments found that match your seach criteria.###29 07 2022 new variable
notes#:#notes_no_messages#:#No messages have been attached yet.###26 08 2024 new variable
notes#:#notes_no_messages_found#:#No messages found that match your seach criteria.###26 08 2024 new variable
Expand Down
Loading
Loading