From 6fa019e23a20be508afbc41ab3bd6d72903affbf Mon Sep 17 00:00:00 2001 From: hanakin Date: Tue, 5 Apr 2022 12:51:03 -0400 Subject: [PATCH 1/6] [ticket/16978] add missing ul closeing tag PHPBB3-16978 --- .../prosilver/template/posting_pm_header.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 7fee914525..2fee21fd97 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -66,13 +66,14 @@
-
From 5b4a955b658d3b6d4c54387d1b10c4bcc6a7430c Mon Sep 17 00:00:00 2001 From: hanakin Date: Tue, 5 Apr 2022 13:54:05 -0400 Subject: [PATCH 2/6] [ticket/16978] convert file to twig PHPBB3-16978 --- .../prosilver/template/posting_pm_header.html | 174 ++++++++++-------- 1 file changed, 100 insertions(+), 74 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 2fc44ab9d6..4a17196760 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -1,84 +1,110 @@
- + {% if not S_SHOW_DRAFTS %} - + {% if S_GROUP_OPTIONS %}
-
-
+
+
- - -
- -
-
-
- - - - {L_FIND_USERNAME} - -
-
- -
-
-
- -
-
+ {% endif %} + {% if S_ALLOW_MASS_PM %} +
+ {% if not S_EDIT_POST %} +
+
- + + + {% EVENT posting_pm_header_find_username_before %} + {{ lang('FIND_USERNAME') }} + {% EVENT posting_pm_header_find_username_after %}
- -
- -
+ {% endif %} +
+ {% if .to_recipient or .bcc_recipient %} +
+ {% endif %} +
+ {% if .to_recipient %} +
+
+
+
    + {% for to_recipient in .to_recipient %} +
  • + {% if not S_EDIT_POST %} + + {% endif %} + {% if to_recipient.IS_GROUP %} + {{ to_recipient.NAME }} + {% else %} + {{ to_recipient.NAME_FULL }} + {% endif %} +
    • + {% endfor %} +
+
+
+ {% endif %} +
+ {% if .bcc_recipient %} +
+
+
+
+
    + {% for bcc_recipient in .bcc_recipient %} +
  • + {% if not S_EDIT_POST %} + + {% endif %} + {% if bcc_recipient.IS_GROUP %} + {{ bcc_recipient.NAME }} + {% else %} + {{ bcc_recipient.NAME_FULL }} + {% endif %} +
    • + {% endfor %} +
+
+
+
+ {% endif %} + {% else %} +
-
-
- -
+
+ + {% if not S_EDIT_POST %} +
{{ lang('FIND_USERNAME') }} + {% endif %} +
+ {% if not S_EDIT_POST %} +
+ +
+ {% endif %} + {% if .to_recipient %} +
+
    + {% for to_recipient in .to_recipient %} +
  • + {% if to_recipient.IS_GROUP %} + {{ to_recipient.NAME }} + {% else %} + {{ to_recipient.NAME_FULL }} + {% endif %}  + {% if not S_EDIT_POST %} + + {% endif %} +
    • + {% endfor %} +
+
+ {% endif %}
- - -
-
-

{L_FIND_USERNAME}
- -
- - -
- -
- -
-
- - - -
+ {% endif %} + {% endif %} + From f8fb1749f00ff43444b3c46bbc85548c54be6cd9 Mon Sep 17 00:00:00 2001 From: hanakin Date: Tue, 5 Apr 2022 13:57:49 -0400 Subject: [PATCH 3/6] [ticket/16978] minor cleanup PHPBB3-16978 --- phpBB/styles/prosilver/template/posting_pm_header.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 4a17196760..dd0fad2f6b 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -13,11 +13,11 @@
- - - {% EVENT posting_pm_header_find_username_before %} - {{ lang('FIND_USERNAME') }} - {% EVENT posting_pm_header_find_username_after %} + + + {% EVENT posting_pm_header_find_username_before %} + {{ lang('FIND_USERNAME') }} + {% EVENT posting_pm_header_find_username_after %}
{% endif %} From 63c42c49fa1eb300ef88a5092ed5055a36e1980a Mon Sep 17 00:00:00 2001 From: hanakin Date: Tue, 5 Apr 2022 20:37:35 -0400 Subject: [PATCH 4/6] [ticket/16978] merge labgs remove xhtml 1.0 stuff PHPBB3-16978 --- .../prosilver/template/posting_pm_header.html | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index dd0fad2f6b..f1fc646682 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -3,18 +3,18 @@ {% if S_GROUP_OPTIONS %}
-
-
+
+
{% endif %} {% if S_ALLOW_MASS_PM %}
{% if not S_EDIT_POST %}
-
+
- - + + {% EVENT posting_pm_header_find_username_before %} {{ lang('FIND_USERNAME') }} {% EVENT posting_pm_header_find_username_after %} @@ -23,18 +23,18 @@ {% endif %}
{% if .to_recipient or .bcc_recipient %} -
+
{% endif %}
{% if .to_recipient %}
-
+
    {% for to_recipient in .to_recipient %}
  • {% if not S_EDIT_POST %} - + {% endif %} {% if to_recipient.IS_GROUP %} {{ to_recipient.NAME }} @@ -51,13 +51,13 @@ {% if .bcc_recipient %}
    -
    +
      {% for bcc_recipient in .bcc_recipient %}
    • {% if not S_EDIT_POST %} - + {% endif %} {% if bcc_recipient.IS_GROUP %} {{ bcc_recipient.NAME }} @@ -75,14 +75,14 @@
      - + {% if not S_EDIT_POST %} -
      {{ lang('FIND_USERNAME') }} +
      {{ lang('FIND_USERNAME') }} {% endif %}
      {% if not S_EDIT_POST %}
      - +
      {% endif %} {% if .to_recipient %} @@ -96,7 +96,7 @@ {{ to_recipient.NAME_FULL }} {% endif %}  {% if not S_EDIT_POST %} - + {% endif %}
      • {% endfor %} From 25a84713c0798d36fdcf8e732d309bcd783438bf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Jun 2022 08:51:08 +0200 Subject: [PATCH 5/6] [ticket/16978] Move nbsp to inside if of submit PHPBB3-16978 --- phpBB/styles/prosilver/template/posting_pm_header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index f1fc646682..6c26070004 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -94,9 +94,9 @@ {{ to_recipient.NAME }} {% else %} {{ to_recipient.NAME_FULL }} - {% endif %}  + {% endif %} {% if not S_EDIT_POST %} - +   {% endif %} {% endfor %} From 9622105d01704a9b2a7a59eff5ff497bfa4b9022 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Jun 2022 21:57:47 +0200 Subject: [PATCH 6/6] [ticket/16978] Resolve invalid twig syntax PHPBB3-16978 --- .../prosilver/template/posting_pm_header.html | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 6c26070004..c9333caeed 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -22,24 +22,24 @@
    {% endif %}
    - {% if .to_recipient or .bcc_recipient %} + {% if to_recipient or bcc_recipient %}
    {% endif %}
    - {% if .to_recipient %} + {% if to_recipient %}
      - {% for to_recipient in .to_recipient %} + {% for recipient in to_recipient %}
    • {% if not S_EDIT_POST %} - + {% endif %} - {% if to_recipient.IS_GROUP %} - {{ to_recipient.NAME }} + {% if recipient.IS_GROUP %} + {{ recipient.NAME }} {% else %} - {{ to_recipient.NAME_FULL }} + {{ recipient.NAME_FULL }} {% endif %}
      • {% endfor %} @@ -48,21 +48,21 @@
    {% endif %}
    - {% if .bcc_recipient %} + {% if bcc_recipient %}
      - {% for bcc_recipient in .bcc_recipient %} + {% for recipient in bcc_recipient %}
    • {% if not S_EDIT_POST %} - + {% endif %} - {% if bcc_recipient.IS_GROUP %} - {{ bcc_recipient.NAME }} + {% if recipient.IS_GROUP %} + {{ recipient.NAME }} {% else %} - {{ bcc_recipient.NAME_FULL }} + {{ recipient.NAME_FULL }} {% endif %}
      • {% endfor %} @@ -85,18 +85,18 @@
    {% endif %} - {% if .to_recipient %} + {% if to_recipient %}
      - {% for to_recipient in .to_recipient %} + {% for recipient in to_recipient %}
    • - {% if to_recipient.IS_GROUP %} - {{ to_recipient.NAME }} + {% if recipient.IS_GROUP %} + {{ recipient.NAME }} {% else %} - {{ to_recipient.NAME_FULL }} + {{ recipient.NAME_FULL }} {% endif %} {% if not S_EDIT_POST %} -   +   {% endif %}
      • {% endfor %}