Skip to content

tabbed profile view and global hyphenation support #1789

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

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

tabbed profile view and global hyphenation support #1789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
eda4782
fix js for create contact popup
MightyMCoder Apr 23, 2025
8d47351
Revert "fix js for create contact popup"
MightyMCoder Apr 23, 2025
d5be8eb
implement tabs for the profile view
MightyMCoder Apr 23, 2025
3acd92d
add css for new profile tabs view
MightyMCoder Apr 23, 2025
5ab5b59
add basic translation for new string SYS_CURRENT_ROLE_MEMBERSHIP
MightyMCoder Apr 23, 2025
6d1bc75
- refactor profile view to support tabbed and accordion layouts
MightyMCoder Apr 23, 2025
9b7bda4
improve profile layout style
MightyMCoder Apr 23, 2025
5851d83
feature: implement language support for hyphenation in all smarty tem…
MightyMCoder Apr 23, 2025
61215d5
Merge remote-tracking branch 'origin/master' into tabbed-profile-view
MightyMCoder Apr 25, 2025
336973f
fix: remove filename from selectedUser input field
MightyMCoder Apr 27, 2025
9c5f838
rename template file
MightyMCoder Apr 27, 2025
1758a0f
Merge branch 'master' into tabbed-profile-view
MightyMCoder Apr 27, 2025
09d1b6e
add SYS_PROFILE_DATA string in German and English language files
MightyMCoder Apr 27, 2025
4b6892e
improve spacing and layout for tabbed and accordion components
MightyMCoder Apr 27, 2025
f942578
improve profile-view
MightyMCoder Apr 27, 2025
a59ba14
update profile module to use new pane and accordion content IDs for r…
MightyMCoder Apr 27, 2025
4096cfb
reduce number of menubar items and place them inside the tabbed/accor…
MightyMCoder Apr 27, 2025
ed0c2ab
fix: remove file name from strings
MightyMCoder Apr 27, 2025
f70a269
Merge branch 'master' into tabbed-profile-view
MightyMCoder Apr 27, 2025
1dc1fdb
fix: update paths in _preferences to remove 'adm_program/' prefix
MightyMCoder Apr 27, 2025
6eaa2c7
remove unused $showUserRelations
MightyMCoder Apr 27, 2025
17eade5
remove password menubar items and place them in a pseudo password fie…
MightyMCoder Apr 27, 2025
eb24437
Merge branch 'master' into tabbed-profile-view
MightyMCoder Apr 27, 2025
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
2 changes: 1 addition & 1 deletion adm_my_files/ecard_templates/greeting_card.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{$languageIsoCode}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title><%ecard_greeting_card_string%></title>
Expand Down
2 changes: 1 addition & 1 deletion adm_my_files/ecard_templates/postcard.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{$languageIsoCode}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title><%ecard_greeting_card_string%></title>
Expand Down
2 changes: 1 addition & 1 deletion adm_my_files/ecard_templates/postcard_separate_photo.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{$languageIsoCode}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title><%ecard_greeting_card_string%></title>
Expand Down
2 changes: 1 addition & 1 deletion demo_data/adm_my_files/ecard_templates/greeting_card.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{$languageIsoCode}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title><%ecard_greeting_card_string%></title>
Expand Down
2 changes: 1 addition & 1 deletion demo_data/adm_my_files/ecard_templates/postcard.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{$languageIsoCode}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title><%ecard_greeting_card_string%></title>
Expand Down
2 changes: 1 addition & 1 deletion demo_data/adm_my_files/ecard_templates/postcard_separate_photo.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{$languageIsoCode}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title><%ecard_greeting_card_string%></title>
Expand Down
2 changes: 1 addition & 1 deletion install/templates/index.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{$languageIsoCode}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand Down
2 changes: 2 additions & 0 deletions languages/de-DE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,7 @@
<string name="SYS_MEMBERS_BETWEEN_PERIOD">Mitglieder zwischen #VAR1# und #VAR2#</string>
<string name="SYS_MEMBERS_CONFIGURATION_DESC">Eine der hier vorgegebenen Konfigurationen kann für die Anzeige der Mitgliederverwaltung genutzt werden. Es werden anschließend in der Mitgliederverwaltung die Spalten der ausgewählten Listenkonfiguration angezeigt.</string>
<string name="SYS_CONTACTS_DESC">Hier können alle aktiven und ehemaligen Mitglieder angezeigt und organisiert werden. Neue Kontakte können importiert oder erstellt werden.</string>
<string name="SYS_CURRENT_ROLE_MEMBERSHIP">Aktuelle Rollenmitgliedschaften</string>
<string name="SYS_MEMBERS_PER_PAGE">Anzahl Teilnehmende pro Seite</string>
<string name="SYS_MEMBERS_PER_PAGE_DESC">Anzahl der Mitglieder, die in der HTML-Ansicht dargestellt werden. Weitere Mitglieder können durch das Weiterblättern erreicht werden. Die Druckvorschau und der Export sind von diesem Wert nicht betroffen. (Voreinstellung: 25)</string>
<string name="SYS_MEMBERS_SIMILAR_NAME">Es wurden #VAR1# Mitglieder mit einem ähnlichen Namen gefunden.</string>
Expand Down Expand Up @@ -1108,6 +1109,7 @@
<string name="SYS_PROCESS_CANCELED">Der Vorgang wurde abgebrochen.</string>
<string name="SYS_PROCESSING_ERROR_DESC">Bei der Verarbeitung der Daten ist folgendes Problem aufgetreten.</string>
<string name="SYS_PROFILE">Profil</string>
<string name="SYS_PROFILE_DATA">Profildaten</string>
<string name="SYS_PROFILE_FIELD">Profilfeld</string>
<string name="SYS_PROFILE_FROM">Profil von #VAR1# #VAR2#</string>
<string name="SYS_PROFILE_INFORMATION">Profilinformationen</string>
Expand Down
2 changes: 2 additions & 0 deletions languages/de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,7 @@
<string name="SYS_MEMBERS_BETWEEN_PERIOD">Mitglieder zwischen #VAR1# und #VAR2#</string>
<string name="SYS_MEMBERS_CONFIGURATION_DESC">Eine der hier vorgegebenen Konfigurationen kann für die Anzeige der Mitgliederverwaltung genutzt werden. Es werden anschließend in der Mitgliederverwaltung die Spalten der ausgewählten Listenkonfiguration angezeigt.</string>
<string name="SYS_CONTACTS_DESC">Hier können alle aktiven und ehemaligen Mitglieder angezeigt und organisiert werden. Neue Kontakte können importiert oder erstellt werden.</string>
<string name="SYS_CURRENT_ROLE_MEMBERSHIP">Aktuelle Rollenmitgliedschaften</string>
<string name="SYS_MEMBERS_PER_PAGE">Anzahl Teilnehmende pro Seite</string>
<string name="SYS_MEMBERS_PER_PAGE_DESC">Anzahl der Mitglieder, die in der HTML-Ansicht dargestellt werden. Weitere Mitglieder können durch das Weiterblättern erreicht werden. Die Druckvorschau und der Export sind von diesem Wert nicht betroffen. (Voreinstellung: 25)</string>
<string name="SYS_MEMBERS_SIMILAR_NAME">Es wurden #VAR1# Mitglieder mit einem ähnlichen Namen gefunden.</string>
Expand Down Expand Up @@ -1116,6 +1117,7 @@
<string name="SYS_PROCESS_CANCELED">Der Vorgang wurde abgebrochen.</string>
<string name="SYS_PROCESSING_ERROR_DESC">Bei der Verarbeitung der Daten ist folgendes Problem aufgetreten.</string>
<string name="SYS_PROFILE">Profil</string>
<string name="SYS_PROFILE_DATA">Profildaten</string>
<string name="SYS_PROFILE_FIELD">Profilfeld</string>
<string name="SYS_PROFILE_FROM">Profil von #VAR1# #VAR2#</string>
<string name="SYS_PROFILE_INFORMATION">Profilinformationen</string>
Expand Down
2 changes: 2 additions & 0 deletions languages/en.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,7 @@
<string name="SYS_MEMBERS_BETWEEN_PERIOD">Members between #VAR1# and #VAR2#</string>
<string name="SYS_MEMBERS_CONFIGURATION_DESC">One of the configurations specified here can be used to display the members administration. The columns of the selected list configuration are then displayed in the members administration.</string>
<string name="SYS_CONTACTS_DESC">Display and organize all active and former members here. New contacts can be imported or created.</string>
<string name="SYS_CURRENT_ROLE_MEMBERSHIP">Current role memberships</string>
<string name="SYS_MEMBERS_PER_PAGE">Members displayed per page</string>
<string name="SYS_MEMBERS_PER_PAGE_DESC">Number of members listed in the HTML view. More members can be listed by using the pagination function. This value won\'t affect print preview and export functionality (Default: 25).</string>
<string name="SYS_MEMBERS_SIMILAR_NAME">Found #VAR1# members with a similar name.</string>
Expand Down Expand Up @@ -1073,6 +1074,7 @@
<string name="SYS_PROCESS_CANCELED">Process canceled.</string>
<string name="SYS_PROCESSING_ERROR_DESC">The following problem has occurred when processing the data.</string>
<string name="SYS_PROFILE">Profile</string>
<string name="SYS_PROFILE_DATA">Profile data</string>
<string name="SYS_PROFILE_FIELD">Profile field</string>
<string name="SYS_PROFILE_FROM">Profile of #VAR1# #VAR2#</string>
<string name="SYS_PROFILE_INFORMATION">Profile information</string>
Expand Down
24 changes: 18 additions & 6 deletions modules/profile/profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ function ProfileJS(gRootPath) {
url: this.url + "?mode=reload_current_memberships&user_uuid=" + this.userUuid,
dataType: "html",
success: function(responseText) {
$("#adm_profile_roles_box .card-body").html(responseText);
formSubmitEvent('#adm_profile_roles_box .card-body');
/* Tabs */
$("#adm_profile_role_memberships_current_pane_content .card-body").html(responseText);
formSubmitEvent('#adm_profile_role_memberships_current_pane_content .card-body');
/* Accordions */
$("#adm_profile_role_memberships_current_accordion_content .card-body").html(responseText);
formSubmitEvent('#adm_profile_role_memberships_current_accordion_content .card-body');
}
});
};
Expand All @@ -31,8 +35,12 @@ function ProfileJS(gRootPath) {
url: this.url + "?mode=reload_former_memberships&user_uuid=" + this.userUuid,
dataType: "html",
success: function(responseText) {
$("#adm_profile_former_roles_box .card-body").html(responseText);
formSubmitEvent('#adm_profile_former_roles_box .card-body');
/* Tabs */
$("#adm_profile_role_memberships_former_pane_content .card-body").html(responseText);
formSubmitEvent('#adm_profile_role_memberships_former_pane_content .card-body');
/* Accordions */
$("#adm_profile_role_memberships_former_accordion_content .card-body").html(responseText);
formSubmitEvent('#adm_profile_role_memberships_former_accordion_content .card-body');
}
}
);
Expand All @@ -43,8 +51,12 @@ function ProfileJS(gRootPath) {
url: this.url + "?mode=reload_future_memberships&user_uuid=" + this.userUuid,
dataType: "html",
success: function(responseText) {
$("#adm_profile_future_roles_box .card-body").html(responseText);
formSubmitEvent('#adm_profile_future_roles_box .card-body');
/* Tabs */
$("#adm_profile_role_memberships_future_pane_content .card-body").html(responseText);
formSubmitEvent('#adm_profile_role_memberships_future_pane_content .card-body');
/* Accordions */
$("#adm_profile_role_memberships_future_accordion_content .card-body").html(responseText);
formSubmitEvent('#adm_profile_role_memberships_future_accordion_content .card-body');
}
}
);
Expand Down
Loading