grahamc/hydra2 - Change GTXYNFUKUWXM5KO2FOJ5RHAMT7GMHABIVMERLA36COZ4ZZ4S2NKQC

Merge branch 'master' into persona

Conflicts: src/lib/Hydra/Helper/CatalystUtils.pm src/root/layout.tt src/root/topbar.tt src/root/user.tt

Created by Eelco Dolstra on November 5, 2013

GTXYNFUKUWXM5KO2FOJ5RHAMT7GMHABIVMERLA36COZ4ZZ4S2NKQC

Dependencies

In channels

main

Change contents

Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 103 [10.3469]
B:BD[9.4333] → [7.359:380]
BD:BD[9.4333] → [7.359:380]
```
    error($c, $msg);
```
Resurrecting zombie bytes in src/lib/Hydra/Helper/CatalystUtils.pm at line 103 [10.3469]
B:B[7.380] → [7.380:427]
BD:B[7.380] → [7.380:427]
```
}
sub accessDenied {
    my ($c, $msg) = @_;
```
Solving an order conflict in src/lib/Hydra/Helper/CatalystUtils.pm at line 103 [10.3469]
[2.603]
[7.380]
Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 108 [10.3469]
B:BD[7.427] → [7.427:458]
BD:BD[7.427] → [7.427:458]
```
    $c->response->status(403);
```
[7.427]
[9.4354]
```
    error($c, $msg, 403);
```
Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 123 [10.3469]
B:BD[11.4373] → [2.604:662]
```
    error($c, "This page requires you to sign in.", 403);
```
Resurrecting zombie bytes in src/lib/Hydra/Helper/CatalystUtils.pm at line 123 [10.3469]
B:B[12.1329] → [7.477:557]
BD:B[12.1329] → [7.477:557]
```
}
sub requireUser {
    my ($c) = @_;
    forceLogin($c) if !$c->user_exists;
```
Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 123 [10.3469]
[11.4373]
[7.477]
```
    accessDenied($c, "This page requires you to sign in.");
```
Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 145 [10.3469]
B:BD[13.1] → [2.663:756]
BD:BD[13.1] → [2.663:756]
```
    error($c, "Only the project members or administrators can perform this operation.", 403)
```
Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 159 [10.3469]
B:BD[14.11269] → [2.757:827]
BD:BD[14.11269] → [2.757:827]
```
    error($c, "Only administrators can perform this operation.", 403)
```

Replacement in src/root/common.tt at line 455 [17.2803]

B:BD[15.2374] → [16.472:540]

    <a href="[% uri %]" [% IF modal %]data-toggle="modal"[% END %]>

[15.2374]

[16.540]

    <a [% HTML.attributes(href => uri) %] [%+ IF modal %]data-toggle="modal"[% END %]>

Deletion in src/root/layout.tt at line 13 [20.11219]
B:BD[18.2897] → [19.0:1]
B:BD[19.1] → [5.618:692]
```
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
```
Solving an order conflict in src/root/layout.tt at line 13 [20.11219]
[21.1179]
[22.618]

Replacement in src/root/layout.tt at line 69 [20.11219]

B:BD[23.1] → [3.0:152]

      [% IF !hideHeader %]
        <div class="page-header">
          <h1><small>[% HTML.escape(title) %]</small></h1>
        </div>
      [% ELSE %]

[23.1]

[3.152]

      [% IF flashMsg %]

Deletion in src/root/layout.tt at line 71 [20.11219]
B:BD[3.167] → [3.167:184]
∅:D[3.184] → [23.1:25]
B:BD[23.1] → [23.1:25]
B:BD[23.25] → [3.185:244]
```
      [% END %]
      [% IF flashMsg %]
        <div class="alert alert-info">[% flashMsg %]</div>
```
Resurrecting zombie bytes in src/root/layout.tt at line 71 [20.11219]
B:B[23.40] → [6.341:400]
BD:B[23.40] → [6.341:400]
```
        <div class="alert alert-info">[% flashMsg %]</div>
```
Insertion in src/root/layout.tt at line 75 [20.11219]
[24.4206]
[3.245]
```
        <br />
```
Deletion in src/root/layout.tt at line 77 [20.11219]
B:BD[24.4221] → [6.401:465]
BD:BD[24.4221] → [6.401:465]
```
        <div class="alert alert-success">[% successMsg %]</div>
```
Solving an order conflict in src/root/layout.tt at line 77 [20.11219]
[3.309]
[24.4283]
Deletion in src/root/layout.tt at line 80 [20.11219]
B:BD[23.138] → [3.310:377]
```
        <div class="alert alert-error">Error: [% errorMsg %]</div>
```

Resurrecting zombie bytes in src/root/layout.tt at line 80 [20.11219]

B:B[23.153] → [6.466:535]

BD:B[23.153] → [6.466:535]

B:B[18.3204] → [8.7015:7131]

BD:B[18.3204] → [8.7015:7131]

        <div class="alert alert-warning">Error: [% errorMsg %]</div>
          <h1><small>[% IF c.user_exists && starUri; INCLUDE makeStar; " "; END; HTML.escape(title) %]</small></h1>

Insertion in src/root/layout.tt at line 80 [20.11219]
[23.138]
[6.466]
```
        <br />
```

Insertion in src/root/layout.tt at line 82 [20.11219]

[6.535]

[8.7015]

      [% END %]
      [% IF !hideHeader %]
        <div class="page-header">

Insertion in src/root/layout.tt at line 87 [20.11219]
[8.7131]
[18.3310]
```
        </div>
      [% ELSE %]
        <br />
```
Deletion in src/root/topbar.tt at line 1 [26.6671]
B:BD[25.448] → [21.2373:2431]
BD:BD[25.448] → [21.2373:2431]
```
    <a [% HTML.attributes(href => uri) %]>[% title %]</a>
```

Replacement in src/root/user.tt at line 76 [27.4561]

B:BD[24.6586] → [4.22:136]

B:BD[24.6586] → [28.5074:5140]

          <select multiple name="roles" class="span3" [% IF !c.check_user_roles('admin') %]disabled="1"[% END %]>
          <select multiple="multiple" name="roles" class="span3">

[24.6586]

[24.6641]

          <select multiple="multiple" name="roles" class="span3" [% IF !c.check_user_roles('admin') %]disabled="1"[% END %]>

Merge branch 'master' into persona

Dependencies

In channels

Change contents

Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 103 [10.3469]

Resurrecting zombie bytes in src/lib/Hydra/Helper/CatalystUtils.pm at line 103 [10.3469]

Solving an order conflict in src/lib/Hydra/Helper/CatalystUtils.pm at line 103 [10.3469]

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 108 [10.3469]

Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 123 [10.3469]

Resurrecting zombie bytes in src/lib/Hydra/Helper/CatalystUtils.pm at line 123 [10.3469]

Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 123 [10.3469]

Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 145 [10.3469]

Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 159 [10.3469]

Replacement in src/root/common.tt at line 455 [17.2803]

Deletion in src/root/layout.tt at line 13 [20.11219]

Solving an order conflict in src/root/layout.tt at line 13 [20.11219]

Replacement in src/root/layout.tt at line 69 [20.11219]

Deletion in src/root/layout.tt at line 71 [20.11219]

Resurrecting zombie bytes in src/root/layout.tt at line 71 [20.11219]

Insertion in src/root/layout.tt at line 75 [20.11219]

Deletion in src/root/layout.tt at line 77 [20.11219]

Solving an order conflict in src/root/layout.tt at line 77 [20.11219]

Deletion in src/root/layout.tt at line 80 [20.11219]

Resurrecting zombie bytes in src/root/layout.tt at line 80 [20.11219]

Insertion in src/root/layout.tt at line 80 [20.11219]

Insertion in src/root/layout.tt at line 82 [20.11219]

Insertion in src/root/layout.tt at line 87 [20.11219]

Deletion in src/root/topbar.tt at line 1 [26.6671]

Replacement in src/root/user.tt at line 76 [27.4561]