grahamc/hydra - Change JFW656FT5JSDCA5NBNFGTJABIR2LR5VRDRYI7KF54PYNFDSL4DMAC

Add a flag to enable Persona support

It's disabled by default. To enable, add the following to hydra.conf:

enable_persona = 1

Created by Eelco Dolstra on November 6, 2013

JFW656FT5JSDCA5NBNFGTJABIR2LR5VRDRYI7KF54PYNFDSL4DMAC

Dependencies

In channels

main

upstream

Change contents

Insertion in src/lib/Hydra/Controller/Root.pm at line 27 [6.804]

[4.196]

[5.51]

    $c->stash->{personaEnabled} = $c->config->{enable_persona} // "0" eq "1";

Insertion in src/lib/Hydra/Controller/User.pm at line 50 [4.252]

[7.21]

[8.182]


    error($c, "Persona support is not enabled.") unless $c->stash->{personaEnabled};

Replacement in src/root/layout.tt at line 104 [6.11219]

B:BD[9.246] → [9.246:449]

        $.post("[% c.uri_for('/logout') %]")
          .done(function(data) {
            window.location.reload();
          })
          .fail(function() { bootbox.alert("Server request failed!"); });

[9.246]

[9.449]

        [% IF c.user_exists %]
          $.post("[% c.uri_for('/logout') %]")
            .done(function(data) {
              window.location.reload();
            })
            .fail(function() { bootbox.alert("Server request failed!"); });
        [% END %]

Replacement in src/root/layout.tt at line 129 [6.11219]

B:BD[3.191] → [3.191:259]

              success: function(data) { window.location.reload(); }

[3.191]

[3.259]

              success: function(data) { window.location.reload(); },
              postError: function() { navigator.id.logout(); }

Replacement in src/root/static/css/hydra.css at line 110 [6.8691]
B:BD[10.7242] → [10.7242:7243]
```
}
```
[10.7242]
```
}
```
Insertion in src/root/static/js/common.js at line 138 [12.74]
[11.2780]
[11.2780]
```
        if (args.postError) args.postError(data);
```

Replacement in src/root/topbar.tt at line 126 [15.6671]

B:BD[13.311] → [14.56:328]

    [% WRAPPER makeSubMenu title="Sign in" %]
      <li>
        <a href="#" id="persona-signin">
          <img src="https://developer.mozilla.org/files/3963/persona_sign_in_blue.png" alt="Sign in with Persona" />
        </a>
      </li>
      <li class="divider"></li>

[13.311]

[14.328]

    [% IF personaEnabled %]
      [% WRAPPER makeSubMenu title="Sign in" %]
        <li>
          <a href="#" id="persona-signin">
            <img src="https://developer.mozilla.org/files/3963/persona_sign_in_blue.png" alt="Sign in with Persona" />
          </a>
        </li>
        <li class="divider"></li>
        <li>
          <a href="#hydra-signin" data-toggle="modal">Sign in with a Hydra account</a>
        </li>
      [% END %]
    [% ELSE %]

Replacement in src/root/topbar.tt at line 140 [15.6671]

B:BD[14.339] → [2.1806:1891]

        <a href="#hydra-signin" data-toggle="modal">Sign in with a Hydra account</a>

[14.339]

[14.418]

        <a href="#hydra-signin" data-toggle="modal">Sign in</a>