From 58067cdfbf72c137e072afd52aaa94d9ee306d05 Mon Sep 17 00:00:00 2001 From: Jonny Tischbein Date: Tue, 11 Dec 2018 19:07:20 +0100 Subject: [PATCH 1/4] Add generic content wrapper + frio btn primary buttons class to newmemeber, unfollow, follow (auto + dfrn) --- mod/newmember.php | 4 +++- view/templates/auto_request.tpl | 6 ++++-- view/templates/dfrn_request.tpl | 8 +++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mod/newmember.php b/mod/newmember.php index cd59cc780c..c2ffe6464e 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -8,7 +8,8 @@ use Friendica\Core\L10n; function newmember_content(App $a) { - $o = '

' . L10n::t('Welcome to Friendica') . '

'; + $o = '
'; + $o .= '

' . L10n::t('Welcome to Friendica') . '

'; $o .= '

' . L10n::t('New Member Checklist') . '

'; $o .= '
'; $o .= L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.'); @@ -54,6 +55,7 @@ function newmember_content(App $a) $o .= '
  • ' . '' . L10n::t('Go to the Help Section') . '
    ' . L10n::t('Our help pages may be consulted for detail on other program features and resources.') . '
    • ' . EOL; $o .= ''; $o .= '
    '; + $o .= '
    '; return $o; } diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl index c7e10482ef..9c737cf55a 100644 --- a/view/templates/auto_request.tpl +++ b/view/templates/auto_request.tpl @@ -1,3 +1,4 @@ +

    {{$header}}

    {{if $myaddr == ""}} @@ -53,8 +54,9 @@
    {{if $submit}} - + {{/if}} - +
    +
    \ No newline at end of file diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl index 8e686c33dc..2f363f5653 100644 --- a/view/templates/dfrn_request.tpl +++ b/view/templates/dfrn_request.tpl @@ -1,3 +1,4 @@ +

    {{$header}}

    {{if $myaddr}} @@ -61,7 +62,7 @@ -
    +
    @@ -83,8 +84,9 @@
    {{if $submit}} - + {{/if}} - +
    +
    \ No newline at end of file From 443210b4f0b6b2f9dd8e892da11e3331e0b04c01 Mon Sep 17 00:00:00 2001 From: Jonny Tischbein Date: Tue, 11 Dec 2018 23:25:33 +0100 Subject: [PATCH 2/4] move templates to frio theme --- view/templates/auto_request.tpl | 6 +- view/templates/dfrn_request.tpl | 8 +- view/theme/frio/templates/auto_request.tpl | 62 +++++++++++++++ view/theme/frio/templates/dfrn_request.tpl | 92 ++++++++++++++++++++++ 4 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 view/theme/frio/templates/auto_request.tpl create mode 100644 view/theme/frio/templates/dfrn_request.tpl diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl index 9c737cf55a..c7e10482ef 100644 --- a/view/templates/auto_request.tpl +++ b/view/templates/auto_request.tpl @@ -1,4 +1,3 @@ -

    {{$header}}

    {{if $myaddr == ""}} @@ -54,9 +53,8 @@
    {{if $submit}} - + {{/if}} - +
    -
    \ No newline at end of file diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl index 2f363f5653..8e686c33dc 100644 --- a/view/templates/dfrn_request.tpl +++ b/view/templates/dfrn_request.tpl @@ -1,4 +1,3 @@ -

    {{$header}}

    {{if $myaddr}} @@ -62,7 +61,7 @@ -
    +
    @@ -84,9 +83,8 @@
    {{if $submit}} - + {{/if}} - +
    -
    \ No newline at end of file diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl new file mode 100644 index 0000000000..9c737cf55a --- /dev/null +++ b/view/theme/frio/templates/auto_request.tpl @@ -0,0 +1,62 @@ +
    +

    {{$header}}

    + +{{if $myaddr == ""}} +

    +{{$page_desc}}
    +

    +

    +

    +{{$invite_desc}} +

    +

    +{{$desc}} +

    +{{/if}} + +{{if $request}} +
    +{{else}} + +{{/if}} + +{{if $photo}} + +{{/if}} + +{{if $url}}
    {{$url_label}}
    {{$url}}
    {{/if}} +{{if $location}}
    {{$location_label}}
    {{$location}}
    {{/if}} +{{if $keywords}}
    {{$keywords_label}}
    {{$keywords}}
    {{/if}} +{{if $about}}
    {{$about_label}}
    {{$about}}
    {{/if}} + +
    + + {{if $myaddr}} + {{$myaddr}} + + {{else}} + + {{/if}} + {{if $url}} + + {{/if}} +
    +
    + + +
    + +
    + +
    + {{if $submit}} + + {{/if}} + +
    +
    +
    \ No newline at end of file diff --git a/view/theme/frio/templates/dfrn_request.tpl b/view/theme/frio/templates/dfrn_request.tpl new file mode 100644 index 0000000000..2f363f5653 --- /dev/null +++ b/view/theme/frio/templates/dfrn_request.tpl @@ -0,0 +1,92 @@ +
    +

    {{$header}}

    + +{{if $myaddr}} +{{else}} +

    +{{$page_desc}}
    +

    +{{$invite_desc}} +

    +

    +{{$desc}} +

    +{{/if}} + +{{if $request}} +
    +{{else}} + +{{/if}} + +{{if $photo}} + +{{/if}} + +{{if $url}}
    {{$url_label}}
    {{$url}}
    {{/if}} +{{if $location}}
    {{$location_label}}
    {{$location}}
    {{/if}} +{{if $keywords}}
    {{$keywords_label}}
    {{$keywords}}
    {{/if}} +{{if $about}}
    {{$about_label}}
    {{$about}}
    {{/if}} + +
    + + {{if $myaddr}} + {{$myaddr}} + + {{else}} + + {{/if}} + {{if $url}} + + {{/if}} +
    +
    + +

    +{{$pls_answer}} +

    + +
    + +{{include file="field_yesno.tpl" field=$does_know_you}} + + +

    +{{$add_note}} +

    +
    + +
    + + +
    + +
    + {{if $submit}} + + {{/if}} + +
    +
    +
    \ No newline at end of file From dc7e6edca9bbf1b26cda130b1000159b00a7af63 Mon Sep 17 00:00:00 2001 From: Jonny Tischbein Date: Fri, 14 Dec 2018 13:29:59 +0100 Subject: [PATCH 3/4] Add page-wrapper to oauth/edit in frio --- view/theme/frio/templates/settings/oauth_edit.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/theme/frio/templates/settings/oauth_edit.tpl b/view/theme/frio/templates/settings/oauth_edit.tpl index 91dfa04551..160004c6ed 100644 --- a/view/theme/frio/templates/settings/oauth_edit.tpl +++ b/view/theme/frio/templates/settings/oauth_edit.tpl @@ -1,4 +1,4 @@ - +

    {{$title}}

    @@ -16,3 +16,4 @@
    +
    \ No newline at end of file From 5d817380341ab338bd85cf91589cc9efa7fdd65c Mon Sep 17 00:00:00 2001 From: Jonny Tischbein Date: Mon, 17 Dec 2018 23:15:14 +0100 Subject: [PATCH 4/4] Add page-wrapper for probe + webfinder --- mod/probe.php | 4 +++- mod/webfinger.php | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mod/probe.php b/mod/probe.php index b448ffd2b2..7c41df8ac5 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -15,7 +15,8 @@ function probe_content(App $a) killme(); } - $o = '

    Probe Diagnostic

    '; + $o = '
    '; + $o .= '

    Probe Diagnostic

    '; $o .= '
    '; $o .= 'Lookup address: '; @@ -30,6 +31,7 @@ function probe_content(App $a) $o .= str_replace("\n", '
    ', print_r($res, true)); $o .= ''; } + $o .= '
    '; return $o; } diff --git a/mod/webfinger.php b/mod/webfinger.php index 01743f05b0..a48d2dba6b 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -20,7 +20,8 @@ function webfinger_content(App $a) killme(); } - $o = '

    Webfinger Diagnostic

    '; + $o = '
    '; + $o .= '

    Webfinger Diagnostic

    '; $o .= ''; $o .= 'Lookup address: '; @@ -35,5 +36,7 @@ function webfinger_content(App $a) $o .= str_replace("\n", '
    ', print_r($res, true)); $o .= ''; } + $o .= '
    '; + return $o; }