heidi 0.3.1 → 0.4.0

data/lib/heidi/web/views/build.erb

@@ -1,29 +1,45 @@
-<h1><%= project.name %></h1>
+<%= erb :project_header, :locals => { :project => project } %>
 
-<a href="/projects/<%= project.basename %>"><< back</a>
-<br /><br />
+<header class="subhead">
+  <div class="subnav">
+  <ul class="nav nav-pills">
+    <% if build.status == "passed" %>
+    <li class="active">
+      <a href='/projects/<%= project.basename %>/build/<%= build.commit %>/tar_ball'>download</a>
+    </li>
+    <% end %>
+    <% build.logs.each do |log| %>
+      <li><a href="#<%= log.file_name %>"><%= log.file_name %></a></li>
+    <% end %>
+  </ul>
+  </div>
+</header>
 
-<h2 class="<%= build.status %>"><%= build.commit %></h2>
-<div class="column">
-<% if build.status == "passed" %>
- <a href='/projects/<%= project.basename %>/build/<%= build.commit %>/tar_ball'>download</a>
-<br /><br />
-<% end %>
+<section id="details">
+  <div class="row">
+    <div class="span9">
+      <h2 class="<%= build.status %>">Build <%= build.commit %></h2>
+      <br />
+      <br />
+    </div>
+    <div class="span3">
+      <a href="/projects/<%= project.basename %>/commit/<%= build.commit %>">Want to see the commit?</a>
+    </div>
+  </div>
+</section>
 
-| <% build.logs.each do |log| %>
- <a href="#<%= log.file_name %>"><%= log.file_name %></a> |
-<% end %>
-</div>
-<div class="column">
-  <a href="/projects/<%= project.basename %>/commit/<%= build.commit %>">Want to see the commit?</a>
-</div>
-<br class="clear" />
-<br />
-<br />
 
-<% build.logs.each do |log| %>
-  <h3 class="log"><%= log.file_name %></h3>
-  <a name="<%= log.file_name %>" href="#top" class="top">top</a>
+
+<section id="logs">
+  <% build.logs.each do |log| %>
+  <div class="row">
+    <div class="span11">
+      <h3 class="log"><%= log.file_name %></h3>
+    </div>
+    <div class="span1">
+      <a name="<%= log.file_name %>" href="#top" class="top">^^ top</a>
+    </div>
+  </div>
   <pre class="terminal"><%= ansi_color_codes(h(log.contents)) %></pre>
-<% end %>
-<br /><br />
+  <% end %>
+</section>

data/lib/heidi/web/views/commit.erb

@@ -1,10 +1,13 @@
-<h1><%= project.name %></h1>
+<%= erb :project_header, :locals => { :project => project } %>
 
-<a href="/projects/<%= project.basename %>"><< back</a>
-<br /><br />
+<section id="commit">
+  <div class="row">
+    <div class="span12">
+      <h2><%= commit %></h2>
 
-<h2><%= commit %></h2>
+      <pre class="terminal"><%= ansi_color_codes(h(stat)) %>
 
-<pre class="terminal"><%= ansi_color_codes(h(stat)) %>
-
-<%= ansi_color_codes(h(diff)) %></pre>
+<%= ansi_color_codes(h(diff)) %></pre>
+    </div>
+  </div>
+</section>

data/lib/heidi/web/views/config.erb

@@ -1,21 +1,37 @@
-<h1>Configure <%= project.name %></h1>
+<%= erb :project_header, :locals => { :project => project } %>
 
-<form method="POST" action="/projects/<%= project.basename %>">
-  <label for="name">Name</label>
-  <input type="text" name="name" value="<%= project.name %>" />
-  <br />
-  <br />
+<section id="config">
+  <h2>Configuration</h2>
 
-  <label for="branch">Integration branch</label>
-  <select name="branch">
-    <option value="">...</option>
-    <% project.integration_branches.each do |branch| %>
-      <% branch_name = branch.split("/").last %>
-      <option value="<%= branch_name %>" <%= "selected" if branch_name == project.integration_branch %>><%= branch %></option>
-    <% end %>
-  </select>
+  <div class="well">
+    <form method="POST" action="/projects/<%= project.basename %>">
+    <div class="field">
+      <label for="name">Name</label>
+      <input type="text" name="name" value="<%= project.name %>" />
+    </div>
 
-  <br />
-  <br />
-  <input type="submit" />
-</form>
+    <div class="field">
+      <label for="branch">Integration branch</label>
+      <select name="branch">
+        <option value="">...</option>
+        <% project.integration_branches.each do |branch| %>
+          <% branch_name = branch.gsub("origin/", "") %>
+          <option value="<%= branch_name %>" <%= "selected" if branch_name == project.branch %>><%= branch %></option>
+        <% end %>
+      </select>
+    </div>
+
+    <br />
+    <div class="btn-toolbar">
+      <div class="btn-group">
+        <a class="btn" href="/projects/<%= project.basename %>">&laquo; Cancel</a>
+        <button class="btn" name="reset" type="reset" value="0">Reset</button>
+      </div>
+
+      <div class="btn-group">
+        <button class="btn btn-success" name="submit" type="submit" value="1">Save &raquo;</button>
+      </div>
+    </div>
+  </form>
+</div>
+</section>

data/lib/heidi/web/views/home.erb

@@ -1,32 +1,51 @@
-<div class="column">
-  <h1>Projects</h1>
-  <ul class="projects">
-    <% projects.each do |project| %>
-      <li class="<%= project.build_status %>">
-        <a href="/projects/<%= project.basename %>"><%= project.name %></a>
-        - <%= project.build_status %>
-      </li>
-    <% end %>
-  </ul>
+<style>
+  ul.projects li { margin-bottom: 5px; }
+  ul.projects li a { display: inline-block; min-width: 120px; }
+</style>
+<div class="hero-unit">
+  <h1>Welcome to Heidi!</h1>
+  <p>A simple, naive, yet powerful Continious Integration ... thingy...</p>
+  <p><a href="https://github.com/OrganisedMinds/heidi/blob/develop/README.rdoc" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
 </div>
 
-<div class="column" style="width: 500px;">
-  <img src='/images/HeidiBlue-480.png' />
-  <br /><br />
+<section>
+<div class="row">
+  <div class="span4">
+    <h2>Projects</h2>
+    <ul class="projects">
+      <% projects.sort_by(&:basename).each do |project| %>
+        <li class="<%= project.build_status %>">
+          <a href="/projects/<%= project.basename %>"><%= project.name %></a>
+          <span class="label <%= status2label(project.build_status) %>"><%= project.build_status.empty? ? "unknown" : project.build_status %></span>
+        </li>
+      <% end %>
+    </ul>
+    <br />
+    <a href="/projects/" class="btn btn-success"><strong>+</strong> &nbsp;new project</a>
+  </div>
 
-  <p>Heidi is OpenSource. Fork, patch and improve it at <a
-    href="https://github.com/coffeeaddict/heidi">GitHub</a></p>
+  <div class="span4">
+    <h2>About Heidi!</h2>
+    <p>Heidi is OpenSource. Fork, patch and improve it at <a
+      href="https://github.com/OrganisedMinds/heidi">GitHub</a></p>
 
-  <p>Heidi is proudly sponsored by <a
-    href="http://organisedminds.com">organisedminds.com</a> (a super useful
-  flexible tool for collaborating in teams and projects across geographic
-  locations) Check it out!</p>
+    <p>Heidi is proudly sponsored by <a
+      href="http://organisedminds.com">organisedminds.com</a> (a super useful
+    flexible tool for collaborating in teams and projects across geographic
+    locations) Check it out!</p>
 
-  <br /><br />
-  <center>
-    <a href="http://organisedminds.com" title="Sponsored by OrganisedMinds.com">
-      <img src="/images/OrganisedMinds.png" alt="OrganisedMinds.com" />
-    </a>
-  </center>
+    <br /><br />
+    <center>
+      <a href="http://organisedminds.com" title="Sponsored by OrganisedMinds.com">
+        <img src="/images/OrganisedMinds.png" alt="OrganisedMinds.com" />
+      </a>
+    </center>
+  </div>
 
+  <div class="span4">
+    <div class="thumbnail">
+      <img src='/images/HeidiBlue-480.png' alt="Heidi!, artist & copyrights unknown"/>
+    </div>
+  </div>
 </div>
+</section>

data/lib/heidi/web/views/layout.erb

@@ -1,13 +1,66 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
-    <link rel="stylesheet" media="screen" href="/css/screen.css" />
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+    <meta charset="utf-8">
     <title>Heidi!</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le styles -->
+    <link href="/css/bootstrap.css" rel="stylesheet">
+    <style>
+      body {
+        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+      }
+      section {
+        padding-bottom: 20px;
+      }
+    </style>
+    <link href="/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="/css/colors.css" rel="stylesheet">
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="/images/favicon.ico">
   </head>
+
   <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/">Heidi!</a>
+        </div>
+      </div>
+    </div>
+
     <div class="container">
+      <%= breadcrumbs %>
       <%= yield %>
-    </div>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="/js/jquery.js"></script>
+    <script src="/js/bootstrap-transition.js"></script>
+    <script src="/js/bootstrap-alert.js"></script>
+    <script src="/js/bootstrap-modal.js"></script>
+    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-scrollspy.js"></script>
+    <script src="/js/bootstrap-tab.js"></script>
+    <script src="/js/bootstrap-tooltip.js"></script>
+    <script src="/js/bootstrap-popover.js"></script>
+    <script src="/js/bootstrap-button.js"></script>
+    <script src="/js/bootstrap-collapse.js"></script>
+    <script src="/js/bootstrap-carousel.js"></script>
+    <script src="/js/bootstrap-typeahead.js"></script>
+
   </body>
 </html>

data/lib/heidi/web/views/new_project.erb

@@ -0,0 +1,56 @@
+<header>
+  <div class="row">
+    <div class="span9">
+      <h1>New Project</h1>
+    </div>
+    <div class="span3">
+      <ul class="nav nav-list">
+        <li>
+          <a href="/"><i class="icon-home"></i>Home</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</header>
+
+<br />
+<section id="form">
+  <div class="row">
+    <div class="span12 well">
+      <div class="alert alert-error">
+        <strong>Attention! Attention!</strong><br />
+        The new-project-over-web feature is 'highly expirimental' at best.<br />
+        Best results are obtained with small repos
+      </div>
+      <br />
+
+      <form method="post" action="/projects/">
+        <div class="field">
+          <label for="name">Name</label>
+          <input type="text" name="name" id="name" value="" />
+        </div>
+        <div class="field">
+          <label for="origin">Origin</label>
+          <input type="text" name="origin" id="origin" value="" />
+        </div>
+        <div class="field">
+          <label for="branch">Branch</label>
+          <input type="text" name="branch" id="branch" value="master" />
+        </div>
+
+        <br />
+        <div class="btn-toolbar">
+          <div class="btn-group">
+            <a class="btn" href="/">&laquo; Cancel</a>
+            <button class="btn" name="reset" type="reset" value="0">Reset</button>
+          </div>
+
+          <div class="btn-group">
+            <button class="btn btn-success" name="submit" type="submit" value="1">Save &raquo;</button>
+          </div>
+        </div>
+      </form>
+
+    </div>
+  </div>
+</section>

data/lib/heidi/web/views/project.erb

@@ -1,37 +1,119 @@
-<h1><%= project.name %></h1>
-
-<a href="/"><< back</a><br /><br />
-<h2 class="<%= project.build_status %>"><%= project.build_status %></h2>
-
-<%
-  builds = project.builds
-  current = builds.select { |b| b.commit == project.current_build }.first
-  latest  = builds.select { |b| b.commit == project.latest_build }.first
-%>
-
-<div class="column">
-  <h2>Overview</h2>
-  <strong class="label">Current</strong> :
-  <% unless current.nil? %>
-    <a class="<%= current.status %>" href="/projects/<%= project.basename %>/build/<%= current.commit %>"><%= current.commit %></a>
-  <% end %>
+<%= erb :project_header, :locals => { :project => project } %>
+
+<br />
+<section id="details">
+  <div class="row">
+    <div class="alert <%= status2alert(project.build_status) %> span11">
+      Build status: <strong><%= project.build_status %></strong>
+    </div>
+  </div>
+
+  <%
+    builds = project.builds
+    current = builds.select { |b| b.commit == project.current_build }.first
+    latest  = builds.select { |b| b.commit == project.latest_build }.first
+  %>
+
   <br />
-  <strong class="label">Latest successful</strong> :
-  <% unless latest.nil? %>
-    <a class="<%= latest.status %>" href="/projects/<%= project.basename %>/build/<%= latest.commit %>"><%= latest == current ? "current" : latest.commit %></a>
-  <% end %>
+  <div class="row">
+    <div class="span6">
+      <h2>Overview</h2>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span6 well">
+      <% if project.locked? %>
+        <span class="label label-warning">Locked</span>
+        <br /><br />
+      <% end %>
+      <div class="row" style="padding-bottom: 5px">
+        <div class="span2"><strong>Current</strong></div>
+        <div class="span2">
+          <% unless current.nil? %>
+            <a href="/projects/<%= project.basename %>/build/<%= current.commit %>">
+              <span class="label <%= status2label(current.status) %>">
+                <%= current.commit %>
+              </span>
+            </a>
+          <% end %>
+        </div>
+      </div>
+
+
+      <div class="row" style="padding-bottom: 5px">
+        <div class="span2"><strong>Last successful</strong></div>
+        <div class="span2">
+          <% unless latest.nil? %>
+            <a href="/projects/<%= project.basename %>/build/<%= latest.commit %>">
+              <span class="label <%= status2label(latest.status) %>">
+                <%= latest == current ? "Current" : latest.commit %>
+              </span>
+            </a>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="span2"><strong>Integration branch</strong></div>
+        <div class="span4">
+          <span class="label label-info"><%= project.branch %></span>
+          <a class="pull-right btn btn-success" href="/projects/<%= project.basename %>/fetch">Fetch & Integrate</a>
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+</section>
+
+<section id="history">
   <br />
-  <strong class="label">Integration branch</strong> :
-  <%= project.integration_branch %>
+  <h2>Build history</h2>
+
   <br />
-</div>
-<div class="column">
-  <a href="/projects/<%= project.basename %>/configure">Configure <%= project.name %></a>
-</div>
-<br class="clear"/>
-<br />
-<br />
 
-<h2>Build history</h2>
-<pre class="history terminal"><% project.log.each do |line| %><% build = nil %><%= ansi_color_codes line[:graph] %><% unless line[:commit].nil? %><a href="/projects/<%= project.basename %>/commit/<%= line[:commit] %>"><%= line[:commit] %></a><% if (build = line[:build]) %><a class="build" href="/projects/<%= project.basename %>/build/<%= build.commit %>"><%= ansi_color_codes(line[:message]) %></a> <span class="status">[<span class="<%= build.status %>"><%= build.status %></span>] (<%= build.date %>, <%= build.author.gsub '<', '&lt;' %>)</span><% else %><%= ansi_color_codes line[:message] %><% end %><% end %>
+  <div class="row">
+    <div class="span12">
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="#gitlog" data-toggle="tab">Git log</a></li>
+        <li><a href="#buildlist" data-toggle="tab">Builds list</a></li>
+      </ul>
+
+      <div class="tab-content">
+        <div class="tab-pane active" id="gitlog">
+          <pre class="terminal"><% project.log.each do |line| %><% build = nil %><%= ansi_color_codes line[:graph] %><% unless line[:commit].nil? %><a href="/projects/<%= project.basename %>/commit/<%= line[:commit] %>"><%= line[:commit] %></a><% if (build = line[:build]) %><a class="build" href="/projects/<%= project.basename %>/build/<%= build.commit %>"><%= ansi_color_codes(line[:message]) %></a> <span class="status">[<span class="<%= build.status %>"><%= build.status %></span>] (<%= build.date %>, <%= build.author.gsub '<', '&lt;' %>)</span><% else %><%= ansi_color_codes line[:message] %><% end %><% end %>
 <% end %></pre>
+        </div>
+        <div class="tab-pane" id="buildlist">
+          <div class="accordion" id="build_accordion">
+            <% project.builds.sort_by(&:time).reverse.each do |build| %>
+              <div class="accordion-group">
+                <div class="accordion-heading">
+                  <a class="pull-left accordion-toggle" data-toggle="collapse" data-parent="#build_accordion" href="#<%= build.commit %>"><%= build.commit %></a>
+                  <span class="pull-left label <%= status2label(build.status) %>" style="margin-top: 5px"><%= build.status %></span>
+                  <br class="clear" />
+                </div>
+                <div id="<%= build.commit %>" class="accordion-body collapse">
+                  <div class='accordion-inner'>
+                    <%= build.message.gsub("\n", '<br />') %>
+                    <br />
+
+                    <strong>Author</strong>: <%= build.author %><br />
+                    <strong>Date</strong>: <%= build.date %><br />
+                    <br />
+                    <div class="btn-group">
+                      <a class="btn" href="/projects/<%= project.basename %>/build/<%= build.commit %>">Open</a>
+                      <% if !build.tar_ball.nil? %>
+                        <a class="btn btn-info" href="/projects/<%= project.basename %>/build/<%= build.commit %>/tar_ball">Download</a>
+                      <% end %>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>