grahamc/hydra2 - Change QL55ECJ6KMMBUOWQ6LKSOVN7L43CH4S6SPE2AQ3VX3KSGC32RP4AC

- adapted ui for hydra, more in line with nixos.org website

Created by Rob Vermaas on January 7, 2010

QL55ECJ6KMMBUOWQ6LKSOVN7L43CH4S6SPE2AQ3VX3KSGC32RP4AC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 56 [6.1]
B:BD[6.505] → [6.505:534]
```
    my $resultsPerPage = 50;
```
[6.505]
[6.534]
```
    my $resultsPerPage = 20;
```
Replacement in src/root/all.tt at line 12 [7.1038]
B:BD[7.1298] → [8.0:30]
∅:D[8.30] → [7.1328:1329]
B:BD[7.1328] → [7.1328:1329]
```
[% INCLUDE renderBuildList %]
```
[7.1298]
[5.107]
```
[% BLOCK renderNav %]
```
Insertion in src/root/all.tt at line 23 [7.1038]
[5.117]
[7.1662]
```
[% END %]
```

Insertion in src/root/all.tt at line 25 [7.1038]

[7.1663]


[% INCLUDE renderNav %]
[% INCLUDE renderBuildList %]
[% INCLUDE renderNav %]

Replacement in src/root/common.tt at line 71 [10.2803]
B:BD[9.916] → [9.916:944]
```
          <th>Priority</th>
```
[9.916]
[9.944]
```
          <th>P</th>
```

Replacement in src/root/common.tt at line 80 [10.2803]

∅:D[11.2076] → [9.1059:1088]

B:BD[9.1059] → [9.1059:1088]

        <th>Description</th>

[11.2076]

[9.1088]

        [% IF showDescription %]
          <th>Description</th>
        [% END %]

Insertion in src/root/common.tt at line 125 [10.2803]
[11.2494]
[9.2103]
```
        [% IF showDescription %]
```
Insertion in src/root/common.tt at line 127 [10.2803]
[9.2146]
[9.2146]
```
        [% END -%]
```

Insertion in src/root/common.tt at line 134 [10.2803]

[12.815]

[% BLOCK renderLink %]<a href="[% uri %]">[% title %]</a>[% END %]

File addition: contextbar.tt (----------)

[13.1486]

[% BLOCK makeLinkWrapped %]
  <li [% IF curUri == uri %]class="active"[% END %]>
    <a href="[% uri %]">[% title %]</a>
    [% content %]
  </li>
[% END %]
[% BLOCK makeLink -%]
[% INCLUDE makeLinkWrapped content="" -%]
[% END %]
[% BLOCK makeSubMenu %]
    <ul class="short-menu" id="context-menu">
      [% content %]
    </ul>
[% END %]
[% IF project %]
[% WRAPPER makeSubMenu %]
    [% INCLUDE makeLink
      uri = c.uri_for(c.controller('Project').action_for('view'), [project.name])
       title = project.name %]
  [% IF jobset %]
    [% INCLUDE makeLink
      uri = c.uri_for(c.controller('Jobset').action_for('index'), [project.name, jobset.name])
      title = jobset.name %]
  [% END %]
  [% IF job %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Job').action_for('index'), [project.name, jobset.name, job.name])
        title = job.name %]
  [% END %]
[% END %]
[% END %]

Replacement in src/root/job.tt at line 5 [14.7675]

B:BD[14.7781] → [14.7781:7855]

<h1>Job <tt>[% project.name %]:[% jobset.name %]:[% job.name %]</tt></h1>

[14.7781]

[14.7855]

<h1>Job <tt>[% INCLUDE renderLink
      uri = c.uri_for(c.controller('Project').action_for('view'), [project.name])
       title = project.name %]:[% INCLUDE renderLink
      uri = c.uri_for(c.controller('Jobset').action_for('index'), [project.name, jobset.name])
       title = jobset.name %]:[% job.name %]</tt></h1>

Deletion in src/root/jobset.tt at line 3 [14.8409]
B:BD[14.8624] → [14.8624:8625]

Replacement in src/root/jobset.tt at line 12 [14.8409]

B:BD[14.8930] → [14.8930:8994]

  <h1>Jobset <tt>[% project.name %]:[% jobset.name %]</tt></h1>

[14.8930]

[14.8994]

  <h1>Jobset <tt>[% INCLUDE renderLink
      uri = c.uri_for(c.controller('Project').action_for('view'), [project.name])
       title = project.name %]:[% jobset.name %]</tt></h1>

Deletion in src/root/layout.tt at line 14 [16.11219]

B:BD[15.307] → [3.0:76]

    <link rel="stylesheet" href="/static/css/navbar.css" type="text/css" />

Insertion in src/root/layout.tt at line 15 [16.11219]

[3.156]

[15.307]

    <link rel="stylesheet" href="/static/css/nixos-site.css" type="text/css" />

Replacement in src/root/layout.tt at line 74 [16.11219]

B:BD[16.11584] → [17.3628:3682]

B:BD[17.3682] → [14.14982:15135]

    <div id="container">
      <div id="leftnavbar">
        <div id="logo"><a class="no-hover" href="/"><img src="/static/images/hydra.png" alt="Hydra" /></a></div>
        [% PROCESS navbar.tt %]

[16.11584]

[17.4730]

    <div id="page"> 
 
      <div id="header"> 
        <div id="logo"><a class="no-hover" href="/"><img src="/static/images/hydra.png" alt="Hydra Logo" /></a></div> 
          [% PROCESS topbar.tt %]        
          [% PROCESS contextbar.tt %]

Insertion in src/root/layout.tt at line 81 [16.11219]

[17.4743]

      <div id="main"> 
        [% PROCESS navbar.tt %]

Replacement in src/root/layout.tt at line 84 [16.11219]

B:BD[17.4744] → [17.4744:4834]

B:BD[17.4834] → [2.173:264]

∅:D[2.264] → [18.2083:2141]

B:BD[18.2083] → [18.2083:2141]

∅:D[19.79] → [20.4708:4824]

∅:D[8.1505] → [20.4708:4824]

∅:D[18.2141] → [20.4708:4824]

B:BD[21.615] → [20.4708:4824]

      <div id="content">
        [% content %]
        <div id="footer">
          <hr />
          <em>Hydra [% HTML.escape(version) %] (using [% HTML.escape(nixVersion) %]).</em>
          Page generated on [% INCLUDE renderDateTime %].
          [% IF c.user_exists %]
          You are logged in as <tt>[% c.user.username %]</tt>.
          [% END %]

[17.4744]

[17.4876]

        <div id="content">
          [% content %]

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

Insertion in src/root/layout.tt at line 89 [16.11219]

[17.4904]

[16.11641]

      <div id="footer">
        <div id="last-modified">
        <em>Hydra [% HTML.escape(version) %] (using [% HTML.escape(nixVersion) %]).</em>
        Page generated on [% INCLUDE renderDateTime %].
        [% IF c.user_exists %]
        You are logged in as <tt>[% c.user.username %]</tt>.
        [% END %]
        </div>

Insertion in src/root/navbar.tt at line 5 [14.15137]

[14.15302]

  </li>
[% END %]
[% BLOCK menuItem %]
  <li [% IF "${root}${curUri}" == uri %]class="active"[% END %]>
    <a href="[% uri %]">[% title %]</a>

Replacement in src/root/navbar.tt at line 21 [14.15137]

B:BD[14.15465] → [14.15465:15700]

  <li class="submenu">
    <div class="title [% extra %]"><a class="[% collapsed ? "submenuToggleCollapsed" : "submenuToggleExpanded" %]"
      href="javascript:">[% HTML.escape(title) %]</a></div>
    <ul class="submenu [% extra %]">

[14.15465]

[14.15700]

  <div id="left-title">[% title %]</div>
  <ul id="left-menu">

Replacement in src/root/navbar.tt at line 24 [14.15137]
B:BD[14.15720] → [14.15720:15738]
```
    </ul>
  </li>
```
[14.15720]
[14.15738]
```
  </ul>
```

Replacement in src/root/navbar.tt at line 27 [14.15137]

B:BD[14.15749] → [14.15749:16318]

B:BD[14.16318] → [22.3072:3193]

∅:D[22.3193] → [14.16318:16330]

B:BD[14.16318] → [14.16318:16330]


<ul class="menu">
  
  [% WRAPPER makeSubMenu title="Hydra" collapsed=0  %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('index'))
        title = "Overview" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('queue'))
        title = "Queue" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('all'))
        title = "All builds" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('jobstatus'))
        title = "Job status" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('errors'))
        title = "Errors" %]
  [% END %]

[14.15749]

[14.16330]

[% IF project %]

Insertion in src/root/navbar.tt at line 29 [14.15137]
[14.16331]
[14.16331]
```
<div id="left-bar">  
```

Replacement in src/root/navbar.tt at line 33 [14.15137]

B:BD[14.16424] → [14.16424:16591]

B:BD[14.16591] → [4.3476:3621]

∅:D[4.3621] → [14.16591:16853]

B:BD[14.16591] → [14.16591:16853]

B:BD[14.16853] → [22.3194:3334]

      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Project').action_for('view'), [project.name])
         title = "Overview" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Project').action_for('releases'), [project.name])
         title = "Releases" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Project').action_for('all'), [project.name])
        title = "All builds" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Project').action_for('jobstatus'), [project.name])
        title = "Job status" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Project').action_for('errors'), [project.name])
        title = "Errors" %]

[14.16424]

[14.16853]

      [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) title = "Overview" %]
      [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('releases'), [project.name]) title = "Releases" %]
      [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('all'), [project.name]) title = "All builds" %]
      [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('jobstatus'), [project.name]) title = "Job status" %]
      [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('errors'), [project.name]) title = "Errors" %]

Replacement in src/root/navbar.tt at line 77 [14.15137]

B:BD[14.18027] → [14.18027:18548]


  [% WRAPPER makeSubMenu title="Admin" collapsed=0 %]
      [% IF c.user_exists %]
        [% INCLUDE makeLink
          uri = c.uri_for(c.controller('Root').action_for('logout'))
          title = "Logout" %]
      [% ELSE %]
        [% INCLUDE makeLink
          uri = c.uri_for(c.controller('Root').action_for('login'))
          title = "Login" %]
      [% END %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Project').action_for('create'))
        title = "Create project" %]
  [% END %]
</ul>

[14.18027]

[14.18548]

</div>
[% END %]

Deletion in src/root/navbar.tt at line 81 [14.15137]

B:BD[14.18550] → [14.18550:19037]

<script type="text/javascript">
  $(document).ready(function() {
    $('.submenuToggleExpanded').toggle(
      function () { $(".submenu", $(this).parents(".submenu")).slideUp(); },
      function () { $(".submenu", $(this).parents(".submenu")).slideDown(); }
    );
    $('.submenuToggleCollapsed').toggle(
      function () { $(".submenu", $(this).parents(".submenu")).slideDown(); },
      function () { $(".submenu", $(this).parents(".submenu")).slideUp(); }
    );
  });
</script>

Insertion in src/root/overview.tt at line 36 [14.19073]

[14.20058]


[% IF c.user_exists %]
<p>
  [ [% INCLUDE maybeLink
          uri = c.uri_for(c.controller('Project').action_for('create'))
          content = "Create project" %] ]
</p>
[% END %]

Replacement in src/root/static/css/hydra.css at line 2 [16.8691]
B:BD[3.169] → [3.169:186]
```
    width: 11em;
```
[3.169]
[16.8897]
```
    width: 8em;
```
Insertion in src/root/static/css/hydra.css at line 157 [16.8691]
[23.2011]

File addition: nixos-site.css (----------)

[13.2111]

body {
    background-color: gray;
    margin: 0;
}
/* The main container element. */
div#page {
    max-width: 80em; 
    min-width: 50em;
    min-height: 20em;
    margin: 1em auto;
    background-color: white;
    
    /* Put a rounded border around the page. */
    border: 1px solid black;
    padding: 1em;
    border-radius: 1em;
    -moz-border-radius: 1em;
    -webkit-border-radius: 1em;
    -moz-box-shadow: #404040 0px 5px 50px;
    -webkit-box-shadow: #404040 0px 5px 50px;
}
/* The header. */
div#header {
    border-bottom: 1px solid black;
    position: relative;
    padding-bottom: 1em;
}
div#logo {
    display: inline;
}
ul#top-menu {
    top: 0em;
}
ul#context-menu {
    bottom: 1em;
}
/* The footer. */
div#footer {
    margin-top: 1em;
    border-top: 1px solid black;
    position: relative;
}
div#last-modified {
    font-size: 80%;
    font-style: italic;   
}
ul#bottom-menu {
    bottom: 0em;
}
/* The top and bottom menus. */
ul.short-menu {
    display: block;
    position: absolute;
    right: 0em;
    margin: 0;
    padding: 0;
}
ul.short-menu li {
    display: inline;
    /* Put a ">" in front of the menu item. */
    margin-left: 0.5em;
    padding-left: 1.3em;
    padding-top: 0.5em;
    padding-bottom: 0.5em;
    background-image: url(../images/arrow-right.gif);
    background-repeat: no-repeat;
    background-position: 0.3em center;
}
ul.short-menu li a {
    color: black;
    text-decoration: none;
}
ul.short-menu li a:hover {
    text-decoration: none;
    border-bottom: 1px dotted black;
    background: white;
}
/* The left menu. */
div#main {
    position: relative;
    min-height: 10em;
}
div#left-bar {
    position: absolute;
    left: 0em;
    width: 8em;
    min-height: 10em;
}
div#left-title {
    font-weight: bold;
    padding-bottom: 0.5em;
    margin-bottom: 0.5em;
    border-bottom: 1px dotted black;
}
ul#left-menu {
    padding: 0 0 0 0;
    margin: 0 0 0 0;
}
ul#left-menu li {
    font-size: 90%;
    list-style: none;
    padding-left: 1.3em;
    margin-bottom: 0.5em;
}
ul#left-menu li {
    background-image: url(../images/arrow-right.gif);
    background-repeat: no-repeat;
    background-position: 0 center;
}
ul#left-menu li.active {
    background-image: url(../images/arrow-right-active.gif);
    background-color: #eef2ff;
    font-weight: bold;
    color: #606060;
}
/* The content. */
div#left-bar + div#content {
    margin-left: 9em;
}
/* Inline (floating) images. */
img.inline, img.inlineNoBorder {
    float: right;
    margin-left: 1em;
    margin-bottom: 1em;
}
/* Release tables. */
.reldate {
    font-style: italic;   
}
table.releases td {
    border: 0px;
}
/* Screenshot table. */
table.screenshots {
    border-style: hidden;
}
table.screenshots td {
    vertical-align: middle;
    padding-top: 0.5em;
    padding-bottom: 0.5em;
    border: 0px;
    border-bottom: 1px dotted black;
}

File addition: topbar.tt (----------)

[13.1486]

[% BLOCK makeLinkWrapped %]
  <li [% IF curUri == uri %]class="active"[% END %]>
    <a href="[% uri %]">[% title %]</a>
    [% content %]
  </li>
[% END %]
[% BLOCK makeLink -%]
[% INCLUDE makeLinkWrapped content="" -%]
[% END %]
[% BLOCK makeSubMenu %]
    <ul class="short-menu" id="top-menu">
      [% content %]
    </ul>
  </li>
[% END %]
  [% WRAPPER makeSubMenu title="Hydra" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('index'))
        title = "Overview" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('queue'))
        title = "Queue" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('all'))
        title = "All builds" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('jobstatus'))
        title = "Job status" %]
      [% INCLUDE makeLink
        uri = c.uri_for(c.controller('Root').action_for('errors'))
        title = "Errors" %]
      [% 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 %]
  [% END %]

- adapted ui for hydra, more in line with nixos.org website

Dependencies

In channels

Change contents

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 56 [6.1]

Replacement in src/root/all.tt at line 12 [7.1038]

Insertion in src/root/all.tt at line 23 [7.1038]