application.html.erb in cloud-toaster-1.1.6

- old
+ new

@@ -17,13 +17,10 @@
     session['service.host'] = Toaster::Config.get("service.host") if "#{session['service.host']}".empty?
     session['service.port'] = Toaster::Config.get("service.port") if "#{session['service.port']}".empty?
     session['db.host'] = Toaster::Config.get("db.host") if "#{session['db.host']}".empty?
     session['db.port'] = Toaster::Config.get("db.port") if "#{session['db.port']}".empty?
     %>
-	<p class="notice"><%= notice %></p>
-    <p class="alert"><%= alert %></p>
-
     <div class="container">
 		<div class="header">
 			<h1>ToASTER<sup>[beta]</sup></h1>
             <% if user_signed_in? %>
                 <div class="userinfo">
@@ -64,14 +61,14 @@
                                 <h2 class="ca-main">Executions</h2>
                                 <h3 class="ca-sub">Inspect automation runs</h3>
                             </div>
                         </a>
                         <ul><li><a href="/execs">Automation Runs</a></li>
-                        <li><a href="/execs/0/tasks">Task Executions</a></li></ul>
+                        <li><a href="/execs/tasks">Task Executions</a></li></ul>
                     </li>
                     <li class="<%= request.path.match(/^\/analysis/) ? "active" : "inactive" %>">
-                        <a href="/analysis/conv">
+                        <a href="/analysis/index">
                             <span class="ca-icon">L</span>
                             <div class="ca-content">
                                 <h2 class="ca-main">Analysis</h2>
                                 <h3 class="ca-sub">Test coverage/results</h3>
                             </div>
@@ -88,26 +85,42 @@
                             </div>
                         </a>
                         <ul><li><a href="/util/chef">Chef</a></li></ul>
                     </li>
                     <li class="<%= request.path.match(/^\/settings/) ? "active" : "inactive" %>">
-                        <a href="/settings/index">
+                        <a href="/settings/config">
                             <span class="ca-icon">K</span>
                             <div class="ca-content">
                                 <h2 class="ca-main">Settings</h2>
                                 <h3 class="ca-sub">Adjust configurations</h3>
                             </div>
                         </a>
-                        <ul><li><a href="/settings/index">Configuration</a></li>
+                        <ul><li><a href="/settings/config">Configuration</a></li>
                         <li><a href="/settings/containers">Containers</a></li></ul>
                     </li>
                 </ul>
 
 		<div class="pages">
-			<div id="quickstart" class="panel">
 			<div class="content">
+				<div class="messages">
+					<% flash.each do |name, msg| 
+						if msg.kind_of?(Array) && msg.size == 1
+							msg = msg[0]
+						end %>
+					<div class="<%= name %>">
+					<%	if msg.kind_of?(Array) %>
+						<ul>
+					<%		msg.each do |msg1| %>
+							<li><%= msg1 %></li>
+				    <% 		end %>
+				    	</ul>
+				    <%	else %>
+							<%= msg %>
+				    <% end %>
+				    </div>
+				    <% end %>
+				</div>
 				<%= yield %>
-			</div>
 			</div>
 		</div>
 	</div>
 </body>
 </html>