Commit 40cb3c50 authored by Lisa Seeto's avatar Lisa Seeto Committed by Cecilia Vela Gurovic
Browse files

Bug 1883987: Help Icon for Authentication plugin not aligned properly 



- add new option to pieform element help: top
- add help to rendered div in new order if value is top

Change-Id: I0773d94e8131a6616c3033e7207c7c8f2d4319c8
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
(cherry picked from commit 4f85aeca)
(cherry picked from commit 5a2b6fbb)
parent d18817bd

htdocs/admin/users/institutions.php

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ if ($institution || $add) { 
            'instancearray' => $instancearray,

            'instancestring' => $instancestring,

            'institution' => $institution,

            'help'   => true,

            'help'   => 'top',

            'ignore' => count($authtypes) == 0 || $institution == ''

        );

    }

htdocs/lib/pieforms/pieform/renderers/div.php

+5 −1
Original line number Diff line number Diff line
@@ -96,6 +96,10 @@ function pieform_renderer_div(Pieform $form, $element) {/*{{{*/ 
        $inner .= $element['labelhtml'];

    }



    if (isset($element['helphtml']) && $element['help'] === 'top') {

        $inner .= ' ' . $element['helphtml'];

    }



    if (isset($element['prehtml'])) {

        $inner .= '<span class="prehtml">' . $element['prehtml'] . '</span>';

    }
@@ -108,7 +112,7 @@ function pieform_renderer_div(Pieform $form, $element) {/*{{{*/ 
        $inner .= '<span class="posthtml">' . $element['posthtml'] . '</span>';

    }



    if (isset($element['helphtml'])) {

    if (isset($element['helphtml']) && $element['help'] !== 'top') {

        $inner .= ' ' . $element['helphtml'];

    }