You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(246) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(243) |
Feb
(145) |
Mar
(512) |
Apr
(423) |
May
(572) |
Jun
(344) |
Jul
(1439) |
Aug
(1086) |
Sep
(452) |
Oct
(1093) |
Nov
(1000) |
Dec
(1070) |
2004 |
Jan
(1462) |
Feb
(753) |
Mar
(1752) |
Apr
(714) |
May
(617) |
Jun
(1326) |
Jul
(829) |
Aug
(726) |
Sep
(723) |
Oct
(777) |
Nov
(295) |
Dec
(203) |
2005 |
Jan
(694) |
Feb
(664) |
Mar
(606) |
Apr
(798) |
May
(429) |
Jun
(236) |
Jul
(197) |
Aug
(340) |
Sep
(432) |
Oct
(443) |
Nov
(334) |
Dec
(434) |
2006 |
Jan
(452) |
Feb
(283) |
Mar
(163) |
Apr
(341) |
May
(202) |
Jun
(147) |
Jul
(291) |
Aug
(363) |
Sep
(342) |
Oct
(309) |
Nov
(600) |
Dec
(722) |
2007 |
Jan
(363) |
Feb
(699) |
Mar
(1009) |
Apr
(186) |
May
(368) |
Jun
(551) |
Jul
(1146) |
Aug
(1152) |
Sep
(500) |
Oct
(714) |
Nov
(780) |
Dec
(725) |
2008 |
Jan
(640) |
Feb
(670) |
Mar
(679) |
Apr
(496) |
May
(351) |
Jun
(331) |
Jul
(621) |
Aug
(627) |
Sep
(361) |
Oct
(579) |
Nov
(423) |
Dec
(342) |
2009 |
Jan
(384) |
Feb
(603) |
Mar
(815) |
Apr
(663) |
May
(1194) |
Jun
(1055) |
Jul
(699) |
Aug
(907) |
Sep
(1104) |
Oct
(1142) |
Nov
(942) |
Dec
(631) |
2010 |
Jan
(935) |
Feb
(1420) |
Mar
(766) |
Apr
(517) |
May
(715) |
Jun
(512) |
Jul
(499) |
Aug
(725) |
Sep
(1272) |
Oct
(855) |
Nov
(657) |
Dec
(959) |
2011 |
Jan
(1048) |
Feb
(1135) |
Mar
(703) |
Apr
(548) |
May
(659) |
Jun
(543) |
Jul
(980) |
Aug
(1197) |
Sep
(1358) |
Oct
(890) |
Nov
(522) |
Dec
(318) |
2012 |
Jan
(400) |
Feb
(402) |
Mar
(846) |
Apr
(748) |
May
(565) |
Jun
(583) |
Jul
(383) |
Aug
(331) |
Sep
(451) |
Oct
(615) |
Nov
(483) |
Dec
(325) |
2013 |
Jan
(353) |
Feb
(335) |
Mar
(402) |
Apr
(498) |
May
(355) |
Jun
(444) |
Jul
(445) |
Aug
(408) |
Sep
(542) |
Oct
(525) |
Nov
(641) |
Dec
(480) |
2014 |
Jan
(431) |
Feb
(512) |
Mar
(485) |
Apr
(527) |
May
(541) |
Jun
(237) |
Jul
(455) |
Aug
(244) |
Sep
(268) |
Oct
(303) |
Nov
(265) |
Dec
(174) |
2015 |
Jan
(349) |
Feb
(490) |
Mar
(766) |
Apr
(464) |
May
(339) |
Jun
(196) |
Jul
(177) |
Aug
(172) |
Sep
(290) |
Oct
(258) |
Nov
(259) |
Dec
(275) |
2016 |
Jan
(281) |
Feb
(385) |
Mar
(478) |
Apr
(383) |
May
(264) |
Jun
(299) |
Jul
(343) |
Aug
(288) |
Sep
(331) |
Oct
(288) |
Nov
(465) |
Dec
(301) |
2017 |
Jan
(534) |
Feb
(136) |
Mar
(1034) |
Apr
(592) |
May
(630) |
Jun
(405) |
Jul
(419) |
Aug
(447) |
Sep
(436) |
Oct
(527) |
Nov
(508) |
Dec
(391) |
2018 |
Jan
(443) |
Feb
(203) |
Mar
(289) |
Apr
(437) |
May
(397) |
Jun
(321) |
Jul
(339) |
Aug
(294) |
Sep
(505) |
Oct
(549) |
Nov
(345) |
Dec
(227) |
2019 |
Jan
(351) |
Feb
(499) |
Mar
(306) |
Apr
(343) |
May
(300) |
Jun
(210) |
Jul
(274) |
Aug
(302) |
Sep
(349) |
Oct
(282) |
Nov
(2652) |
Dec
(1512) |
2020 |
Jan
(313) |
Feb
(463) |
Mar
(595) |
Apr
(429) |
May
(338) |
Jun
(308) |
Jul
(362) |
Aug
(204) |
Sep
(199) |
Oct
(462) |
Nov
(191) |
Dec
(165) |
2021 |
Jan
(364) |
Feb
(327) |
Mar
(247) |
Apr
(155) |
May
(206) |
Jun
(221) |
Jul
(338) |
Aug
(216) |
Sep
(259) |
Oct
(337) |
Nov
(300) |
Dec
(180) |
2022 |
Jan
(396) |
Feb
(338) |
Mar
(249) |
Apr
(249) |
May
(170) |
Jun
(137) |
Jul
(226) |
Aug
(350) |
Sep
(306) |
Oct
(340) |
Nov
(531) |
Dec
(307) |
2023 |
Jan
(287) |
Feb
(217) |
Mar
(606) |
Apr
(364) |
May
(636) |
Jun
(1012) |
Jul
(1137) |
Aug
(426) |
Sep
(357) |
Oct
(698) |
Nov
(513) |
Dec
(392) |
2024 |
Jan
(419) |
Feb
(470) |
Mar
(434) |
Apr
(370) |
May
(514) |
Jun
(690) |
Jul
(409) |
Aug
(484) |
Sep
(401) |
Oct
|
Nov
|
Dec
|
From: johnsantosDev@users.sourceforge.net - 2024-09-24 22:40:03
|
Revision: 86652 http://sourceforge.net/p/tikiwiki/code/86652 Author: "johnsantosDev" Date: 2024-09-24 22:40:00 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [TRA] French translations project MR5 --- * fixing merge conflicts * [TRA] French translations project MR5 See merge request tikiwiki/tiki!5881 Modified Paths: -------------- trunk/lang/fr/language.php trunk/lib/core/Services/Tracker/TabularController.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-24 22:29:49 UTC (rev 86651) +++ trunk 2024-09-24 22:40:00 UTC (rev 86652) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:a6ca51d702c471eb485b4dcfdc1563a38209bc12 ## -1 +0,0 ## -2024-09-24T22:30:14.173 \ No newline at end of property Added: subgit:lock:b038143a3fbcac7ab21df3a68f9fe9ca4f2d1383 ## -0,0 +1 ## +2024-09-24T22:39:58.946 \ No newline at end of property Modified: trunk/lang/fr/language.php =================================================================== --- trunk/lang/fr/language.php 2024-09-24 22:29:49 UTC (rev 86651) +++ trunk/lang/fr/language.php 2024-09-24 22:40:00 UTC (rev 86652) @@ -1531,6 +1531,7 @@ "Item ID" => "Identificateur de fiche", "Filename" => "Nom du fichier", "Creation date" => "Date de création", +"Modified Date" => "Date de modification", "Views" => "Vues", "File size" => "Taille du fichier", "Version" => "Version", @@ -1548,16 +1549,16 @@ "Tracker does not exist" => "Le formulaire n'existe pas", "Tracker is not synchronized with a remote source" => "Le formulaire n'est pas synchronisé avec la source distante", // "Import-Export Formats" => "Import-Export Formats", -// "Remove Format" => "Remove Format", -// "Create Import-Export Format" => "Create Import-Export Format", -// "Edit Format: %0" => "Edit Format: %0", -// "Format %0 not found" => "Format %0 not found", -// "Duplicate Format: %0" => "Duplicate Format: %0", +"Remove Format" => "Supprimer le format", +"Create Import-Export Format" => "Créer un format d'import-export", +"Edit Format: %0" => "Modifier le format : %0", +"Format %0 not found" => "Format %0 introuvable", +"Duplicate Format: %0" => "Dupliquer le format : %0", "%0 copy" => "%0 copie", -// "Fields in %0" => "Fields in %0", -// "Your export was completed successfully" => "Your export was completed successfully", -// "No formats available" => "No formats available", -// "Select Format" => "Select Format", +"Fields in %0" => "Champs dans %0", +"Your export was completed successfully" => "Votre exportation a été effectuée avec succès", +"No formats available" => "Aucun format disponible", +"Select Format" => "Sélectionner le format", // "Primary Key required" => "Primary Key required", "Your import was completed successfully" => "L'importation s'est terminée avec succès ", "Import" => "Importer", @@ -2788,7 +2789,6 @@ // "Full-text search across all of the content" => "Full-text search across all of the content", // "Modification Date" => "Modification Date", "Unknown value" => "Valeur inconnue", -// "Modified Date" => "Modified Date", "Actions" => "Actions", // "Dynamic Filters" => "Dynamic Filters", // "From %0 to %1" => "From %0 to %1", @@ -14708,9 +14708,9 @@ // "</em>\" _2=\$info.objid}Object permissions for the %0 %1 (ID %2)" => "</em>\" _2=\$info.objid}Object permissions for the %0 %1 (ID %2)", // "</em>\"}Object permissions for the %0 %1" => "</em>\"}Object permissions for the %0 %1", // "" => "", -// "No permissions were changed" => "No permissions were changed", +"No permissions were changed" => "Aucune permission n'a été modifiée", "The following change has been applied" => "Les modifications suivantes ont été appliquées", -// "The following changes have been applied" => "The following changes have been applied", +"The following changes have been applied" => "Les modifications suivantes ont été apportées", // "{\$item.mes[0]|stringfix}" => "{\$item.mes[0]|stringfix}", "Preference name" => "Nom de la préférence", "Upload" => "Envoyer", @@ -15864,38 +15864,38 @@ // "Export-Only" => "Export-Only", // "EO" => "EO", // "Required to import data. Can be any field as long as it is unique" => "Required to import data. Can be any field as long as it is unique", -// "Impose unique value requirement for the target column. This only works with Transactional Import feature" => "Impose unique value requirement for the target column. This only works with Transactional Import feature", -// "When importing a file, read-only fields will be skipped, preventing them from being modified, but also speeding-up the process" => "When importing a file, read-only fields will be skipped, preventing them from being modified, but also speeding-up the process", -// "When two fields affecting the same value are included in the format, such as the ID and the text value for an Item Link field, one of the two fields must be marked as read-only to prevent a conflict" => "When two fields affecting the same value are included in the format, such as the ID and the text value for an Item Link field, one of the two fields must be marked as read-only to prevent a conflict", +"Impose unique value requirement for the target column. This only works with Transactional Import feature." => "Imposer une valeur unique pour la colonne cible. Cela ne fonctionne qu'avec la fonctionnalité d'importation transactionnelle.", +"When importing a file, read-only fields will be skipped, preventing them from being modified, but also speeding-up the process." => "Lors de l'importation d'un fichier, les champs en lecture seule seront ignorés, empêchant ainsi leur modification, tout en accélérant le processus.", +"When two fields affecting the same value are included in the format, such as the ID and the text value for an Item Link field, one of the two fields must be marked as read-only to prevent a conflict." => "Lorsque deux champs affectant la même valeur sont inclus dans le format, comme l'ID et la valeur texte d'un champ de Lien d'élément, l'un des deux champs doit être marqué comme étant en lecture seule pour éviter un conflit.", "Simple headers" => "En-têtes simples", -// "Allow using field labels only as a header row when importing rather than the full "Field [permName:type]" format" => "Allow using field labels only as a header row when importing rather than the full "Field [permName:type]" format", +"Allow using field labels only as a header row when importing rather than the full "Field [permName:type]" format" => "Permet d'utiliser les étiquettes de champ uniquement comme ligne d'en-tête lors de l'importation plutôt que le format complet "Field [permName:type]"", "Import updates" => "Importer des mises à jour", -// "Import update" => "Import update", +"Import update" => "Importer des mises à jour", "Allow updating existing entries matched by PK when importing. If this is disabled, only new items will be imported" => "Permettre la mise à jour des entrées existantes correspondantes à la clé primaire (PK) lors de l'importation. Si cette option est désactivée, seuls les nouveaux éléments seront importés", "Ignore blanks" => "Ignorer les valeurs vides", "Ignore blank values when import is updating existing items. Only non-blank values will be updated this way" => "Ignorer les valeurs vides lorsque l'importation met à jour des éléments existants. Seules les valeurs non vides seront mises à jour de cette manière", "Transactional import" => "Importation transactionnelle", -// "Import transaction" => "Import transaction", -// "Import in a single transaction. If any of the items fails validation, the whole import is rejected and nothing is saved" => "Importation en une seule transaction. Si l'un des éléments n'est pas validé, l'importation entière est rejetée et rien n'est sauvegardé", +"Import transaction" => "Importer une transaction", +"Import in a single transaction. If any of the items fails validation, the whole import is rejected and nothing is saved" => "Importation en une seule transaction. Si l'un des éléments n'est pas validé, l'importation entière est rejetée et rien n'est sauvegardé", "Bulk import" => "Importation en masse", "Bulk Import" => "Importation en masse", "Import in 'bulk' mode so the search index is not updated for each item and no notifications should be sent" => "Importer en mode « bulk » afin que l'index de recherche ne soit pas mis à jour pour chaque élément et qu'aucune notification ne soit envoyée", "Are you sure you want to delete this item" => "Êtes-vous certain de vouloir supprimer cet élement", "Delete item" => "Supprimer", -// "Remote Field" => "Remote Field", +"Remote Field" => "Champ d'action à distance", // "RF" => "RF", -// "Select a field.." => "Select a field..", -// "Select Mode" => "Select Mode", +"Select a field.." => "Selectionner un champ..", +"Select Mode" => "Mode de sélection", "No primary key" => "Aucune clé primaire", -// "Side" => "Side", -// "Filters will be available in partial export menus" => "Filters will be available in partial export menus", -// "Skip Unmodified" => "Skip Unmodified", -// "CSV Encoding" => "CSV Encoding", -// "Excel will often expect 'Windows-1252' encoding" => "Excel will often expect 'Windows-1252' encoding", +"Side" => "Côté", +"Filters will be available in partial export menus" => "Les filtres seront disponibles dans les menus d'exportation partielle", +"Skip Unmodified" => "Ignorer les non modifiés", +"CSV Encoding" => "Encodage CSV", +"Excel will often expect 'Windows-1252' encoding" => "Excel s'attend souvent à un encodage « Windows-1252 »", // "Default (UTF-8)" => "Default (UTF-8)", -// "Import Completed" => "Import Completed", -// "Your import was completed successfully" => "Your import was completed successfully", -// "Import from remote ODBC source" => "Import from remote ODBC source", +"Import Completed" => "Importation terminée", +"Your import was completed successfully" => "Votre importation a été effectuée avec succès", +"Import from remote ODBC source" => "Importation à partir d'une source ODBC distante", "Export Partial" => "Exportation partielle", "Export Custom" => "Exportation personnalisée", // "Applied filters" => "Applied filters", @@ -18306,7 +18306,7 @@ // "Deletes expired submissions 1000 at a time to avoid timeouts" => "Deletes expired submissions 1000 at a time to avoid timeouts", "Survey stats" => "Statistiques sur les enquêtes", // "Take survey" => "Take survey", -"Import Structure" => "Structure de l'importation", +"Import Structure" => "Importer la Structure", "Import From Profile/YAML" => "Importer à partir d'un profil/YAML", "Manage Import-Export Formats" => "Gérer les formats d'import-export", // "Clone remote" => "Clone remote", @@ -18463,7 +18463,7 @@ "Show permissions for disabled features" => "Afficher les permissions pour les fonctionnalités désactivées", "Assign permissions to this category" => "Assigner des droits à cette catégorie", "Assign permissions to this object" => "Attribuer de nouveaux droits d'accès à cet objet", -// "Modify permissions" => "Modify permissions", +"Modify permissions" => "Modifier les permissions", "Delete category permissions" => "Supprimer les permissions spécifiques à cette catégorie", "This will remove all the settings here and permissions will be reset to inherit the global sitewide permissions" => "Ceci va supprimer tous ces réglages et les droits d'accès vont être réinitialisés pour hériter des droits définis au niveau global su site", "Delete object permissions" => "Supprimer les permissions spécifiques à cet objet", @@ -19529,7 +19529,7 @@ "atts" => "joints", "List Attachments" => "Liste des fichiers joints", // "View/Edit" => "View/Edit", -// "Select the action to be performed with checked" => "Select the action to be performed with checked", +"Select the action to be performed with checked" => "Sélectionner l'action à effectuer sur les éléments cochés", "Insert New Item" => "Insérer une nouvelle fiche", "View inserted item" => "Voir la fiche insérée", "Insert new item" => "Ajouter une nouvelle fiche", @@ -22122,9 +22122,21 @@ "trackerId parameter must be present" => "le paramètre trackerId doit être présent", "Enable special behaviours" => "Activer des comportements spéciaux", "Show in ER diagram" => "Afficher dans le diagramme ER", +"Show in ER Diagram" => "Afficher dans le Diagramme ER", "Use label as placeholder" => "Utiliser le label comme espace réservé", "Display the field name as a placeholder in the input field instead of separate label" => "Afficher le nom du champ comme un espace réservé dans le champ de saisie au lieu d'un label séparé", "Cardinality" => "Cardinalité", "Data and changes to this field are not included in email notifications." => "Les données et les modifications de ce champ ne sont pas incluses dans les notifications par email.", +"ER Diagram Display" => "Affichage du diagramme ER", +"ER Diagram" => "Diagram ER", +"External API source?" => "Source d'API externe ?", +"Configure authentication through Admin Data Sources (DSN)." => "Configurer l'authentification via les sources de données d'administration (DSN).", +"When connecting to an external ODBC schema, this should reference the remote schema field." => "Lors de la connexion à un schéma ODBC externe, ce champ doit faire référence au champ du schéma distant.", +"Can be any field as long as it is unique. If none is specified full record matching will be executed upon import to prevent duplicates which can be slow." => "Il peut s'agir de n'importe quel champ, tant qu'il est unique. Si aucun champ n'est spécifié, une correspondance complète des enregistrements sera exécutée lors de l'importation afin d'éviter les doublons, ce qui peut s'avérer lent.", +"Allow updating existing entries matched by either PK or full record when importing. If this is disabled, only new items will be imported." => "Permettre la mise à jour des entrées existantes correspondant soit à la clé primaire, soit à l'enregistrement complet lors de l'importation. Si cette option est désactivée, seuls les nouveaux éléments seront importés.", +"CSV/JSON Encoding" => "Encodage CSV/JSON", +"Data Format" => "Format des données", +"Data type generated/expected from export/import functions." => "Type de données généré/attendu par les fonctions d'exportation/importation.", +"Import-Export Tracker was updated successfully." => "Le formulaire d'import-export a été mis à jour avec succès." ); $lang = array_replace($lang, $lang_current); Modified: trunk/lib/core/Services/Tracker/TabularController.php =================================================================== --- trunk/lib/core/Services/Tracker/TabularController.php 2024-09-24 22:29:49 UTC (rev 86651) +++ trunk/lib/core/Services/Tracker/TabularController.php 2024-09-24 22:40:00 UTC (rev 86652) @@ -105,7 +105,7 @@ $result = $lib->update($info['tabularId'], $input->name->text(), $schema->getFormatDescriptor(), $schema->getFilterDescriptor(), $config, $odbc_config, $api_config); if ($result->numRows() > 0) { - Feedback::success('Import-Export Tracker was updated successfully.'); + Feedback::success(tr('Import-Export Tracker was updated successfully.')); } return [ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: John S. (@john.ndiwayesu) <gi...@mg...> - 2024-09-24 22:39:57
|
John Santos pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: b038143a by John Santos at 2024-09-24T22:39:34+00:00 [TRA] French translations project MR5 --- * fixing merge conflicts * [TRA] French translations project MR5 See merge request tikiwiki/tiki!5881 - - - - - 2 changed files: - lang/fr/language.php - lib/core/Services/Tracker/TabularController.php Changes: ===================================== lang/fr/language.php ===================================== @@ -1531,6 +1531,7 @@ $lang_current = array( "Item ID" => "Identificateur de fiche", "Filename" => "Nom du fichier", "Creation date" => "Date de création", +"Modified Date" => "Date de modification", "Views" => "Vues", "File size" => "Taille du fichier", "Version" => "Version", @@ -1548,16 +1549,16 @@ $lang_current = array( "Tracker does not exist" => "Le formulaire n'existe pas", "Tracker is not synchronized with a remote source" => "Le formulaire n'est pas synchronisé avec la source distante", // "Import-Export Formats" => "Import-Export Formats", -// "Remove Format" => "Remove Format", -// "Create Import-Export Format" => "Create Import-Export Format", -// "Edit Format: %0" => "Edit Format: %0", -// "Format %0 not found" => "Format %0 not found", -// "Duplicate Format: %0" => "Duplicate Format: %0", +"Remove Format" => "Supprimer le format", +"Create Import-Export Format" => "Créer un format d'import-export", +"Edit Format: %0" => "Modifier le format : %0", +"Format %0 not found" => "Format %0 introuvable", +"Duplicate Format: %0" => "Dupliquer le format : %0", "%0 copy" => "%0 copie", -// "Fields in %0" => "Fields in %0", -// "Your export was completed successfully" => "Your export was completed successfully", -// "No formats available" => "No formats available", -// "Select Format" => "Select Format", +"Fields in %0" => "Champs dans %0", +"Your export was completed successfully" => "Votre exportation a été effectuée avec succès", +"No formats available" => "Aucun format disponible", +"Select Format" => "Sélectionner le format", // "Primary Key required" => "Primary Key required", "Your import was completed successfully" => "L'importation s'est terminée avec succès ", "Import" => "Importer", @@ -2788,7 +2789,6 @@ $lang_current = array( // "Full-text search across all of the content" => "Full-text search across all of the content", // "Modification Date" => "Modification Date", "Unknown value" => "Valeur inconnue", -// "Modified Date" => "Modified Date", "Actions" => "Actions", // "Dynamic Filters" => "Dynamic Filters", // "From %0 to %1" => "From %0 to %1", @@ -14708,9 +14708,9 @@ $lang_current = array( // "</em>\" _2=\$info.objid}Object permissions for the %0 %1 (ID %2)" => "</em>\" _2=\$info.objid}Object permissions for the %0 %1 (ID %2)", // "</em>\"}Object permissions for the %0 %1" => "</em>\"}Object permissions for the %0 %1", // "" => "", -// "No permissions were changed" => "No permissions were changed", +"No permissions were changed" => "Aucune permission n'a été modifiée", "The following change has been applied" => "Les modifications suivantes ont été appliquées", -// "The following changes have been applied" => "The following changes have been applied", +"The following changes have been applied" => "Les modifications suivantes ont été apportées", // "{\$item.mes[0]|stringfix}" => "{\$item.mes[0]|stringfix}", "Preference name" => "Nom de la préférence", "Upload" => "Envoyer", @@ -15864,38 +15864,38 @@ $lang_current = array( // "Export-Only" => "Export-Only", // "EO" => "EO", // "Required to import data. Can be any field as long as it is unique" => "Required to import data. Can be any field as long as it is unique", -// "Impose unique value requirement for the target column. This only works with Transactional Import feature" => "Impose unique value requirement for the target column. This only works with Transactional Import feature", -// "When importing a file, read-only fields will be skipped, preventing them from being modified, but also speeding-up the process" => "When importing a file, read-only fields will be skipped, preventing them from being modified, but also speeding-up the process", -// "When two fields affecting the same value are included in the format, such as the ID and the text value for an Item Link field, one of the two fields must be marked as read-only to prevent a conflict" => "When two fields affecting the same value are included in the format, such as the ID and the text value for an Item Link field, one of the two fields must be marked as read-only to prevent a conflict", +"Impose unique value requirement for the target column. This only works with Transactional Import feature." => "Imposer une valeur unique pour la colonne cible. Cela ne fonctionne qu'avec la fonctionnalité d'importation transactionnelle.", +"When importing a file, read-only fields will be skipped, preventing them from being modified, but also speeding-up the process." => "Lors de l'importation d'un fichier, les champs en lecture seule seront ignorés, empêchant ainsi leur modification, tout en accélérant le processus.", +"When two fields affecting the same value are included in the format, such as the ID and the text value for an Item Link field, one of the two fields must be marked as read-only to prevent a conflict." => "Lorsque deux champs affectant la même valeur sont inclus dans le format, comme l'ID et la valeur texte d'un champ de Lien d'élément, l'un des deux champs doit être marqué comme étant en lecture seule pour éviter un conflit.", "Simple headers" => "En-têtes simples", -// "Allow using field labels only as a header row when importing rather than the full "Field [permName:type]" format" => "Allow using field labels only as a header row when importing rather than the full "Field [permName:type]" format", +"Allow using field labels only as a header row when importing rather than the full "Field [permName:type]" format" => "Permet d'utiliser les étiquettes de champ uniquement comme ligne d'en-tête lors de l'importation plutôt que le format complet "Field [permName:type]"", "Import updates" => "Importer des mises à jour", -// "Import update" => "Import update", +"Import update" => "Importer des mises à jour", "Allow updating existing entries matched by PK when importing. If this is disabled, only new items will be imported" => "Permettre la mise à jour des entrées existantes correspondantes à la clé primaire (PK) lors de l'importation. Si cette option est désactivée, seuls les nouveaux éléments seront importés", "Ignore blanks" => "Ignorer les valeurs vides", "Ignore blank values when import is updating existing items. Only non-blank values will be updated this way" => "Ignorer les valeurs vides lorsque l'importation met à jour des éléments existants. Seules les valeurs non vides seront mises à jour de cette manière", "Transactional import" => "Importation transactionnelle", -// "Import transaction" => "Import transaction", -// "Import in a single transaction. If any of the items fails validation, the whole import is rejected and nothing is saved" => "Importation en une seule transaction. Si l'un des éléments n'est pas validé, l'importation entière est rejetée et rien n'est sauvegardé", +"Import transaction" => "Importer une transaction", +"Import in a single transaction. If any of the items fails validation, the whole import is rejected and nothing is saved" => "Importation en une seule transaction. Si l'un des éléments n'est pas validé, l'importation entière est rejetée et rien n'est sauvegardé", "Bulk import" => "Importation en masse", "Bulk Import" => "Importation en masse", "Import in 'bulk' mode so the search index is not updated for each item and no notifications should be sent" => "Importer en mode « bulk » afin que l'index de recherche ne soit pas mis à jour pour chaque élément et qu'aucune notification ne soit envoyée", "Are you sure you want to delete this item" => "Êtes-vous certain de vouloir supprimer cet élement", "Delete item" => "Supprimer", -// "Remote Field" => "Remote Field", +"Remote Field" => "Champ d'action à distance", // "RF" => "RF", -// "Select a field.." => "Select a field..", -// "Select Mode" => "Select Mode", +"Select a field.." => "Selectionner un champ..", +"Select Mode" => "Mode de sélection", "No primary key" => "Aucune clé primaire", -// "Side" => "Side", -// "Filters will be available in partial export menus" => "Filters will be available in partial export menus", -// "Skip Unmodified" => "Skip Unmodified", -// "CSV Encoding" => "CSV Encoding", -// "Excel will often expect 'Windows-1252' encoding" => "Excel will often expect 'Windows-1252' encoding", +"Side" => "Côté", +"Filters will be available in partial export menus" => "Les filtres seront disponibles dans les menus d'exportation partielle", +"Skip Unmodified" => "Ignorer les non modifiés", +"CSV Encoding" => "Encodage CSV", +"Excel will often expect 'Windows-1252' encoding" => "Excel s'attend souvent à un encodage « Windows-1252 »", // "Default (UTF-8)" => "Default (UTF-8)", -// "Import Completed" => "Import Completed", -// "Your import was completed successfully" => "Your import was completed successfully", -// "Import from remote ODBC source" => "Import from remote ODBC source", +"Import Completed" => "Importation terminée", +"Your import was completed successfully" => "Votre importation a été effectuée avec succès", +"Import from remote ODBC source" => "Importation à partir d'une source ODBC distante", "Export Partial" => "Exportation partielle", "Export Custom" => "Exportation personnalisée", // "Applied filters" => "Applied filters", @@ -18306,7 +18306,7 @@ $lang_current = array( // "Deletes expired submissions 1000 at a time to avoid timeouts" => "Deletes expired submissions 1000 at a time to avoid timeouts", "Survey stats" => "Statistiques sur les enquêtes", // "Take survey" => "Take survey", -"Import Structure" => "Structure de l'importation", +"Import Structure" => "Importer la Structure", "Import From Profile/YAML" => "Importer à partir d'un profil/YAML", "Manage Import-Export Formats" => "Gérer les formats d'import-export", // "Clone remote" => "Clone remote", @@ -18463,7 +18463,7 @@ $lang_current = array( "Show permissions for disabled features" => "Afficher les permissions pour les fonctionnalités désactivées", "Assign permissions to this category" => "Assigner des droits à cette catégorie", "Assign permissions to this object" => "Attribuer de nouveaux droits d'accès à cet objet", -// "Modify permissions" => "Modify permissions", +"Modify permissions" => "Modifier les permissions", "Delete category permissions" => "Supprimer les permissions spécifiques à cette catégorie", "This will remove all the settings here and permissions will be reset to inherit the global sitewide permissions" => "Ceci va supprimer tous ces réglages et les droits d'accès vont être réinitialisés pour hériter des droits définis au niveau global su site", "Delete object permissions" => "Supprimer les permissions spécifiques à cet objet", @@ -19529,7 +19529,7 @@ $lang_current = array( "atts" => "joints", "List Attachments" => "Liste des fichiers joints", // "View/Edit" => "View/Edit", -// "Select the action to be performed with checked" => "Select the action to be performed with checked", +"Select the action to be performed with checked" => "Sélectionner l'action à effectuer sur les éléments cochés", "Insert New Item" => "Insérer une nouvelle fiche", "View inserted item" => "Voir la fiche insérée", "Insert new item" => "Ajouter une nouvelle fiche", @@ -22122,9 +22122,21 @@ $lang_current = array( "trackerId parameter must be present" => "le paramètre trackerId doit être présent", "Enable special behaviours" => "Activer des comportements spéciaux", "Show in ER diagram" => "Afficher dans le diagramme ER", +"Show in ER Diagram" => "Afficher dans le Diagramme ER", "Use label as placeholder" => "Utiliser le label comme espace réservé", "Display the field name as a placeholder in the input field instead of separate label" => "Afficher le nom du champ comme un espace réservé dans le champ de saisie au lieu d'un label séparé", "Cardinality" => "Cardinalité", "Data and changes to this field are not included in email notifications." => "Les données et les modifications de ce champ ne sont pas incluses dans les notifications par email.", +"ER Diagram Display" => "Affichage du diagramme ER", +"ER Diagram" => "Diagram ER", +"External API source?" => "Source d'API externe ?", +"Configure authentication through Admin Data Sources (DSN)." => "Configurer l'authentification via les sources de données d'administration (DSN).", +"When connecting to an external ODBC schema, this should reference the remote schema field." => "Lors de la connexion à un schéma ODBC externe, ce champ doit faire référence au champ du schéma distant.", +"Can be any field as long as it is unique. If none is specified full record matching will be executed upon import to prevent duplicates which can be slow." => "Il peut s'agir de n'importe quel champ, tant qu'il est unique. Si aucun champ n'est spécifié, une correspondance complète des enregistrements sera exécutée lors de l'importation afin d'éviter les doublons, ce qui peut s'avérer lent.", +"Allow updating existing entries matched by either PK or full record when importing. If this is disabled, only new items will be imported." => "Permettre la mise à jour des entrées existantes correspondant soit à la clé primaire, soit à l'enregistrement complet lors de l'importation. Si cette option est désactivée, seuls les nouveaux éléments seront importés.", +"CSV/JSON Encoding" => "Encodage CSV/JSON", +"Data Format" => "Format des données", +"Data type generated/expected from export/import functions." => "Type de données généré/attendu par les fonctions d'exportation/importation.", +"Import-Export Tracker was updated successfully." => "Le formulaire d'import-export a été mis à jour avec succès." ); $lang = array_replace($lang, $lang_current); ===================================== lib/core/Services/Tracker/TabularController.php ===================================== @@ -105,7 +105,7 @@ class Services_Tracker_TabularController $result = $lib->update($info['tabularId'], $input->name->text(), $schema->getFormatDescriptor(), $schema->getFilterDescriptor(), $config, $odbc_config, $api_config); if ($result->numRows() > 0) { - Feedback::success('Import-Export Tracker was updated successfully.'); + Feedback::success(tr('Import-Export Tracker was updated successfully.')); } return [ View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/b038143a3fbcac7ab21df3a68f9fe9ca4f2d1383 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/b038143a3fbcac7ab21df3a68f9fe9ca4f2d1383 You're receiving this email because of your account on gitlab.com. |
From: code.softstart.io@users.sourceforge.net - 2024-09-24 22:30:17
|
Revision: 86651 http://sourceforge.net/p/tikiwiki/code/86651 Author: "code.softstart.io" Date: 2024-09-24 22:30:14 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [REF] Ensure composer.tiki.org has all versions of imagine required by Media-Alchemyst --- * [REF] Ensure composer.tiki.org has all versions of imagine required by Media-Alchemyst * Include versions from the upstream package imagine/imagine * Include versions 0.9.0, 0.10.0, 0.11.0 from custom fork in https://github.com/alchemy-fr/imagine see: https://github.com/alchemy-fr/Media-Alchemyst/blob/aa55169c838f30b8f76210ca6970e34444d1e716/composer.json#L20-L23 See merge request tikiwiki/tiki!5895 Modified Paths: -------------- trunk/doc/devtools/satis.json Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-24 11:41:51 UTC (rev 86650) +++ trunk 2024-09-24 22:30:14 UTC (rev 86651) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:2763c816b569c09292e6048cff9ecf8c4ccc21ec ## -1 +0,0 ## -2024-09-24T11:42:19.474 \ No newline at end of property Added: subgit:lock:a6ca51d702c471eb485b4dcfdc1563a38209bc12 ## -0,0 +1 ## +2024-09-24T22:30:14.173 \ No newline at end of property Modified: trunk/doc/devtools/satis.json =================================================================== --- trunk/doc/devtools/satis.json 2024-09-24 11:41:51 UTC (rev 86650) +++ trunk/doc/devtools/satis.json 2024-09-24 22:30:14 UTC (rev 86651) @@ -1934,6 +1934,28 @@ "type": "package", "package": { "name": "imagine/imagine", + "version": "v0.9.0", + "dist": { + "url": "https://github.com/alchemy-fr/Imagine/archive/refs/tags/v0.9.0.zip", + "type": "zip" + } + } + }, + { + "type": "package", + "package": { + "name": "imagine/imagine", + "version": "v0.10.0", + "dist": { + "url": "https://github.com/alchemy-fr/Imagine/archive/refs/tags/v0.10.0.zip", + "type": "zip" + } + } + }, + { + "type": "package", + "package": { + "name": "imagine/imagine", "version": "v0.11.0", "dist": { "url": "https://github.com/alchemy-fr/Imagine/archive/refs/tags/v0.11.0.zip", @@ -2009,7 +2031,7 @@ "henrique-borba/php-sieve-manager": "dev-master", "html2text/html2text": "4.2.1", "hybridauth/hybridauth": ">=3.7.1", - "imagine/imagine": "v0.7.1 || v0.11.0 || ^0.6.2 || ^1.3.5", + "imagine/imagine": "^0.6.2 || ~0.7 || ^1.3.5 || ^0.9.0 || ^0.10.0 || ^0.11.0", "itsjavi/bootstrap-colorpicker": ">=2.5.1", "j0k3r/php-readability": "^1.1.10||^2.0.3", "jasig/phpcas": ">=1.3", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: SoftStart C. (@softstartcode) <gi...@mg...> - 2024-09-24 22:30:08
|
SoftStart Code pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: a6ca51d7 by SoftStart Code at 2024-09-24T22:29:49+00:00 [REF] Ensure composer.tiki.org has all versions of imagine required by Media-Alchemyst --- * [REF] Ensure composer.tiki.org has all versions of imagine required by Media-Alchemyst * Include versions from the upstream package imagine/imagine * Include versions 0.9.0, 0.10.0, 0.11.0 from custom fork in https://github.com/alchemy-fr/imagine see: https://github.com/alchemy-fr/Media-Alchemyst/blob/aa55169c838f30b8f76210ca6970e34444d1e716/composer.json#L20-L23 See merge request tikiwiki/tiki!5895 - - - - - 1 changed file: - doc/devtools/satis.json Changes: ===================================== doc/devtools/satis.json ===================================== @@ -1930,6 +1930,28 @@ } } }, + { + "type": "package", + "package": { + "name": "imagine/imagine", + "version": "v0.9.0", + "dist": { + "url": "https://github.com/alchemy-fr/Imagine/archive/refs/tags/v0.9.0.zip", + "type": "zip" + } + } + }, + { + "type": "package", + "package": { + "name": "imagine/imagine", + "version": "v0.10.0", + "dist": { + "url": "https://github.com/alchemy-fr/Imagine/archive/refs/tags/v0.10.0.zip", + "type": "zip" + } + } + }, { "type": "package", "package": { @@ -2009,7 +2031,7 @@ "henrique-borba/php-sieve-manager": "dev-master", "html2text/html2text": "4.2.1", "hybridauth/hybridauth": ">=3.7.1", - "imagine/imagine": "v0.7.1 || v0.11.0 || ^0.6.2 || ^1.3.5", + "imagine/imagine": "^0.6.2 || ~0.7 || ^1.3.5 || ^0.9.0 || ^0.10.0 || ^0.11.0", "itsjavi/bootstrap-colorpicker": ">=2.5.1", "j0k3r/php-readability": "^1.1.10||^2.0.3", "jasig/phpcas": ">=1.3", View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a6ca51d702c471eb485b4dcfdc1563a38209bc12 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a6ca51d702c471eb485b4dcfdc1563a38209bc12 You're receiving this email because of your account on gitlab.com. |
From: kroky6@users.sourceforge.net - 2024-09-24 11:42:22
|
Revision: 86650 http://sourceforge.net/p/tikiwiki/code/86650 Author: "kroky6" Date: 2024-09-24 11:42:20 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX] media-alchemyst requires 0.6.2 version of imagine lib which should also be available in satis Modified Paths: -------------- trunk/doc/devtools/satis.json Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-24 11:34:25 UTC (rev 86649) +++ trunk 2024-09-24 11:42:20 UTC (rev 86650) Property changes on: trunk ___________________________________________________________________ Added: subgit:lock:2763c816b569c09292e6048cff9ecf8c4ccc21ec ## -0,0 +1 ## +2024-09-24T11:42:19.474 \ No newline at end of property Deleted: subgit:lock:e8c31cf7c8779d4e621e7eeca3e2090b3e7aede6 ## -1 +0,0 ## -2024-09-24T11:34:41.371 \ No newline at end of property Modified: trunk/doc/devtools/satis.json =================================================================== --- trunk/doc/devtools/satis.json 2024-09-24 11:34:25 UTC (rev 86649) +++ trunk/doc/devtools/satis.json 2024-09-24 11:42:20 UTC (rev 86650) @@ -2009,7 +2009,7 @@ "henrique-borba/php-sieve-manager": "dev-master", "html2text/html2text": "4.2.1", "hybridauth/hybridauth": ">=3.7.1", - "imagine/imagine": "v0.7.1 || v0.11.0 || ^1.3.5", + "imagine/imagine": "v0.7.1 || v0.11.0 || ^0.6.2 || ^1.3.5", "itsjavi/bootstrap-colorpicker": ">=2.5.1", "j0k3r/php-readability": "^1.1.10||^2.0.3", "jasig/phpcas": ">=1.3", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Victor E. (@kroky) <gi...@mg...> - 2024-09-24 11:42:08
|
Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 2763c816 by Victor Emanouilov at 2024-09-24T14:41:51+03:00 [FIX] media-alchemyst requires 0.6.2 version of imagine lib which should also be available in satis - - - - - 1 changed file: - doc/devtools/satis.json Changes: ===================================== doc/devtools/satis.json ===================================== @@ -2009,7 +2009,7 @@ "henrique-borba/php-sieve-manager": "dev-master", "html2text/html2text": "4.2.1", "hybridauth/hybridauth": ">=3.7.1", - "imagine/imagine": "v0.7.1 || v0.11.0 || ^1.3.5", + "imagine/imagine": "v0.7.1 || v0.11.0 || ^0.6.2 || ^1.3.5", "itsjavi/bootstrap-colorpicker": ">=2.5.1", "j0k3r/php-readability": "^1.1.10||^2.0.3", "jasig/phpcas": ">=1.3", View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/2763c816b569c09292e6048cff9ecf8c4ccc21ec -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/2763c816b569c09292e6048cff9ecf8c4ccc21ec You're receiving this email because of your account on gitlab.com. |
From: kroky6@users.sourceforge.net - 2024-09-24 11:35:53
|
Revision: 86649 http://sourceforge.net/p/tikiwiki/code/86649 Author: "kroky6" Date: 2024-09-24 11:35:51 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX] prevent redirects to external sites when directly linking to the login form - doesn't make sense to login and return to another site Modified Paths: -------------- branches/27.x/tiki-login.php branches/27.x/tiki-login_scr.php Property Changed: ---------------- branches/27.x/ Index: branches/27.x =================================================================== --- branches/27.x 2024-09-24 11:34:13 UTC (rev 86648) +++ branches/27.x 2024-09-24 11:35:51 UTC (rev 86649) Property changes on: branches/27.x ___________________________________________________________________ Added: subgit:lock:054913983a708a4638bb617764a7cbb200ca39ee ## -0,0 +1 ## +2024-09-24T11:35:51.205 \ No newline at end of property Deleted: subgit:lock:4b103748858f7c4b1b49b1321b673f27c3ff7201 ## -1 +0,0 ## -2024-09-24T07:18:38.585 \ No newline at end of property Modified: branches/27.x/tiki-login.php =================================================================== --- branches/27.x/tiki-login.php 2024-09-24 11:34:13 UTC (rev 86648) +++ branches/27.x/tiki-login.php 2024-09-24 11:35:51 UTC (rev 86649) @@ -76,6 +76,10 @@ $_SESSION['loginfrom'] = $base_url . $_SESSION['loginfrom']; } } + // prevent redirects to external sites after login + if (! str_starts_with($_SESSION['loginfrom'], $url_scheme . '://' . $url_host)) { + unset($_SESSION['loginfrom']); + } } if (isset($_REQUEST['su']) && $access->checkCsrf(true)) { $loginlib = TikiLib::lib('login'); Modified: branches/27.x/tiki-login_scr.php =================================================================== --- branches/27.x/tiki-login_scr.php 2024-09-24 11:34:13 UTC (rev 86648) +++ branches/27.x/tiki-login_scr.php 2024-09-24 11:35:51 UTC (rev 86649) @@ -35,7 +35,11 @@ } } if (($prefs['useGroupHome'] != 'y' || $prefs['limitedGoGroupHome'] == 'y') && ! isset($_SESSION['loginfrom'])) { - $_SESSION['loginfrom'] = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : $prefs['tikiIndex']); + if (isset($_SERVER['HTTP_REFERER']) && str_starts_with($_SERVER['HTTP_REFERER'], $url_scheme . '://' . $url_host)) { + $_SESSION['loginfrom'] = $_SERVER['HTTP_REFERER']; + } else { + $_SESSION['loginfrom'] = $prefs['tikiIndex']; + } } $headerlib->add_js('$(function() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Victor E. (@kroky) <gi...@mg...> - 2024-09-24 11:34:50
|
Victor Emanouilov pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki Commits: 05491398 by Victor Emanouilov at 2024-09-24T14:34:25+03:00 [FIX] prevent redirects to external sites when directly linking to the login form - doesn't make sense to login and return to another site - - - - - 2 changed files: - tiki-login.php - tiki-login_scr.php Changes: ===================================== tiki-login.php ===================================== @@ -76,6 +76,10 @@ if (! isset($_SESSION['loginfrom']) && isset($_SERVER['HTTP_REFERER']) && ! preg $_SESSION['loginfrom'] = $base_url . $_SESSION['loginfrom']; } } + // prevent redirects to external sites after login + if (! str_starts_with($_SESSION['loginfrom'], $url_scheme . '://' . $url_host)) { + unset($_SESSION['loginfrom']); + } } if (isset($_REQUEST['su']) && $access->checkCsrf(true)) { $loginlib = TikiLib::lib('login'); ===================================== tiki-login_scr.php ===================================== @@ -35,7 +35,11 @@ if (isset($_REQUEST['user'])) { } } if (($prefs['useGroupHome'] != 'y' || $prefs['limitedGoGroupHome'] == 'y') && ! isset($_SESSION['loginfrom'])) { - $_SESSION['loginfrom'] = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : $prefs['tikiIndex']); + if (isset($_SERVER['HTTP_REFERER']) && str_starts_with($_SERVER['HTTP_REFERER'], $url_scheme . '://' . $url_host)) { + $_SESSION['loginfrom'] = $_SERVER['HTTP_REFERER']; + } else { + $_SESSION['loginfrom'] = $prefs['tikiIndex']; + } } $headerlib->add_js('$(function() { View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/054913983a708a4638bb617764a7cbb200ca39ee -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/054913983a708a4638bb617764a7cbb200ca39ee You're receiving this email because of your account on gitlab.com. |
From: kroky6@users.sourceforge.net - 2024-09-24 11:34:44
|
Revision: 86648 http://sourceforge.net/p/tikiwiki/code/86648 Author: "kroky6" Date: 2024-09-24 11:34:41 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX] prevent redirects to external sites when directly linking to the login form - doesn't make sense to login and return to another site Modified Paths: -------------- trunk/tiki-login.php trunk/tiki-login_scr.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-24 08:39:43 UTC (rev 86647) +++ trunk 2024-09-24 11:34:41 UTC (rev 86648) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:3ffab3260f57255a2e227e9e9e869e5eb6020e15 ## -1 +0,0 ## -2024-09-24T08:40:09.525 \ No newline at end of property Added: subgit:lock:e8c31cf7c8779d4e621e7eeca3e2090b3e7aede6 ## -0,0 +1 ## +2024-09-24T11:34:41.371 \ No newline at end of property Modified: trunk/tiki-login.php =================================================================== --- trunk/tiki-login.php 2024-09-24 08:39:43 UTC (rev 86647) +++ trunk/tiki-login.php 2024-09-24 11:34:41 UTC (rev 86648) @@ -88,6 +88,10 @@ $_SESSION['loginfrom'] = $base_url . $_SESSION['loginfrom']; } } + // prevent redirects to external sites after login + if (! str_starts_with($_SESSION['loginfrom'], $url_scheme . '://' . $url_host)) { + unset($_SESSION['loginfrom']); + } } if (isset($_REQUEST['su']) && $access->checkCsrf(true)) { $loginlib = TikiLib::lib('login'); Modified: trunk/tiki-login_scr.php =================================================================== --- trunk/tiki-login_scr.php 2024-09-24 08:39:43 UTC (rev 86647) +++ trunk/tiki-login_scr.php 2024-09-24 11:34:41 UTC (rev 86648) @@ -44,7 +44,11 @@ } } if (($prefs['useGroupHome'] != 'y' || $prefs['limitedGoGroupHome'] == 'y') && ! isset($_SESSION['loginfrom'])) { - $_SESSION['loginfrom'] = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : $prefs['tikiIndex']); + if (isset($_SERVER['HTTP_REFERER']) && str_starts_with($_SERVER['HTTP_REFERER'], $url_scheme . '://' . $url_host)) { + $_SESSION['loginfrom'] = $_SERVER['HTTP_REFERER']; + } else { + $_SESSION['loginfrom'] = $prefs['tikiIndex']; + } } $headerlib->add_js('$(function() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Victor E. (@kroky) <gi...@mg...> - 2024-09-24 11:34:36
|
Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: e8c31cf7 by Victor Emanouilov at 2024-09-24T14:34:13+03:00 [FIX] prevent redirects to external sites when directly linking to the login form - doesn't make sense to login and return to another site - - - - - 2 changed files: - tiki-login.php - tiki-login_scr.php Changes: ===================================== tiki-login.php ===================================== @@ -88,6 +88,10 @@ if (! isset($_SESSION['loginfrom']) && isset($_SERVER['HTTP_REFERER']) && ! preg $_SESSION['loginfrom'] = $base_url . $_SESSION['loginfrom']; } } + // prevent redirects to external sites after login + if (! str_starts_with($_SESSION['loginfrom'], $url_scheme . '://' . $url_host)) { + unset($_SESSION['loginfrom']); + } } if (isset($_REQUEST['su']) && $access->checkCsrf(true)) { $loginlib = TikiLib::lib('login'); ===================================== tiki-login_scr.php ===================================== @@ -44,7 +44,11 @@ if (isset($_REQUEST['user'])) { } } if (($prefs['useGroupHome'] != 'y' || $prefs['limitedGoGroupHome'] == 'y') && ! isset($_SESSION['loginfrom'])) { - $_SESSION['loginfrom'] = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : $prefs['tikiIndex']); + if (isset($_SERVER['HTTP_REFERER']) && str_starts_with($_SERVER['HTTP_REFERER'], $url_scheme . '://' . $url_host)) { + $_SESSION['loginfrom'] = $_SERVER['HTTP_REFERER']; + } else { + $_SESSION['loginfrom'] = $prefs['tikiIndex']; + } } $headerlib->add_js('$(function() { View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/e8c31cf7c8779d4e621e7eeca3e2090b3e7aede6 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/e8c31cf7c8779d4e621e7eeca3e2090b3e7aede6 You're receiving this email because of your account on gitlab.com. |
From: kroky6@users.sourceforge.net - 2024-09-24 08:40:14
|
Revision: 86647 http://sourceforge.net/p/tikiwiki/code/86647 Author: "kroky6" Date: 2024-09-24 08:40:11 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [REF] EmailFolder: use the field handler to get the parsed email from file for processing the draft --- * [REF] EmailFolder: use the field handler to get the parsed email from file for processing the draft See merge request tikiwiki/tiki!5880 Modified Paths: -------------- trunk/lib/core/Tracker/Field/EmailFolder.php trunk/lib/cypht/modules/tiki/tracker_modules.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-24 08:36:58 UTC (rev 86646) +++ trunk 2024-09-24 08:40:11 UTC (rev 86647) Property changes on: trunk ___________________________________________________________________ Added: subgit:lock:3ffab3260f57255a2e227e9e9e869e5eb6020e15 ## -0,0 +1 ## +2024-09-24T08:40:09.525 \ No newline at end of property Deleted: subgit:lock:745d04d93550344969fe3705dfdca2a07c152f75 ## -1 +0,0 ## -2024-09-24T08:37:18.990 \ No newline at end of property Modified: trunk/lib/core/Tracker/Field/EmailFolder.php =================================================================== --- trunk/lib/core/Tracker/Field/EmailFolder.php 2024-09-24 08:36:58 UTC (rev 86646) +++ trunk/lib/core/Tracker/Field/EmailFolder.php 2024-09-24 08:40:11 UTC (rev 86647) @@ -189,7 +189,7 @@ } } - private function getEmailFromFile($fileId) + public function getEmailFromFile($fileId) { $file_object = Tiki\FileGallery\File::id($fileId); if (! $file_object->exists()) { Modified: trunk/lib/cypht/modules/tiki/tracker_modules.php =================================================================== --- trunk/lib/cypht/modules/tiki/tracker_modules.php 2024-09-24 08:36:58 UTC (rev 86646) +++ trunk/lib/cypht/modules/tiki/tracker_modules.php 2024-09-24 08:40:11 UTC (rev 86647) @@ -438,8 +438,20 @@ return; } - $file_object = Tiki\FileGallery\File::id($draftId); - $parsed_fields = (new Tiki\FileGallery\Manipulator\EmailParser($file_object))->run(); + $path = str_replace('tracker_folder_', '', $path); + $fieldId = explode('_', $path)[1]; + + $trk = TikiLib::lib('trk'); + $field = $trk->get_field_info($fieldId); + + if (! $field) { + Hm_Msgs::add('ERRTracker field not found'); + return; + } + + $fieldHandler = $trk->get_field_handler($field); + $parsed_fields = $fieldHandler->getEmailFromFile($draftId); + $draft = []; $draft['draft_to'] = $parsed_fields['recipient']; $draft['draft_subject'] = $parsed_fields['subject']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Victor E. (@kroky) <gi...@mg...> - 2024-09-24 08:40:01
|
Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 3ffab326 by Merci Jacob at 2024-09-24T08:39:43+00:00 [REF] EmailFolder: use the field handler to get the parsed email from file for processing the draft --- * [REF] EmailFolder: use the field handler to get the parsed email from file for processing the draft See merge request tikiwiki/tiki!5880 - - - - - 2 changed files: - lib/core/Tracker/Field/EmailFolder.php - lib/cypht/modules/tiki/tracker_modules.php Changes: ===================================== lib/core/Tracker/Field/EmailFolder.php ===================================== @@ -189,7 +189,7 @@ class Tracker_Field_EmailFolder extends Tracker_Field_Files implements \Tracker\ } } - private function getEmailFromFile($fileId) + public function getEmailFromFile($fileId) { $file_object = Tiki\FileGallery\File::id($fileId); if (! $file_object->exists()) { ===================================== lib/cypht/modules/tiki/tracker_modules.php ===================================== @@ -438,8 +438,20 @@ class Hm_Handler_tiki_compose_from_draft extends Hm_Handler_Module return; } - $file_object = Tiki\FileGallery\File::id($draftId); - $parsed_fields = (new Tiki\FileGallery\Manipulator\EmailParser($file_object))->run(); + $path = str_replace('tracker_folder_', '', $path); + $fieldId = explode('_', $path)[1]; + + $trk = TikiLib::lib('trk'); + $field = $trk->get_field_info($fieldId); + + if (! $field) { + Hm_Msgs::add('ERRTracker field not found'); + return; + } + + $fieldHandler = $trk->get_field_handler($field); + $parsed_fields = $fieldHandler->getEmailFromFile($draftId); + $draft = []; $draft['draft_to'] = $parsed_fields['recipient']; $draft['draft_subject'] = $parsed_fields['subject']; View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3ffab3260f57255a2e227e9e9e869e5eb6020e15 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3ffab3260f57255a2e227e9e9e869e5eb6020e15 You're receiving this email because of your account on gitlab.com. |
From: kroky6@users.sourceforge.net - 2024-09-24 08:37:22
|
Revision: 86646 http://sourceforge.net/p/tikiwiki/code/86646 Author: "kroky6" Date: 2024-09-24 08:37:20 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX] Plugin Activity Stream: fixed permissions --- * [FIX] Plugin activity stream: fixed permissions See merge request tikiwiki/tiki!5805 Modified Paths: -------------- trunk/lib/core/Services/ActivityStream/Controller.php trunk/lib/core/Services/User/MonitorController.php trunk/lib/tikilib.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-24 07:17:08 UTC (rev 86645) +++ trunk 2024-09-24 08:37:20 UTC (rev 86646) Property changes on: trunk ___________________________________________________________________ Added: subgit:lock:745d04d93550344969fe3705dfdca2a07c152f75 ## -0,0 +1 ## +2024-09-24T08:37:18.990 \ No newline at end of property Deleted: subgit:lock:ecf6ba4c6bc0339d568c34a3b4f687f681968f37 ## -1 +0,0 ## -2024-09-24T07:17:15.969 \ No newline at end of property Modified: trunk/lib/core/Services/ActivityStream/Controller.php =================================================================== --- trunk/lib/core/Services/ActivityStream/Controller.php 2024-09-24 07:17:08 UTC (rev 86645) +++ trunk/lib/core/Services/ActivityStream/Controller.php 2024-09-24 08:37:20 UTC (rev 86646) @@ -16,8 +16,11 @@ public function action_render(JitFilter $request) { + global $user; + $loginlib = TikiLib::lib('login'); $encoded = $request->stream->none(); $page = $request->page->int() ?: 1; + $userId = $loginlib->getUserId(); if (! $baseQuery = Tiki_Security::get()->decode($encoded)) { throw new Services_Exception_Denied('Invalid request performed.'); @@ -37,6 +40,14 @@ $query->setPage($page); } + $group_ids = TikiLib::lib('tiki')->getUserGroupIds($user); + $or_groups = ''; + foreach ($group_ids as $group_id) { + $or_groups .= " OR criticalgrp$group_id OR highgrp$group_id OR lowgrp$group_id "; + } + + $query->filterMultivalue("critical$userId OR high$userId OR low$userId $or_groups", 'stream'); + $query->filterMultivalue("NOT \"$user\"", 'clear_list'); $query->setOrder('modification_date_desc'); if (! $index = $this->lib->getIndex()) { Modified: trunk/lib/core/Services/User/MonitorController.php =================================================================== --- trunk/lib/core/Services/User/MonitorController.php 2024-09-24 07:17:08 UTC (rev 86645) +++ trunk/lib/core/Services/User/MonitorController.php 2024-09-24 08:37:20 UTC (rev 86646) @@ -168,15 +168,8 @@ $userId = $loginlib->getUserId(); - // get the groups this user is in - $user_groups = TikiLib::lib('tiki')->get_user_groups($user); + $group_ids = $tikilib->getUserGroupIds($user); - // get the id's from the users_groups table using the groupName - $where = " WHERE groupName IN (" . implode(',', array_fill(0, count($user_groups), '?')) . ')'; - $query = "select id from users_groups" . $where; - $group_ids = TikiLib::lib('tiki')->fetchAll($query, $user_groups); - $group_ids = array_column($group_ids, 'id'); - // set up string to append to our query (pull group notifications) $or_groups = ''; foreach ($group_ids as $group_id) { Modified: trunk/lib/tikilib.php =================================================================== --- trunk/lib/tikilib.php 2024-09-24 07:17:08 UTC (rev 86645) +++ trunk/lib/tikilib.php 2024-09-24 08:37:20 UTC (rev 86646) @@ -7171,6 +7171,20 @@ return $listMarkers; } + + public function getUserGroupIds($user) + { + // get the groups user is in + $user_groups = $this->get_user_groups($user); + + // get the id's from the users_groups table using the groupName + $where = " WHERE groupName IN (" . implode(',', array_fill(0, count($user_groups), '?')) . ')'; + $query = "select id from users_groups" . $where; + $group_ids = $this->fetchAll($query, $user_groups); + $group_ids = array_column($group_ids, 'id'); + + return $group_ids; + } } // end of class ------------------------------------------------------ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Victor E. (@kroky) <gi...@mg...> - 2024-09-24 08:37:11
|
Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 745d04d9 by Josaphat Imani at 2024-09-24T08:36:58+00:00 [FIX] Plugin Activity Stream: fixed permissions --- * [FIX] Plugin activity stream: fixed permissions See merge request tikiwiki/tiki!5805 - - - - - 3 changed files: - lib/core/Services/ActivityStream/Controller.php - lib/core/Services/User/MonitorController.php - lib/tikilib.php Changes: ===================================== lib/core/Services/ActivityStream/Controller.php ===================================== @@ -16,8 +16,11 @@ class Services_ActivityStream_Controller public function action_render(JitFilter $request) { + global $user; + $loginlib = TikiLib::lib('login'); $encoded = $request->stream->none(); $page = $request->page->int() ?: 1; + $userId = $loginlib->getUserId(); if (! $baseQuery = Tiki_Security::get()->decode($encoded)) { throw new Services_Exception_Denied('Invalid request performed.'); @@ -37,6 +40,14 @@ class Services_ActivityStream_Controller $query->setPage($page); } + $group_ids = TikiLib::lib('tiki')->getUserGroupIds($user); + $or_groups = ''; + foreach ($group_ids as $group_id) { + $or_groups .= " OR criticalgrp$group_id OR highgrp$group_id OR lowgrp$group_id "; + } + + $query->filterMultivalue("critical$userId OR high$userId OR low$userId $or_groups", 'stream'); + $query->filterMultivalue("NOT \"$user\"", 'clear_list'); $query->setOrder('modification_date_desc'); if (! $index = $this->lib->getIndex()) { ===================================== lib/core/Services/User/MonitorController.php ===================================== @@ -168,14 +168,7 @@ class Services_User_MonitorController $userId = $loginlib->getUserId(); - // get the groups this user is in - $user_groups = TikiLib::lib('tiki')->get_user_groups($user); - - // get the id's from the users_groups table using the groupName - $where = " WHERE groupName IN (" . implode(',', array_fill(0, count($user_groups), '?')) . ')'; - $query = "select id from users_groups" . $where; - $group_ids = TikiLib::lib('tiki')->fetchAll($query, $user_groups); - $group_ids = array_column($group_ids, 'id'); + $group_ids = $tikilib->getUserGroupIds($user); // set up string to append to our query (pull group notifications) $or_groups = ''; ===================================== lib/tikilib.php ===================================== @@ -7171,6 +7171,20 @@ class TikiLib extends TikiDb_Bridge return $listMarkers; } + + public function getUserGroupIds($user) + { + // get the groups user is in + $user_groups = $this->get_user_groups($user); + + // get the id's from the users_groups table using the groupName + $where = " WHERE groupName IN (" . implode(',', array_fill(0, count($user_groups), '?')) . ')'; + $query = "select id from users_groups" . $where; + $group_ids = $this->fetchAll($query, $user_groups); + $group_ids = array_column($group_ids, 'id'); + + return $group_ids; + } } // end of class ------------------------------------------------------ View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/745d04d93550344969fe3705dfdca2a07c152f75 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/745d04d93550344969fe3705dfdca2a07c152f75 You're receiving this email because of your account on gitlab.com. |
From: kroky6@users.sourceforge.net - 2024-09-24 07:18:55
|
Revision: 86645 http://sourceforge.net/p/tikiwiki/code/86645 Author: "kroky6" Date: 2024-09-24 07:18:52 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX] add diffempty class to side-by-side diff, so we can style it as well besides diffprefix and diffcontent Modified Paths: -------------- branches/26.x/lib/diff/renderer_sidebyside.php branches/26.x/lib/test/diff/fixtures/sidediff-char.html branches/26.x/lib/test/diff/fixtures/sidediff-full-char.html branches/26.x/lib/test/diff/fixtures/sidediff-full.html branches/26.x/lib/test/diff/fixtures/sidediff.html Property Changed: ---------------- branches/26.x/ Index: branches/26.x =================================================================== --- branches/26.x 2024-09-24 07:16:57 UTC (rev 86644) +++ branches/26.x 2024-09-24 07:18:52 UTC (rev 86645) Property changes on: branches/26.x ___________________________________________________________________ Deleted: subgit:lock:c2fa4dc1cc7ead0c48f4b12da888f7d6b7e52551 ## -1 +0,0 ## -2024-09-20T10:07:07.800 \ No newline at end of property Added: subgit:lock:ff996d2508326e1084155ebea30f1c319303bca2 ## -0,0 +1 ## +2024-09-24T07:18:51.528 \ No newline at end of property Modified: branches/26.x/lib/diff/renderer_sidebyside.php =================================================================== --- branches/26.x/lib/diff/renderer_sidebyside.php 2024-09-24 07:16:57 UTC (rev 86644) +++ branches/26.x/lib/diff/renderer_sidebyside.php 2024-09-24 07:18:52 UTC (rev 86645) @@ -76,13 +76,13 @@ } elseif ($type == 'added') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td colspan='2'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; + echo "<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; } } } elseif ($type == 'deleted') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2'> </td></tr>\n"; + echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2' class='diffempty'> </td></tr>\n"; } } } elseif ($type == 'change-deleted') { Modified: branches/26.x/lib/test/diff/fixtures/sidediff-char.html =================================================================== --- branches/26.x/lib/test/diff/fixtures/sidediff-char.html 2024-09-24 07:16:57 UTC (rev 86644) +++ branches/26.x/lib/test/diff/fixtures/sidediff-char.html 2024-09-24 07:18:52 UTC (rev 86645) @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> Modified: branches/26.x/lib/test/diff/fixtures/sidediff-full-char.html =================================================================== --- branches/26.x/lib/test/diff/fixtures/sidediff-full-char.html 2024-09-24 07:16:57 UTC (rev 86644) +++ branches/26.x/lib/test/diff/fixtures/sidediff-full-char.html 2024-09-24 07:18:52 UTC (rev 86645) @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> Modified: branches/26.x/lib/test/diff/fixtures/sidediff-full.html =================================================================== --- branches/26.x/lib/test/diff/fixtures/sidediff-full.html 2024-09-24 07:16:57 UTC (rev 86644) +++ branches/26.x/lib/test/diff/fixtures/sidediff-full.html 2024-09-24 07:18:52 UTC (rev 86645) @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> Modified: branches/26.x/lib/test/diff/fixtures/sidediff.html =================================================================== --- branches/26.x/lib/test/diff/fixtures/sidediff.html 2024-09-24 07:16:57 UTC (rev 86644) +++ branches/26.x/lib/test/diff/fixtures/sidediff.html 2024-09-24 07:18:52 UTC (rev 86645) @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: kroky6@users.sourceforge.net - 2024-09-24 07:18:42
|
Revision: 86644 http://sourceforge.net/p/tikiwiki/code/86644 Author: "kroky6" Date: 2024-09-24 07:18:39 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX] add diffempty class to side-by-side diff, so we can style it as well besides diffprefix and diffcontent Modified Paths: -------------- branches/27.x/lib/diff/renderer_sidebyside.php branches/27.x/lib/test/diff/fixtures/sidediff-char.html branches/27.x/lib/test/diff/fixtures/sidediff-full-char.html branches/27.x/lib/test/diff/fixtures/sidediff-full.html branches/27.x/lib/test/diff/fixtures/sidediff.html Property Changed: ---------------- branches/27.x/ Index: branches/27.x =================================================================== --- branches/27.x 2024-09-24 07:16:42 UTC (rev 86643) +++ branches/27.x 2024-09-24 07:18:39 UTC (rev 86644) Property changes on: branches/27.x ___________________________________________________________________ Added: subgit:lock:4b103748858f7c4b1b49b1321b673f27c3ff7201 ## -0,0 +1 ## +2024-09-24T07:18:38.585 \ No newline at end of property Deleted: subgit:lock:cba0cfd22e69300143d7a78372ab63e6a3ff7cbb ## -1 +0,0 ## -2024-09-24T03:32:49.835 \ No newline at end of property Modified: branches/27.x/lib/diff/renderer_sidebyside.php =================================================================== --- branches/27.x/lib/diff/renderer_sidebyside.php 2024-09-24 07:16:42 UTC (rev 86643) +++ branches/27.x/lib/diff/renderer_sidebyside.php 2024-09-24 07:18:39 UTC (rev 86644) @@ -76,13 +76,13 @@ } elseif ($type == 'added') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td colspan='2'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; + echo "<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; } } } elseif ($type == 'deleted') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2'> </td></tr>\n"; + echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2' class='diffempty'> </td></tr>\n"; } } } elseif ($type == 'change-deleted') { Modified: branches/27.x/lib/test/diff/fixtures/sidediff-char.html =================================================================== --- branches/27.x/lib/test/diff/fixtures/sidediff-char.html 2024-09-24 07:16:42 UTC (rev 86643) +++ branches/27.x/lib/test/diff/fixtures/sidediff-char.html 2024-09-24 07:18:39 UTC (rev 86644) @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> Modified: branches/27.x/lib/test/diff/fixtures/sidediff-full-char.html =================================================================== --- branches/27.x/lib/test/diff/fixtures/sidediff-full-char.html 2024-09-24 07:16:42 UTC (rev 86643) +++ branches/27.x/lib/test/diff/fixtures/sidediff-full-char.html 2024-09-24 07:18:39 UTC (rev 86644) @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> Modified: branches/27.x/lib/test/diff/fixtures/sidediff-full.html =================================================================== --- branches/27.x/lib/test/diff/fixtures/sidediff-full.html 2024-09-24 07:16:42 UTC (rev 86643) +++ branches/27.x/lib/test/diff/fixtures/sidediff-full.html 2024-09-24 07:18:39 UTC (rev 86644) @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> Modified: branches/27.x/lib/test/diff/fixtures/sidediff.html =================================================================== --- branches/27.x/lib/test/diff/fixtures/sidediff.html 2024-09-24 07:16:42 UTC (rev 86643) +++ branches/27.x/lib/test/diff/fixtures/sidediff.html 2024-09-24 07:18:39 UTC (rev 86644) @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Victor E. (@kroky) <gi...@mg...> - 2024-09-24 07:17:39
|
Victor Emanouilov pushed to branch 26.x at Tiki Wiki CMS Groupware / Tiki Commits: ff996d25 by Victor Emanouilov at 2024-09-24T10:17:08+03:00 [FIX] add diffempty class to side-by-side diff, so we can style it as well besides diffprefix and diffcontent - - - - - 5 changed files: - lib/diff/renderer_sidebyside.php - lib/test/diff/fixtures/sidediff-char.html - lib/test/diff/fixtures/sidediff-full-char.html - lib/test/diff/fixtures/sidediff-full.html - lib/test/diff/fixtures/sidediff.html Changes: ===================================== lib/diff/renderer_sidebyside.php ===================================== @@ -76,13 +76,13 @@ class Text_Diff_Renderer_sidebyside extends Tiki_Text_Diff_Renderer } elseif ($type == 'added') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td colspan='2'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; + echo "<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; } } } elseif ($type == 'deleted') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2'> </td></tr>\n"; + echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2' class='diffempty'> </td></tr>\n"; } } } elseif ($type == 'change-deleted') { ===================================== lib/test/diff/fixtures/sidediff-char.html ===================================== @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> ===================================== lib/test/diff/fixtures/sidediff-full-char.html ===================================== @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> ===================================== lib/test/diff/fixtures/sidediff-full.html ===================================== @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> ===================================== lib/test/diff/fixtures/sidediff.html ===================================== @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ff996d2508326e1084155ebea30f1c319303bca2 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ff996d2508326e1084155ebea30f1c319303bca2 You're receiving this email because of your account on gitlab.com. |
From: Victor E. (@kroky) <gi...@mg...> - 2024-09-24 07:17:33
|
Victor Emanouilov pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki Commits: 4b103748 by Victor Emanouilov at 2024-09-24T10:16:57+03:00 [FIX] add diffempty class to side-by-side diff, so we can style it as well besides diffprefix and diffcontent - - - - - 5 changed files: - lib/diff/renderer_sidebyside.php - lib/test/diff/fixtures/sidediff-char.html - lib/test/diff/fixtures/sidediff-full-char.html - lib/test/diff/fixtures/sidediff-full.html - lib/test/diff/fixtures/sidediff.html Changes: ===================================== lib/diff/renderer_sidebyside.php ===================================== @@ -76,13 +76,13 @@ class Text_Diff_Renderer_sidebyside extends Tiki_Text_Diff_Renderer } elseif ($type == 'added') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td colspan='2'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; + echo "<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; } } } elseif ($type == 'deleted') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2'> </td></tr>\n"; + echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2' class='diffempty'> </td></tr>\n"; } } } elseif ($type == 'change-deleted') { ===================================== lib/test/diff/fixtures/sidediff-char.html ===================================== @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> ===================================== lib/test/diff/fixtures/sidediff-full-char.html ===================================== @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> ===================================== lib/test/diff/fixtures/sidediff-full.html ===================================== @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> ===================================== lib/test/diff/fixtures/sidediff.html ===================================== @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4b103748858f7c4b1b49b1321b673f27c3ff7201 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4b103748858f7c4b1b49b1321b673f27c3ff7201 You're receiving this email because of your account on gitlab.com. |
From: kroky6@users.sourceforge.net - 2024-09-24 07:17:20
|
Revision: 86643 http://sourceforge.net/p/tikiwiki/code/86643 Author: "kroky6" Date: 2024-09-24 07:17:17 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX] add diffempty class to side-by-side diff, so we can style it as well besides diffprefix and diffcontent Modified Paths: -------------- trunk/lib/diff/renderer_sidebyside.php trunk/lib/test/diff/fixtures/sidediff-char.html trunk/lib/test/diff/fixtures/sidediff-full-char.html trunk/lib/test/diff/fixtures/sidediff-full.html trunk/lib/test/diff/fixtures/sidediff.html Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-24 03:32:28 UTC (rev 86642) +++ trunk 2024-09-24 07:17:17 UTC (rev 86643) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:22e249ef4aca2c73deb4c10517ce5a29cfd78c2f ## -1 +0,0 ## -2024-09-24T03:13:18.606 \ No newline at end of property Added: subgit:lock:ecf6ba4c6bc0339d568c34a3b4f687f681968f37 ## -0,0 +1 ## +2024-09-24T07:17:15.969 \ No newline at end of property Modified: trunk/lib/diff/renderer_sidebyside.php =================================================================== --- trunk/lib/diff/renderer_sidebyside.php 2024-09-24 03:32:28 UTC (rev 86642) +++ trunk/lib/diff/renderer_sidebyside.php 2024-09-24 07:17:17 UTC (rev 86643) @@ -76,13 +76,13 @@ } elseif ($type == 'added') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td colspan='2'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; + echo "<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; } } } elseif ($type == 'deleted') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2'> </td></tr>\n"; + echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2' class='diffempty'> </td></tr>\n"; } } } elseif ($type == 'change-deleted') { Modified: trunk/lib/test/diff/fixtures/sidediff-char.html =================================================================== --- trunk/lib/test/diff/fixtures/sidediff-char.html 2024-09-24 03:32:28 UTC (rev 86642) +++ trunk/lib/test/diff/fixtures/sidediff-char.html 2024-09-24 07:17:17 UTC (rev 86643) @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> Modified: trunk/lib/test/diff/fixtures/sidediff-full-char.html =================================================================== --- trunk/lib/test/diff/fixtures/sidediff-full-char.html 2024-09-24 03:32:28 UTC (rev 86642) +++ trunk/lib/test/diff/fixtures/sidediff-full-char.html 2024-09-24 07:17:17 UTC (rev 86643) @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> Modified: trunk/lib/test/diff/fixtures/sidediff-full.html =================================================================== --- trunk/lib/test/diff/fixtures/sidediff-full.html 2024-09-24 03:32:28 UTC (rev 86642) +++ trunk/lib/test/diff/fixtures/sidediff-full.html 2024-09-24 07:17:17 UTC (rev 86643) @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> Modified: trunk/lib/test/diff/fixtures/sidediff.html =================================================================== --- trunk/lib/test/diff/fixtures/sidediff.html 2024-09-24 03:32:28 UTC (rev 86642) +++ trunk/lib/test/diff/fixtures/sidediff.html 2024-09-24 07:17:17 UTC (rev 86643) @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Victor E. (@kroky) <gi...@mg...> - 2024-09-24 07:17:15
|
Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: ecf6ba4c by Victor Emanouilov at 2024-09-24T10:16:42+03:00 [FIX] add diffempty class to side-by-side diff, so we can style it as well besides diffprefix and diffcontent - - - - - 5 changed files: - lib/diff/renderer_sidebyside.php - lib/test/diff/fixtures/sidediff-char.html - lib/test/diff/fixtures/sidediff-full-char.html - lib/test/diff/fixtures/sidediff-full.html - lib/test/diff/fixtures/sidediff.html Changes: ===================================== lib/diff/renderer_sidebyside.php ===================================== @@ -76,13 +76,13 @@ class Text_Diff_Renderer_sidebyside extends Tiki_Text_Diff_Renderer } elseif ($type == 'added') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td colspan='2'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; + echo "<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>$prefix</td><td class='diffadded diffcontent'>" . htmlspecialchars($line) . "</td></tr>\n"; } } } elseif ($type == 'deleted') { foreach ($lines as $line) { if (! empty($line)) { - echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2'> </td></tr>\n"; + echo "<tr><td class='diffdeleted diffprefix'>$prefix</td><td class='diffdeleted diffcontent'>" . htmlspecialchars($line) . "</td><td colspan='2' class='diffempty'> </td></tr>\n"; } } } elseif ($type == 'change-deleted') { ===================================== lib/test/diff/fixtures/sidediff-char.html ===================================== @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> ===================================== lib/test/diff/fixtures/sidediff-full-char.html ===================================== @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> ===================================== lib/test/diff/fixtures/sidediff-full.html ===================================== @@ -2,9 +2,9 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class='diffbody'><td> </td><td>To begin configuring your site:</td><td> </td><td>To begin configuring your site:</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST()}</td><td> </td><td>{FANCYLIST()}</td></tr> @@ -12,7 +12,7 @@ <tr class='diffbody'><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td><td> </td><td>2) Manually [tiki-admin.php?page=features|Enable specific Tiki features] that you didn’t enable with the Admin wizard.</td></tr> <tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> <tr class='diffbody'><td> </td><td>For more information:</td><td> </td><td>For more information:</td></tr> <tr class='diffbody'><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td><td> </td><td>*[https://tiki.org/Introduction|Learn more about Tiki].</td></tr> ===================================== lib/test/diff/fixtures/sidediff.html ===================================== @@ -2,11 +2,11 @@ <tr><td class="diffdeleted diffprefix">-</td><td class="diffdeleted diffcontent">This is the default homepage for your Tiki. If you are seeing this page, your installation was successful.</td> <td class="diffadded diffprefix">+</td><td class="diffadded diffcontent">This is the default homepage for your Tiki<ins class="diffchar inserted"><strong>. Changes Inline</strong></ins>. If you are seeing this page, your installation was successful.</td></tr> <tr class='diffbody'><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td><td> </td><td>You can change this page after logging in. Please review the [http://doc.tiki.org/Wiki-syntax|wiki syntax] for editing details.</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>Some changes</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More text added</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>And even more</td></tr> <tr class='diffbody'><td> </td><td>!!Get started.</td><td> </td><td>!!Get started.</td></tr> <tr class="diffheader"><td colspan="2">Lines: 12-15</td><td colspan="2">Lines: 16-21</td></tr><tr class='diffbody'><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td><td> </td><td>3) Run [tiki-admin.php?page=profiles|Tiki Profiles] to quickly get up and running.</td></tr> <tr class='diffbody'><td> </td><td>{FANCYLIST}</td><td> </td><td>{FANCYLIST}</td></tr> -<tr><td colspan='2'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> +<tr><td colspan='2' class='diffempty'> </td><td class='diffadded diffprefix'>+</td><td class='diffadded diffcontent'>More changes here [http://www.tiki.org]</td></tr> <tr class='diffbody'><td> </td><td>!!Need help?</td><td> </td><td>!!Need help?</td></tr> View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ecf6ba4c6bc0339d568c34a3b4f687f681968f37 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ecf6ba4c6bc0339d568c34a3b4f687f681968f37 You're receiving this email because of your account on gitlab.com. |
From: gary_c@users.sourceforge.net - 2024-09-24 03:32:55
|
Revision: 86642 http://sourceforge.net/p/tikiwiki/code/86642 Author: "gary_c" Date: 2024-09-24 03:32:52 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX][UI] Corrected module zone heading text (some didn't have final version,... --- * [FIX][UI] Corrected module zone heading text (some didn't have final version,... --- * [FIX][UI] Corrected module zone heading text (some didn't have final version, some had tentative and final version). Thanks, luci. See merge request tikiwiki/tiki!5888 (cherry picked from commit 22e249ef4aca2c73deb4c10517ce5a29cfd78c2f) 51157d67 [FIX][UI] Corrected module zone heading text (some didn't have final version,... Co-authored-by: Gary Cunningham-Lee <ga...@cu...> See merge request tikiwiki/tiki!5889 Modified Paths: -------------- branches/27.x/templates/layouts/basic/layout_view.tpl branches/27.x/templates/layouts/classic/layout_view.tpl branches/27.x/templates/layouts/social/layout_view.tpl Property Changed: ---------------- branches/27.x/ Index: branches/27.x =================================================================== --- branches/27.x 2024-09-24 03:12:57 UTC (rev 86641) +++ branches/27.x 2024-09-24 03:32:52 UTC (rev 86642) Property changes on: branches/27.x ___________________________________________________________________ Deleted: subgit:lock:ba1c7700dc83385de002c3de5432eaee88a1d806 ## -1 +0,0 ## -2024-09-23T11:02:14.496 \ No newline at end of property Added: subgit:lock:cba0cfd22e69300143d7a78372ab63e6a3ff7cbb ## -0,0 +1 ## +2024-09-24T03:32:49.835 \ No newline at end of property Modified: branches/27.x/templates/layouts/basic/layout_view.tpl =================================================================== --- branches/27.x/templates/layouts/basic/layout_view.tpl 2024-09-24 03:12:57 UTC (rev 86641) +++ branches/27.x/templates/layouts/basic/layout_view.tpl 2024-09-24 03:32:52 UTC (rev 86642) @@ -39,7 +39,7 @@ {block name=content}{/block} </main> {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Pagebottom heading{/tr}' role=complementary} + {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Related content{/tr}' role=complementary} {/if} </div> {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} @@ -108,7 +108,7 @@ {/if} </div> <div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> Modified: branches/27.x/templates/layouts/classic/layout_view.tpl =================================================================== --- branches/27.x/templates/layouts/classic/layout_view.tpl 2024-09-24 03:12:57 UTC (rev 86641) +++ branches/27.x/templates/layouts/classic/layout_view.tpl 2024-09-24 03:32:52 UTC (rev 86642) @@ -56,7 +56,7 @@ {block name=content}{/block} </main> {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Pagebottom heading{/tr}' role=complementary} + {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Related content{/tr}' role=complementary} {/if} {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} </div> @@ -129,7 +129,7 @@ </div> {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} <div class="col col2 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> Modified: branches/27.x/templates/layouts/social/layout_view.tpl =================================================================== --- branches/27.x/templates/layouts/social/layout_view.tpl 2024-09-24 03:12:57 UTC (rev 86641) +++ branches/27.x/templates/layouts/social/layout_view.tpl 2024-09-24 03:32:52 UTC (rev 86642) @@ -127,7 +127,7 @@ {/if} </div> <div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Gary Cunningham-L. (@gary.cunningham-lee) <gi...@mg...> - 2024-09-24 03:32:46
|
Gary Cunningham-Lee pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki Commits: cba0cfd2 by Gary Cunningham-Lee at 2024-09-24T03:32:28+00:00 [FIX][UI] Corrected module zone heading text (some didn't have final version,... --- * [FIX][UI] Corrected module zone heading text (some didn't have final version,... --- * [FIX][UI] Corrected module zone heading text (some didn't have final version, some had tentative and final version). Thanks, luci. See merge request tikiwiki/tiki!5888 (cherry picked from commit 22e249ef4aca2c73deb4c10517ce5a29cfd78c2f) 51157d67 [FIX][UI] Corrected module zone heading text (some didn't have final version,... Co-authored-by: Gary Cunningham-Lee <ga...@cu...> See merge request tikiwiki/tiki!5889 - - - - - 3 changed files: - templates/layouts/basic/layout_view.tpl - templates/layouts/classic/layout_view.tpl - templates/layouts/social/layout_view.tpl Changes: ===================================== templates/layouts/basic/layout_view.tpl ===================================== @@ -39,7 +39,7 @@ {block name=content}{/block} </main> {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Pagebottom heading{/tr}' role=complementary} + {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Related content{/tr}' role=complementary} {/if} </div> {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} @@ -108,7 +108,7 @@ {/if} </div> <div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> ===================================== templates/layouts/classic/layout_view.tpl ===================================== @@ -56,7 +56,7 @@ {block name=content}{/block} </main> {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Pagebottom heading{/tr}' role=complementary} + {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Related content{/tr}' role=complementary} {/if} {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} </div> @@ -129,7 +129,7 @@ </div> {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} <div class="col col2 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> ===================================== templates/layouts/social/layout_view.tpl ===================================== @@ -127,7 +127,7 @@ {/if} </div> <div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/cba0cfd22e69300143d7a78372ab63e6a3ff7cbb -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/cba0cfd22e69300143d7a78372ab63e6a3ff7cbb You're receiving this email because of your account on gitlab.com. |
From: Gary Cunningham-L. (@gary.cunningham-lee) <gi...@mg...> - 2024-09-24 03:32:43
|
Gary Cunningham-Lee deleted branch cherry-pick-22e249ef at Tiki Wiki CMS Groupware / Tiki -- You're receiving this email because of your account on gitlab.com. |
From: Gary Cunningham-L. (@gary.cunningham-lee) <gi...@mg...> - 2024-09-24 03:26:07
|
Gary Cunningham-Lee pushed new branch cherry-pick-22e249ef at Tiki Wiki CMS Groupware / Tiki -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/tree/cherry-pick-22e249ef You're receiving this email because of your account on gitlab.com. |
From: gary_c@users.sourceforge.net - 2024-09-24 03:13:22
|
Revision: 86641 http://sourceforge.net/p/tikiwiki/code/86641 Author: "gary_c" Date: 2024-09-24 03:13:19 +0000 (Tue, 24 Sep 2024) Log Message: ----------- [FIX][UI] Corrected module zone heading text (some didn't have final version,... --- * [FIX][UI] Corrected module zone heading text (some didn't have final version, some had tentative and final version). Thanks, luci. See merge request tikiwiki/tiki!5888 Modified Paths: -------------- trunk/templates/layouts/basic/layout_view.tpl trunk/templates/layouts/classic/layout_view.tpl trunk/templates/layouts/social/layout_view.tpl Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-23 13:52:19 UTC (rev 86640) +++ trunk 2024-09-24 03:13:19 UTC (rev 86641) Property changes on: trunk ___________________________________________________________________ Added: subgit:lock:22e249ef4aca2c73deb4c10517ce5a29cfd78c2f ## -0,0 +1 ## +2024-09-24T03:13:18.606 \ No newline at end of property Deleted: subgit:lock:7e24228c046dc24ef7826dbd4c9f3321b9cb682e ## -1 +0,0 ## -2024-09-23T13:52:49.690 \ No newline at end of property Modified: trunk/templates/layouts/basic/layout_view.tpl =================================================================== --- trunk/templates/layouts/basic/layout_view.tpl 2024-09-23 13:52:19 UTC (rev 86640) +++ trunk/templates/layouts/basic/layout_view.tpl 2024-09-24 03:13:19 UTC (rev 86641) @@ -39,7 +39,7 @@ {block name=content}{/block} </main> {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Pagebottom heading{/tr}' role=complementary} + {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Related content{/tr}' role=complementary} {/if} </div> {elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'} @@ -108,7 +108,7 @@ {/if} </div> <div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> Modified: trunk/templates/layouts/classic/layout_view.tpl =================================================================== --- trunk/templates/layouts/classic/layout_view.tpl 2024-09-23 13:52:19 UTC (rev 86640) +++ trunk/templates/layouts/classic/layout_view.tpl 2024-09-24 03:13:19 UTC (rev 86641) @@ -56,7 +56,7 @@ {block name=content}{/block} </main> {if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))} - {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Pagebottom heading{/tr}' role=complementary} + {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Related content{/tr}' role=complementary} {/if} {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} </div> @@ -129,7 +129,7 @@ </div> {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} <div class="col col2 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> Modified: trunk/templates/layouts/social/layout_view.tpl =================================================================== --- trunk/templates/layouts/social/layout_view.tpl 2024-09-23 13:52:19 UTC (rev 86640) +++ trunk/templates/layouts/social/layout_view.tpl 2024-09-24 03:13:19 UTC (rev 86641) @@ -127,7 +127,7 @@ {/if} </div> <div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2"> - {modulelist zone=left class="left-aside" heading_text='{tr}Left aside{/tr}' heading_text='{tr}More content and functionality (left side){/tr}'} + {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}'} </div> {else} <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |