app/views/layouts/lines/application.html.erb in lines-engine-0.6.2 vs app/views/layouts/lines/application.html.erb in lines-engine-0.9.0

- old
+ new

@@ -8,27 +8,39 @@ <meta name="robots" content="index,follow" /> <%= display_meta_tags site: CONFIG[:title_short] %> <meta name="geo.position" CONTENT="<%= CONFIG[:geo_position] %>"> <meta name="geo.placename" CONTENT="<%= CONFIG[:geo_address] %>"> <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1" /> - <link rel="icon" href="/favicon.png" type="image/png" /> + <%= favicon_link_tag %> <%= yield :head %> + <%= auto_discovery_link_tag(:atom, articles_url(format: "atom"), {title: CONFIG[:feed_title]}) %> <%= stylesheet_link_tag "lines/application", media: "all" %> <%= javascript_include_tag "lines/application" %> <%= csrf_meta_tags %> </head> <body> <% if current_lines_user %> - <%= render_navbar { "" } %> + <%= render_navbar do %> + <%= link_to 'New Article', new_admin_article_path, class: "btn btn-new-article highlight" %> + <%= link_to 'Dashboard', admin_articles_path, class: "btn btn-view-blog" %> + <% end %> <div class="spacer"></div> <% end %> +<%= render 'layouts/lines/markdown_cheatsheet' %> + <header> <div id="logo"> - <a href="/"><img src="<%= CONFIG[:logo] %>" alt="Logo Lines" /></a> + <a href="/"> + <% if CONFIG[:logo].empty? %> + <%= CONFIG[:blog_name] %> + <% else %> + <img src="<%= CONFIG[:logo] %>" alt="<%= CONFIG[:blog_name] %>" /> + <% end %> + </a> </div> <div id="lines"> - <%= CONFIG[:short_description] %> + <%= CONFIG[:short_description].html_safe %> </div> </header> <div class="container"> <%= render 'lines/shared/flash' %>