Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

normalize crawler and no-js views

This commit is contained in:
Jeff Atwood 2015-01-15 01:31:30 -08:00
parent 4cf4f1f252
commit 6b30f8444e
4 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/_head.html.erb
View File

@ -4,4 +4,6 @@
<link rel="icon" type="image/png" href="<%=SiteSetting.favicon_url%>"> <link rel="icon" type="image/png" href="<%=SiteSetting.favicon_url%>">
<link rel="apple-touch-icon" type="image/png" href="<%=SiteSetting.apple_touch_icon_url%>"> <link rel="apple-touch-icon" type="image/png" href="<%=SiteSetting.apple_touch_icon_url%>">
<meta name="viewport" content="width=720, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes">
<%= canonical_link_tag %> <%= canonical_link_tag %>

1
app/views/layouts/application.html.erb
View File

@ -8,7 +8,6 @@
<%= render partial: "common/special_font_face" %> <%= render partial: "common/special_font_face" %>
<%= render partial: "common/discourse_stylesheet" %> <%= render partial: "common/discourse_stylesheet" %>
<%= discourse_csrf_tags %> <%= discourse_csrf_tags %>
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<%- if SiteSetting.enable_escaped_fragments? %> <%- if SiteSetting.enable_escaped_fragments? %>
<meta name="fragment" content="!"> <meta name="fragment" content="!">

18
app/views/layouts/crawler.html.erb
View File

@ -9,27 +9,19 @@
<%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %> <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %>
<%- end %> <%- end %>
<%= yield :head %> <%= yield :head %>
<meta name="viewport" content="width=720, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes"> <style>
img { width: 100%; height: auto; }
</style>
</head> </head>
<body> <body>
<%- unless customization_disabled? %> <%- unless customization_disabled? %>
<%= SiteCustomization.custom_header(session[:preview_style]) %> <%= SiteCustomization.custom_header(session[:preview_style]) %>
<%- end %> <%- end %>
<header class="d-header"> <header>
<div class="container"> <a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
<div class="contents">
<div class="row">
<div class="title span13">
<a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
</div>
</div>
</div>
</div>
</header> </header>
<div id="main-outlet" class="container"> <div id="main-outlet" class="container">
<!-- preload-content: -->
<%= yield %> <%= yield %>
<!-- :preload-content -->
</div> </div>
<footer class="container"> <footer class="container">
<p><%= t 'powered_by_html' %></p> <p><%= t 'powered_by_html' %></p>

38
app/views/layouts/no_js.html.erb
View File

@ -2,39 +2,29 @@
<html lang="<%= SiteSetting.default_locale %>"> <html lang="<%= SiteSetting.default_locale %>">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><%=SiteSetting.title%></title> <title><%= content_for?(:title) ? yield(:title) + ' - ' + SiteSetting.title : SiteSetting.title %></title>
<meta name="description" content=""> <meta name="description" content="<%= @description_meta || SiteSetting.site_description %>">
<%= render partial: "layouts/head" %> <%= render partial: "layouts/head" %>
<%- unless customization_disabled? %> <%- unless customization_disabled? %>
<%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %> <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %>
<%- end %> <%- end %>
<%= yield(:no_js_head) %> <%= yield(:no_js_head) %>
<meta name="viewport" content="width=720, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes"> <style>
img { width: 100%; height: auto; }
</style>
</head> </head>
<body> <body>
<%- unless customization_disabled? %> <%- unless customization_disabled? %>
<%= SiteCustomization.custom_header(session[:preview_style]) %> <%= SiteCustomization.custom_header(session[:preview_style]) %>
<%- end %> <%- end %>
<section id='main'> <header>
<header class="d-header"> <a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
<div class="container"> </header>
<div class="contents"> <div id="main-outlet" class="container">
<div class="row"> <%= yield %>
<div class="title span13"> </div>
<a href="/"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a> <footer class="container">
</div> <p><%= t 'powered_by_html' %></p>
<% unless current_user %> </footer>
<div class='panel clearfix'>
<a href="/login" class='btn btn-primary btn-small'><i class="fa fa-user"></i><%= I18n.t('log_in') %></a>
</div>
<% end %>
</div>
</div>
</div>
</header>
<div id="main-outlet" class="container">
<%= yield %>
</div>
</section>
</body> </body>
</html> </html>