views/layout.erb in wackamole-0.0.9 vs views/layout.erb in wackamole-0.1.2
- old
+ new
@@ -7,57 +7,49 @@
<link rel="shortcut icon" href="/images/small_logo.png" type="image/x-icon"/>
<%= stylesheets %w[wackamole] %>
<%= javascripts %w[jquery_min jquery_ui_min] %>
</head>
-<style>
-span#version {
- position: relative;
- top: -12px;
- left: 32px;
- font-weight: bold;
- color: #316071;
-}
-a.logout {
- font-size: 0.8em;
-}
-</style>
<body id="body">
<div id="overall">
<div id="logo">
<span id="version"><%=Wackamole.version%></span>
<%= link_to image_tag( 'wackamole_logo.png', :border => 0 ), '/mission' %>
</div>
- <div id="app_info">
+ <div id="links">
<% if console_auth? and !root_path? %>
<%= link_to "log out", "/session/delete", :class => "site_link logout" %>
<% end %>
- <% if @app_info %>
- <ul>
- <li>«<span><%=@app_info[:app_name]%></span>»</li>
- <li id="env"><%=@app_info[:stage]%></li>
- <ul>
- <% end %>
<% unless root_path? %>
<p><span id="timestamp"><%=partial :'shared/timestamp'%></span></p>
<% end %>
+
+ <% if @app_info and authenticated? %>
+ <ul id="app_info">
+ <li>zone<span class="zone"><%=@app_info[:zone]%></span></li>
+ <li><span class="app"><%=@app_info[:app]%></span><span class="stage"><%=@app_info[:stage]%></span></li>
+ </ul>
+ <% end %>
</div>
<div id="main">
<div class="flash"></div>
- <% if @app_info %>
+ <% if @app_info and authenticated? %>
<div id='navigation' class='corners'>
<% unless Wackamole::Control.single_app? %>
<%=link_to "mission control", "/mission", :class => "site_link land" %> •
<% end %>
- <%=link_to "dashboard" , "/dashboard/#{@app_info[:app_name]}/#{@app_info[:stage]}", :class => "site_link dash" %> •
- <%=link_to "logs" , "/logs/1" , :class => "site_link logs" %> •
- <%=link_to "features" , "/features/1" , :class => "site_link features" %> •
- <%=link_to "users" , "/users/1" , :class => "site_link users" %>
+ <%=link_to "dashboard", "/dashboard/#{@app_info[:zone]}/#{@app_info[:app]}/#{@app_info[:stage]}",
+ :class => "site_link dash" %> •
+ <%=link_to "logs", "/logs/1",
+ :class => "site_link logs" %> •
+ <%=link_to "features", "/features/1",
+ :class => "site_link features" %> •
+ <%=link_to "users", "/users/1",
+ :class => "site_link users" %>
</div>
- <% end %>
-
+ <% end %>
<%= yield %>
</div>
<% unless root_path? %>
<div id="footer" style="text-align:right">
\ No newline at end of file