From d40fb32dcdc447cd284d8c5dbffa845b142f1eeb Mon Sep 17 00:00:00 2001 From: Crizzo Date: Mon, 3 Mar 2014 21:11:06 +0100 Subject: [PATCH 01/12] [ticket/8785] Rebuilding posting_editor pm head + new language vars PHPBB3-8785 --- phpBB/language/en/ucp.php | 6 +- .../prosilver/template/posting_editor.html | 110 ++++++++++-------- phpBB/styles/prosilver/theme/common.css | 15 +++ 3 files changed, 82 insertions(+), 49 deletions(-) diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 6f392d6efe..3a6f2faf02 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -472,7 +472,11 @@ $lang = array_merge($lang, array( 'TIMEZONE' => 'Timezone', 'TIMEZONE_DATE_SUGGESTION' => 'Suggestion: %s', 'TIMEZONE_INVALID' => 'The timezone you selected is invalid.', - 'TO' => 'To', + 'TO' => 'Recipient', + 'TO_MASS' => 'Recipients', + 'TO_ADD' => 'Add recipient', + 'TO_ADD_MASS' => 'Add recipients', + 'TO_ADD_GROUPS' => 'Add groups', 'TOO_MANY_RECIPIENTS' => 'You tried to send a private message to too many recipients.', 'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.', diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 2ae224bc3a..22bfe78eee 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -3,67 +3,81 @@ -
+ +
+
+
+ + +
+ - -
-
-
- -
- {to_recipient.NAME}{to_recipient.NAME_FULL}  -   - -
-
- - -
-
-
- -
- {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}  -   - -
-
- +
-
-
{L_FIND_USERNAME}
-
-
+ +
+ + + {L_FIND_USERNAME} +
- -
-

{L_FIND_USERNAME}
- -
+
+
+ +
+
+
+
    -
- {to_recipient.NAME}{to_recipient.NAME_FULL}  -   +
  • + + {to_recipient.NAME}{to_recipient.NAME_FULL} +
    • +
    - - +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +

    {L_FIND_USERNAME}
    + +
    +
    +
    - -
    - - -
    -
    -
    -
    -
    diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 84f6859936..887954038e 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -750,6 +750,21 @@ dl.details dd { overflow: hidden; } +fieldset.fields1 ul.recipients { + list-style-type: none; + line-height: 1.8; +} + +fieldset.fields1 dd.recipients { + clear: left; + margin-left: 1em; +} + +fieldset.fields1 ul.recipients input.button2{ + font-size: 0.8em; + margin-right: 0; + padding: 0; +} /* Pagination ---------------------------------------- */ From 2d7e76013f36a3e73afae489584a806c921ebadd Mon Sep 17 00:00:00 2001 From: Crizzo Date: Mon, 3 Mar 2014 21:15:56 +0100 Subject: [PATCH 02/12] [ticket/8785] Little spaces mistake PHPBB3-8785 --- phpBB/styles/prosilver/theme/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 887954038e..169c84f64a 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -763,7 +763,7 @@ fieldset.fields1 dd.recipients { fieldset.fields1 ul.recipients input.button2{ font-size: 0.8em; margin-right: 0; - padding: 0; + padding: 0; } /* Pagination From 837a909f8c9580ead0a24114d73178951f046eb0 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Mon, 3 Mar 2014 21:23:58 +0100 Subject: [PATCH 03/12] [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px PHPBB3-8785 --- phpBB/styles/prosilver/theme/common.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 169c84f64a..c204755b9a 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -753,6 +753,8 @@ dl.details dd { fieldset.fields1 ul.recipients { list-style-type: none; line-height: 1.8; + max-height: 150px; + overflow-y: auto; } fieldset.fields1 dd.recipients { From 60ca7f91e2b8c2e0b80fe5cd06b9b48eec04f021 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Tue, 4 Mar 2014 10:26:22 +0100 Subject: [PATCH 04/12] [ticket/8785] Adds two
    to seperate recipients and BCC PHPBB3-8785 --- phpBB/styles/prosilver/template/posting_editor.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 22bfe78eee..f880597b29 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -24,6 +24,7 @@
    +
    @@ -79,7 +80,7 @@
    - +
    From 9ef79776a955e20995f2abfa1ce9fd0188ae4e83 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 9 Mar 2014 13:20:49 +0100 Subject: [PATCH 05/12] [ticket/8785] Adds a new optical improvement, new file and fixes html bugs PHPBB3-8785 --- .../prosilver/template/posting_editor.html | 93 ++----------------- .../prosilver/template/posting_pm_header.html | 90 ++++++++++++++++++ .../prosilver/template/posting_pm_layout.html | 7 +- phpBB/styles/prosilver/theme/common.css | 8 ++ 4 files changed, 105 insertions(+), 93 deletions(-) create mode 100644 phpBB/styles/prosilver/template/posting_pm_header.html diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index f880597b29..ab812a40e6 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -1,89 +1,6 @@ -
    -

    {ERROR}

    - - - - -
    -
    -
    - - -
    - - -
    - -
    - - -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    -
    - - -
    -
    -

    {L_FIND_USERNAME}
    - -
    - - -
    -
    - -
    -
    - -
    -
    - - +
    +
    +
    @@ -155,7 +72,7 @@
    -
    + @@ -267,3 +184,5 @@ + + \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html new file mode 100644 index 0000000000..066112b720 --- /dev/null +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -0,0 +1,90 @@ +
    +
    +
    +

    {ERROR}

    + + + + +
    +
    +
    + + +
    + + +
    + +
    +
    +
    + + + {L_FIND_USERNAME} +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +

    {L_FIND_USERNAME}
    + +
    + + +
    +
    + +
    +
    + + +
    + +
    +
    +
    \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index 5421cc2cbd..c73fc3f40b 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -17,15 +17,10 @@

    {L_TITLE}

    -
    -
    - + -
    -
    - diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index c204755b9a..4690e9410e 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -768,6 +768,14 @@ fieldset.fields1 ul.recipients input.button2{ padding: 0; } +fieldset.fields1 dl.pmlist > dt { + width: auto !important; +} + +fieldset.fields1 dl.pmlist dd.recipients { + margin-left: 0 !important; +} + /* Pagination ---------------------------------------- */ .pagination { From f2321af9ed497ea8373ef9fdddbc3e2de010b9cd Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 9 Mar 2014 14:21:17 +0100 Subject: [PATCH 06/12] [ticket/8785] Adds blank lines at file end PHPBB3-8785 --- phpBB/styles/prosilver/template/posting_editor.html | 2 +- phpBB/styles/prosilver/template/posting_pm_header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index ab812a40e6..7d53c8a873 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -185,4 +185,4 @@ - \ No newline at end of file + diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 066112b720..0257b806c8 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -87,4 +87,4 @@ - \ No newline at end of file + From cace4a50d08bf3525ebb8a02c89a020b0dcbd67f Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 9 Mar 2014 17:59:49 +0100 Subject: [PATCH 07/12] [ticket/8785]
    will only displayed when needed PHPBB3-8785 --- phpBB/styles/prosilver/template/posting_pm_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 0257b806c8..c7d3af217e 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -26,7 +26,7 @@ -
    +
    From b4a65da2edf4e7f82eff9fadc90cea109556f1fa Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 9 Mar 2014 19:37:45 +0100 Subject: [PATCH 08/12] [ticket/8785] pm_layout.html back to more standard code PHPBB3-8785 --- phpBB/styles/prosilver/template/posting_editor.html | 6 +----- .../styles/prosilver/template/posting_pm_header.html | 6 +----- .../styles/prosilver/template/posting_pm_layout.html | 11 ++++++++++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 7d53c8a873..d0c08db231 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -1,6 +1,4 @@ -
    -
    -
    +
    @@ -184,5 +182,3 @@ -
    -
    diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index c7d3af217e..f255171439 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -1,6 +1,4 @@ -
    -
    -
    +

    {ERROR}

    @@ -86,5 +84,3 @@
    -
    -
    diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index c73fc3f40b..94de70358f 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -16,10 +16,19 @@

    {L_TITLE}

    +
    +
    + +
    +
    + +
    +
    - +
    +
    From cc59b5e44bac183d534ddb5901b7491746c5fbde Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 9 Mar 2014 21:16:40 +0100 Subject: [PATCH 09/12] [ticket/8785] Just one blank line PHPBB3-8785 --- phpBB/styles/prosilver/template/posting_pm_layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index 94de70358f..e99fd1e8d2 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -16,6 +16,7 @@

    {L_TITLE}

    +
    From 0fd172aaa457e46938965d1a547a5b33bdfd29d8 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 9 Mar 2014 21:50:44 +0100 Subject: [PATCH 10/12] [ticket/8785] and again a fresh line PHPBB3-8785 --- phpBB/styles/prosilver/template/posting_pm_layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index e99fd1e8d2..c9b4a915ae 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -28,6 +28,7 @@ +
    From 47ad92ae31918bcabee77d6e8b38ba0a391f523b Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 9 Mar 2014 22:14:40 +0100 Subject: [PATCH 11/12] [ticket/8785] Fixed problem with add empty.png and travis will now pass PHPBB3-8785 --- phpBB/styles/prosilver/template/posting_editor.html | 2 ++ phpBB/styles/prosilver/template/posting_pm_header.html | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index d0c08db231..e311b85cbe 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -1,4 +1,6 @@
    +

    {ERROR}

    +
    diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index f255171439..b26621af3b 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -1,7 +1,5 @@
    -

    {ERROR}

    - - +
    From 21961a25ba4c8057afb1e41473827f5d69d2f318 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Tue, 11 Mar 2014 22:02:43 +0100 Subject: [PATCH 12/12] [ticket/8785] Deletes additional add and add_bcc buttons PHPBB3-8785 --- phpBB/styles/prosilver/template/posting_pm_header.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index b26621af3b..114b361e9a 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -5,8 +5,6 @@


    - -