grahamc/hydra - Change 7ZQAHJQMEEREYP3PZAPO5JUMEDX4CNNJCCHTFQNEPOZZUJCIOVHQC

Fix indentation

Also move flashing into layout.tt.

Created by Eelco Dolstra on February 20, 2013

7ZQAHJQMEEREYP3PZAPO5JUMEDX4CNNJCCHTFQNEPOZZUJCIOVHQC

Dependencies

In channels

main

upstream

Change contents

Deletion in src/root/build.tt at line 64 [9.7350]
B:BD[7.5757] → [8.1630:1631]
Deletion in src/root/build.tt at line 65 [9.7350]
B:BD[8.1632] → [8.1632:1650]
B:BD[8.1650] → [10.0:49]
∅:D[10.49] → [8.1686:1696]
B:BD[8.1686] → [8.1686:1696]
```
[% IF flashMsg %]
[% flashMsg %]
[% END %]
```

Insertion in src/root/layout.tt at line 106 [9.11219]

[11.7353]

[6.3142]


      [% IF flashMsg %]
        <br />
        <p class="btn-info btn-large">[% flashMsg %]</p>
      [% END %]

Insertion in src/root/layout.tt at line 112 [9.11219]

[6.3143]

      [% IF errorMsg %]
        <br />
        <p class="btn-warning btn-large">Error: [% errorMsg %]</p>
      [% END %]

Deletion in src/root/login.tt at line 3 [13.4453]
∅:D[12.9683] → [13.4525:4526]
B:BD[13.4525] → [13.4525:4526]
B:BD[13.4526] → [12.9684:9771]
```
[% IF errorMsg %]
Error: [% errorMsg %]
[% END %]
```
Deletion in src/root/queue.tt at line 5 [16.1]
∅:D[14.72] → [15.2390:2409]
∅:D[17.147] → [15.2390:2409]
∅:D[12.15923] → [15.2390:2409]
B:BD[16.92] → [15.2390:2409]
B:BD[15.2409] → [3.0:49]
∅:D[3.49] → [15.2445:2455]
B:BD[15.2445] → [15.2445:2455]
```
[% IF flashMsg %]
[% flashMsg %]
[% END %]
```
Deletion in src/root/topbar.tt at line 5 [18.6671]
B:BD[18.6819] → [18.6819:6830]
B:BD[18.6830] → [19.6546:6608]
```
[% END %]
[% BLOCK makeLink %]
[% INCLUDE makeLinkWrapped content="" %]
```
Deletion in src/root/topbar.tt at line 15 [18.6671]
B:BD[18.7019] → [18.7019:7020]

Deletion in src/root/topbar.tt at line 26 [18.6671]

B:BD[11.10980] → [11.10980:11015]

∅:D[20.30] → [18.7185:7277]

∅:D[11.11015] → [18.7185:7277]

B:BD[18.7185] → [18.7185:7277]

B:BD[18.7277] → [11.11016:11088]

∅:D[21.269] → [18.7304:7394]

∅:D[11.11088] → [18.7304:7394]

B:BD[18.7304] → [18.7304:7394]

B:BD[18.7394] → [11.11089:11121]


  <ul class="nav" id="top-menu">
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('queue'))
        title = "Queue ("_ nrRunningBuilds _"/"_ nrQueuedBuilds _")" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('all'))
        title = "All builds" %]

Replacement in src/root/topbar.tt at line 27 [18.6671]

B:BD[11.11122] → [11.11122:11148]

[% IF project || admin %]

[11.11122]

[11.11148]

<ul class="nav" id="top-menu">
  [% INCLUDE makeLink
     uri = c.uri_for(c.controller('Root').action_for('queue'))
     title = "Queue ("_ nrRunningBuilds _"/"_ nrQueuedBuilds _")" %]
  [% INCLUDE makeLink
     uri = c.uri_for(c.controller('Root').action_for('all'))
     title = "All builds" %]

Replacement in src/root/topbar.tt at line 45 [18.6671]

∅:D[5.29] → [11.11935:12219]

B:BD[11.11935] → [11.11935:12219]

B:BD[11.12219] → [22.0:138]

B:BD[22.138] → [23.37301:37322]

∅:D[23.37322] → [22.160:280]

B:BD[22.160] → [22.160:280]

          <li class="divider"></li>
          [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create_jobset'), [project.name]) title = "Create new jobset" %]
          [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'edit') title="Edit project" %]
          [% IF project.hidden %]
              [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'unhide') title = "Unhide" %]
          [% ELSE %]
              [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'hide') title = "Hide" %]
          [% END %]

[5.29]

[11.12219]

        <li class="divider"></li>
        [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create_jobset'), [project.name]) title = "Create new jobset" %]
        [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'edit') title="Edit project" %]
        [% IF project.hidden %]
          [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'unhide') title = "Unhide" %]
        [% ELSE %]
          [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'hide') title = "Hide" %]
        [% END %]

Deletion in src/root/topbar.tt at line 56 [18.6671]
B:BD[11.12261] → [23.37323:37324]

Replacement in src/root/topbar.tt at line 77 [18.6671]

∅:D[2.29] → [11.13176:13212]

B:BD[11.13176] → [11.13176:13212]

B:BD[11.13212] → [24.2872:2986]

∅:D[24.2986] → [11.13212:13324]

B:BD[11.13212] → [11.13212:13324]

B:BD[11.13324] → [12.16489:16757]

∅:D[12.16757] → [22.538:571]

B:BD[22.538] → [22.538:571]

∅:D[22.571] → [25.0:115]

B:BD[24.3262] → [25.0:115]

B:BD[25.115] → [23.37325:37346]

∅:D[23.37346] → [25.116:227]

B:BD[24.3394] → [25.116:227]

∅:D[25.227] → [24.3500:3520]

B:BD[24.3500] → [24.3500:3520]

          <li class="divider"></li>
          [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'clone') title="Clone jobset" %]
          [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'edit') title="Edit jobset" %]
          [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('force_eval'), project.name, jobset.name) content = "Evaluate" confirmmsg = ("Are you sure you want to force evaluation of jobset " _ project.name _ ":" _ jobset.name _ "?") class = "" %]
          [% IF jobset.hidden %]
              [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'unhide') title = "Unhide" %]
          [% ELSE %]
              [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'hide') title = "Hide" %]
          [% END %]

[2.29]

[11.13438]

        <li class="divider"></li>
        [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'clone') title="Clone jobset" %]
        [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'edit') title="Edit jobset" %]
        [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('force_eval'), project.name, jobset.name) content = "Evaluate" confirmmsg = ("Are you sure you want to force evaluation of jobset " _ project.name _ ":" _ jobset.name _ "?") class = "" %]
        [% IF jobset.hidden %]
          [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'unhide') title = "Unhide" %]
        [% ELSE %]
          [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'hide') title = "Hide" %]
        [% END %]

Deletion in src/root/topbar.tt at line 87 [18.6671]
B:BD[11.13454] → [24.3521:3523]
Deletion in src/root/topbar.tt at line 89 [18.6671]
B:BD[11.13480] → [23.37347:37348]

Deletion in src/root/topbar.tt at line 104 [18.6671]

B:BD[11.14173] → [12.16758:17020]

∅:D[12.17020] → [11.14413:14414]

B:BD[11.14413] → [11.14413:14414]

    <li>[% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('users')) content = "Manage users" class = "" %]</li>
    <li>[% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('news')) content = "Manage news" class = "" %]</li>

Replacement in src/root/topbar.tt at line 107 [18.6671]
B:BD[11.14441] → [11.14441:14452]
B:BD[11.14452] → [26.1677:1692]
```
[% END %]
[% IF build %]
```
[11.14441]
[26.1692]
```
  [% IF build %]
```

Replacement in src/root/topbar.tt at line 113 [18.6671]

B:BD[27.29] → [27.29:65]

∅:D[27.65] → [28.55:85]

B:BD[28.55] → [28.55:85]

B:BD[28.85] → [27.66:359]

          <li class="divider"></li>
          [% INCLUDE makeLink
            uri = c.uri_for('/build' build.id 'clone')
            title = "Clone build" %]
          [% IF !available %]
          [% ELSIF build.keep %]
              [% INCLUDE makeLink
                 uri = c.uri_for('/build' build.id 'keep' 0)
                 title = "Unkeep build" %]

[27.29]

[27.359]

        <li class="divider"></li>
        [% INCLUDE makeLink
          uri = c.uri_for('/build' build.id 'clone')
          title = "Clone build" %]
        [% IF available %]
          [% IF build.keep %]
            [% INCLUDE makeLink
               uri = c.uri_for('/build' build.id 'keep' 0)
               title = "Unkeep build" %]

Replacement in src/root/topbar.tt at line 123 [18.6671]

B:BD[27.380] → [27.380:516]

              [% INCLUDE makeLink
                 uri = c.uri_for('/build' build.id 'keep' 1)
                 title = "Keep build" %]

[27.380]

[27.516]

            [% INCLUDE makeLink
               uri = c.uri_for('/build' build.id 'keep' 1)
               title = "Keep build" %]

Insertion in src/root/topbar.tt at line 127 [18.6671]
[27.536]
[28.196]
```
        [% END %]
        [% IF build.finished %]
```

Insertion in src/root/topbar.tt at line 132 [18.6671]

[27.633]

[4.0]

        [% END %]
        [% IF !build.finished %]

Insertion in src/root/topbar.tt at line 137 [18.6671]
[4.124]
[28.318]
```
        [% END %]
```
Deletion in src/root/topbar.tt at line 139 [18.6671]
B:BD[28.334] → [28.334:335]
Replacement in src/root/topbar.tt at line 140 [18.6671]
B:BD[26.1845] → [23.37349:37350]
∅:D[23.37350] → [26.1848:1858]
B:BD[26.1848] → [26.1848:1858]
```
[% END %]
```
[26.1845]
[26.1858]
```
  [% END %]
```
Replacement in src/root/topbar.tt at line 142 [18.6671]
∅:D[26.1859] → [11.14452:14514]
B:BD[11.14452] → [11.14452:14514]
```
[% IF c.user_exists %]
  [% IF c.check_user_roles('admin') %]
```
[26.1859]
[11.14514]
```
  [% IF c.user_exists && c.check_user_roles('admin') %]
```
Replacement in src/root/topbar.tt at line 167 [18.6671]
B:BD[12.17188] → [12.17188:17207]
∅:D[12.17207] → [11.15622:15631]
B:BD[11.15622] → [11.15622:15631]
```
        class = ""
      %]
```
[12.17188]
[11.15631]
```
        class = "" %]
```

Replacement in src/root/topbar.tt at line 170 [18.6671]

B:BD[11.15706] → [11.15706:15830]

          [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create')) title = "Create new project" %]

[11.15706]

[11.15830]

        [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create')) title = "Create new project" %]

Deletion in src/root/topbar.tt at line 172 [18.6671]
B:BD[11.15846] → [11.15846:15847]
Replacement in src/root/topbar.tt at line 173 [18.6671]
B:BD[11.15861] → [11.15861:15871]
```
[% END %]
```
[11.15861]
[11.15871]
```
  [% END %]
```

Insertion in src/root/topbar.tt at line 175 [18.6671]

[11.15872]

  [% IF c.user_exists %]
    [% INCLUDE makeLink uri = c.uri_for(c.controller('Root').action_for('logout')) title = "Sign out" %]
  [% ELSE %]
    [% INCLUDE makeLink uri = c.uri_for(c.controller('Root').action_for('login')) title = "Sign in" %]

Replacement in src/root/topbar.tt at line 181 [18.6671]

∅:D[11.15885] → [18.7675:7704]

∅:D[29.327678] → [18.7675:7704]

B:BD[18.7675] → [18.7675:7704]

∅:D[30.11613] → [18.7704:7993]

B:BD[18.7704] → [18.7704:7993]

B:BD[18.8006] → [18.8006:8007]

B:BD[18.8007] → [11.15886:15894]

      [% IF c.user_exists %]
        [% INCLUDE makeLink
          uri = c.uri_for(c.controller('Root').action_for('logout'))
          title = "Sign out" %]
      [% ELSE %]
        [% INCLUDE makeLink
          uri = c.uri_for(c.controller('Root').action_for('login'))
          title = "Sign in" %]
      [% END %]
  </ul>

[11.15885]

</ul>

Fix indentation

Dependencies

In channels

Change contents

Deletion in src/root/build.tt at line 64 [9.7350]

Deletion in src/root/build.tt at line 65 [9.7350]

Insertion in src/root/layout.tt at line 106 [9.11219]

Insertion in src/root/layout.tt at line 112 [9.11219]

Deletion in src/root/login.tt at line 3 [13.4453]

Deletion in src/root/queue.tt at line 5 [16.1]

Deletion in src/root/topbar.tt at line 5 [18.6671]

Deletion in src/root/topbar.tt at line 15 [18.6671]

Deletion in src/root/topbar.tt at line 26 [18.6671]

Replacement in src/root/topbar.tt at line 27 [18.6671]

Replacement in src/root/topbar.tt at line 45 [18.6671]

Deletion in src/root/topbar.tt at line 56 [18.6671]

Replacement in src/root/topbar.tt at line 77 [18.6671]

Deletion in src/root/topbar.tt at line 87 [18.6671]

Deletion in src/root/topbar.tt at line 89 [18.6671]

Deletion in src/root/topbar.tt at line 104 [18.6671]

Replacement in src/root/topbar.tt at line 107 [18.6671]

Replacement in src/root/topbar.tt at line 113 [18.6671]

Replacement in src/root/topbar.tt at line 123 [18.6671]

Insertion in src/root/topbar.tt at line 127 [18.6671]

Insertion in src/root/topbar.tt at line 132 [18.6671]

Insertion in src/root/topbar.tt at line 137 [18.6671]

Deletion in src/root/topbar.tt at line 139 [18.6671]

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

Replacement in src/root/topbar.tt at line 142 [18.6671]

Replacement in src/root/topbar.tt at line 167 [18.6671]

Replacement in src/root/topbar.tt at line 170 [18.6671]

Deletion in src/root/topbar.tt at line 172 [18.6671]

Replacement in src/root/topbar.tt at line 173 [18.6671]

Insertion in src/root/topbar.tt at line 175 [18.6671]

Replacement in src/root/topbar.tt at line 181 [18.6671]