From 8f92b6eea478db950610df2978e3d4fd47025e6b Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 24 Oct 2015 19:51:58 +0200 Subject: [PATCH] some work on poke template --- mod/poke.php | 49 +++++++++++++-------------- view/templates/poke_content.tpl | 54 ++++++++++++++++-------------- view/templates/poke_head.tpl | 18 ++++++++++ view/theme/duepuntozero/style.css | 15 +++++++++ view/theme/frost-mobile/style.css | 16 +++++++++ view/theme/frost/style.css | 16 +++++++++ view/theme/quattro/dark/style.css | 14 ++++++++ view/theme/quattro/green/style.css | 14 ++++++++ view/theme/quattro/lilac/style.css | 14 ++++++++ view/theme/quattro/quattro.less | 12 +++++++ view/theme/smoothly/style.css | 19 +++++++++++ view/theme/vier/style.css | 16 +++++++++ 12 files changed, 206 insertions(+), 51 deletions(-) create mode 100644 view/templates/poke_head.tpl diff --git a/mod/poke.php b/mod/poke.php index db1c94963..45a577cda 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -1,4 +1,18 @@ -get_baseurl(); - $a->page['htmlhead'] .= ''; - $a->page['htmlhead'] .= <<< EOT + $head_tpl = get_markup_template('poke_head.tpl'); + $a->page['htmlhead'] .= replace_macros($head_tpl,array( + '$baseurl' => $a->get_baseurl(true), + '$base' => $base + )); - -EOT; $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0'); - $verbs = get_poke_verbs(); $shortlist = array(); diff --git a/view/templates/poke_content.tpl b/view/templates/poke_content.tpl index 857dfb200..18191de03 100644 --- a/view/templates/poke_content.tpl +++ b/view/templates/poke_content.tpl @@ -3,31 +3,33 @@
{{$desc}}
-
-
-
-
{{$clabel}}
-
- - - -
-
-
{{$choice}}
-
-
- -
-
-
{{$prv_desc}}
- -
-
- -
+
+
+ +
+
{{$clabel}}
+ + + +
+ +
+
{{$choice}}
+ +
+ +
+
{{$prv_desc}}
+ +
+ + + +
+
diff --git a/view/templates/poke_head.tpl b/view/templates/poke_head.tpl new file mode 100644 index 000000000..6e30eb7fe --- /dev/null +++ b/view/templates/poke_head.tpl @@ -0,0 +1,18 @@ + + + \ No newline at end of file diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index ae2530b6a..087104123 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2022,6 +2022,21 @@ a.mail-list-link { .message-links-end { clear: both; } +#poke-desc { + margin: 5px 0 10px; +} + +#poke-wrapper { + padding: 10px 0 20px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} #sidebar-group-list ul { list-style-type: none; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index f4b46fed8..22460b059 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -2500,6 +2500,22 @@ a.mail-list-link { clear: both; } +#poke-desc { + margin: 5px 0 10px; +} + +#poke-wrapper { + padding: 10px 0 0px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} + #sidebar-group-list ul { list-style-type: none; } diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 8b87c3bd4..396f32cf9 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -2315,6 +2315,22 @@ a.mail-list-link { clear: both; } +#poke-desc { + margin: 5px 0 10px; +} + +#poke-wrapper { + padding: 10px 0 20px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} + #sidebar-group-list ul { list-style-type: none; } diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 1eda67de1..aaeb74e75 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -2267,6 +2267,20 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } +/* poke */ +#poke-desc { + margin: 5px 0 25px; +} +#poke-recipient, +#poke-action, +#poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, +#poke-action-label, +#prvmail-message-label { + margin: 10px 0 10px; +} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 71569971e..ef408b4cd 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -2267,6 +2267,20 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } +/* poke */ +#poke-desc { + margin: 5px 0 25px; +} +#poke-recipient, +#poke-action, +#poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, +#poke-action-label, +#prvmail-message-label { + margin: 10px 0 10px; +} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 55b81e5da..e31a42746 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -2267,6 +2267,20 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } +/* poke */ +#poke-desc { + margin: 5px 0 25px; +} +#poke-recipient, +#poke-action, +#poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, +#poke-action-label, +#prvmail-message-label { + margin: 10px 0 10px; +} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 3c9915576..19847ad2d 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -1525,6 +1525,18 @@ ul.tabs { &:hover .mail-delete { .opaque(1); } } +/* poke */ +#poke-desc { + margin: 5px 0 25px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 46d8902ae..da180ae61 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -2693,6 +2693,25 @@ margin-left: 0px; border: 1px solid #7C7D7B; } +/* ========== */ +/* = Poke = */ +/* ========== */ +#poke-desc { + margin: 5px 0 20px; +} +#poke-wrapper { + margin: 40px 0 20px; +} +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 20px; +} +#poke-recip { + float: none; +} + /* ================= */ /* = Notifications = */ /* ================= */ diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 1c03edc6b..a6a27832f 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2496,6 +2496,22 @@ a.mail-list-link { border: none; } +/* ========== */ +/* = Poke = */ +/* ========== */ +#poke-desc { + margin: 10px 0 20px; +} +#poke-wrapper { + margin: 40px 0 20px; +} +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 20px; +} + /* ========== */ /* = Events = */ /* ========== */