maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix linting issues in app/views/layouts (#1884) [ci skip]

Browse source
This commit is contained in:
Arnelle Balane 2019-02-26 03:40:32 +08:00 • committed by Mac Siri
parent ac7b0328df
commit 75e8c43125
7 changed files with 118 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_nav_menu.html.erb
View file

@ -29,7 +29,7 @@
<div class="option">
Key Links
</div>
</a>
</a>
<a href="/signout_confirm" data-no-instant id="last-nav-link">
<div class="option">
Sign Out

60
app/views/layouts/_signup_modal.html.erb
View file

@ -1,30 +1,30 @@
<div class="global-signup-modal" id="global-signup-modal" style="display:none">
<div class="global-signup-modal--bg" id="global-signup-modal-bg">
<button class="close-modal-button">
<img src="<%= asset_path("cancel.svg") %>" class="search-img" alt="close-button"/>
</button>
</div>
<div class="global-signup-modal--inner-a">
<%=image_tag(cl_image_path(asset_path("/assets/sloan.png"),
:type=>"fetch",
:width => 300,
:crop => "imagga_scale",
:quality => "auto",
:flags => "progressive",
:fetch_format => "auto",
:sign_url => true), class:"sloan", alt:"sloth-mascot") %>
<h1>Join our DEV Community :)</h1>
<p>
We’re a place where coders share, stay up-to-date and grow their careers.
</p>
<a href="/users/auth/twitter?callback_url=<%= ApplicationConfig["APP_PROTOCOL"] %><%= ApplicationConfig["APP_DOMAIN"] %>/users/auth/twitter/callback" class="sign-up-link cta" data-no-instant>
<img src="<%= asset_path("twitter-logo.svg") %>" class="icon-img" alt="Twitter"/> Auth With Twitter
</a>
<a href="/users/auth/github?state=signup-modal" class="sign-up-link cta" data-no-instant>
<img src="<%= asset_path("github-logo.svg") %>" class="icon-img" alt="GitHub"/> Auth With GitHub
</a>
<p>
<em>We strive for transparency and don't collect excess data.</em>
</p>
</div>
</div>
<div class="global-signup-modal" id="global-signup-modal" style="display:none">
<div class="global-signup-modal--bg" id="global-signup-modal-bg">
<button class="close-modal-button">
<img src="<%= asset_path("cancel.svg") %>" class="search-img" alt="close-button" />
</button>
</div>
<div class="global-signup-modal--inner-a">
<%= image_tag(cl_image_path(asset_path("/assets/sloan.png"),
type: "fetch",
width: 300,
crop: "imagga_scale",
quality: "auto",
flags: "progressive",
fetch_format: "auto",
sign_url: true), class: "sloan", alt: "sloth-mascot") %>
<h1>Join our DEV Community :)</h1>
<p>
We’re a place where coders share, stay up-to-date and grow their careers.
</p>
<a href="/users/auth/twitter?callback_url=<%= ApplicationConfig["APP_PROTOCOL"] %><%= ApplicationConfig["APP_DOMAIN"] %>/users/auth/twitter/callback" class="sign-up-link cta" data-no-instant>
<img src="<%= asset_path("twitter-logo.svg") %>" class="icon-img" alt="Twitter" /> Auth With Twitter
</a>
<a href="/users/auth/github?state=signup-modal" class="sign-up-link cta" data-no-instant>
<img src="<%= asset_path("github-logo.svg") %>" class="icon-img" alt="GitHub" /> Auth With GitHub
</a>
<p>
<em>We strive for transparency and don't collect excess data.</em>
</p>
</div>
</div>

86
app/views/layouts/_styles.html.erb
View file

@ -1,80 +1,80 @@
<% cache "base_inline_styles_#{@story_show.to_s}_#{@article_index.to_s}_#{@home_page.to_s}_#{@article_show.to_s}_#{view_class.to_s}_#{@notifications_index}_#{core_pages?.to_s}_#{@tags_index}_#{ApplicationConfig["DEPLOYMENT_SIGNATURE"].to_s}x_xs__", :expires_in => 8.hours do %>
<% cache "base_inline_styles_#{@story_show}_#{@article_index}_#{@home_page}_#{@article_show}_#{view_class}_#{@notifications_index}_#{core_pages?}_#{@tags_index}_#{ApplicationConfig['DEPLOYMENT_SIGNATURE']}x_xs__", expires_in: 8.hours do %>
<% if @story_show %>
<style>
<% Rails.application.config.assets.compile = true %>
<%= Rails.application.assets['scaffolds.css'].to_s.html_safe %>
<%= Rails.application.assets['top-bar.css'].to_s.html_safe %>
<%= Rails.application.assets["scaffolds.css"].to_s.html_safe %>
<%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
<% if @article_show %>
<%= Rails.application.assets['article-show.css'].to_s.html_safe %>
<%= Rails.application.assets['comments.css'].to_s.html_safe %>
<%= Rails.application.assets['more-articles.css'].to_s.html_safe %>
<%= Rails.application.assets["article-show.css"].to_s.html_safe %>
<%= Rails.application.assets["comments.css"].to_s.html_safe %>
<%= Rails.application.assets["more-articles.css"].to_s.html_safe %>
<%= Rails.application.assets["syntax.css"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.scss"].to_s.html_safe %>
<%= Rails.application.assets["sticky-nav.css"].to_s.html_safe %>
<% else %>
<%= Rails.application.assets['article-show.css'].to_s.html_safe %>
<%= Rails.application.assets['podcast-episodes-show.css'].to_s.html_safe %>
<%= Rails.application.assets['comments.css'].to_s.html_safe %>
<%= Rails.application.assets["article-show.css"].to_s.html_safe %>
<%= Rails.application.assets["podcast-episodes-show.css"].to_s.html_safe %>
<%= Rails.application.assets["comments.css"].to_s.html_safe %>
<% end %>
<%= Rails.application.assets['footer.css'].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
</style>
<% elsif @article_index %>
<style>
<% Rails.application.config.assets.compile = true %>
<%= Rails.application.assets['scaffolds.css'].to_s.html_safe %>
<%= Rails.application.assets['articles.css'].to_s.html_safe %>
<%= Rails.application.assets['top-bar.css'].to_s.html_safe %>
<%= Rails.application.assets["scaffolds.css"].to_s.html_safe %>
<%= Rails.application.assets["articles.css"].to_s.html_safe %>
<%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
<% unless @home_page %>
<%= Rails.application.assets['user-profile-header.css'].to_s.html_safe %>
<%= Rails.application.assets['sidebar-data.scss'].to_s.html_safe %>
<%= Rails.application.assets['index-comments.css'].to_s.html_safe %>
<%= Rails.application.assets['footer.css'].to_s.html_safe %>
<%= Rails.application.assets["user-profile-header.css"].to_s.html_safe %>
<%= Rails.application.assets["sidebar-data.scss"].to_s.html_safe %>
<%= Rails.application.assets["index-comments.css"].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
<% end %>
<% if @tag_model %>
<%= Rails.application.assets['preact/sidebar-widget.css'].to_s.html_safe %>
<%= Rails.application.assets["preact/sidebar-widget.css"].to_s.html_safe %>
<% end %>
</style>
<% elsif @notifications_index || @reading_list_items_index %>
<style>
<% Rails.application.config.assets.compile = true %>
<%= Rails.application.assets['scaffolds.css'].to_s.html_safe %>
<%= Rails.application.assets['articles.css'].to_s.html_safe %>
<%= Rails.application.assets['comments.css'].to_s.html_safe %>
<%= Rails.application.assets['notifications.css'].to_s.html_safe %>
<%= Rails.application.assets['top-bar.css'].to_s.html_safe %>
<%= Rails.application.assets['user-profile-header.css'].to_s.html_safe %>
<%= Rails.application.assets['footer.css'].to_s.html_safe %>
<%= Rails.application.assets["scaffolds.css"].to_s.html_safe %>
<%= Rails.application.assets["articles.css"].to_s.html_safe %>
<%= Rails.application.assets["comments.css"].to_s.html_safe %>
<%= Rails.application.assets["notifications.css"].to_s.html_safe %>
<%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
<%= Rails.application.assets["user-profile-header.css"].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.scss"].to_s.html_safe %>
</style>
<% elsif view_class.start_with? "comments"%>
<% elsif view_class.start_with? "comments" %>
<style>
<%= Rails.application.assets['scaffolds.css'].to_s.html_safe %>
<%= Rails.application.assets['top-bar.css'].to_s.html_safe %>
<%= Rails.application.assets['comments.css'].to_s.html_safe %>
<%= Rails.application.assets['footer.css'].to_s.html_safe %>
<%= Rails.application.assets["scaffolds.css"].to_s.html_safe %>
<%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
<%= Rails.application.assets["comments.css"].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.scss"].to_s.html_safe %>
<%= Rails.application.assets["syntax.css"].to_s.html_safe %>
<% if view_class.include? "comments-settings" %>
<%= Rails.application.assets['article-show.css'].to_s.html_safe %>
<%= Rails.application.assets["article-show.css"].to_s.html_safe %>
<% end %>
</style>
<% elsif view_class.include? "registrations"%>
<% elsif view_class.include? "registrations" %>
<style>
<%= Rails.application.assets['top-bar.css'].to_s.html_safe %>
<%= Rails.application.assets['scaffolds.css'].to_s.html_safe %>
<%= Rails.application.assets['article_form.css'].to_s.html_safe %>
<%= Rails.application.assets['footer.css'].to_s.html_safe %>
<%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
<%= Rails.application.assets["scaffolds.css"].to_s.html_safe %>
<%= Rails.application.assets["article_form.css"].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
</style>
<% elsif view_class.include? "users-index"%>
<% elsif view_class.include? "users-index" %>
<style>
<%= Rails.application.assets['scaffolds.css'].to_s.html_safe %>
<%= Rails.application.assets['top-bar.css'].to_s.html_safe %>
<%= Rails.application.assets['leaderboard.css'].to_s.html_safe %>
<%= Rails.application.assets['footer.css'].to_s.html_safe %>
<%= Rails.application.assets["scaffolds.css"].to_s.html_safe %>
<%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
<%= Rails.application.assets["leaderboard.css"].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
</style>
<% elsif core_pages? %>
<%= stylesheet_link_tag 'minimal', media: 'all' %>
<%= stylesheet_link_tag "minimal", media: "all" %>
<% else %>
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= stylesheet_link_tag "application", media: "all" %>
<% end %>
<% end %>

53
app/views/layouts/_top_bar.html.erb
View file

@ -2,34 +2,33 @@
</div>
<div class="top-bar" id="top-bar">
<nav>
<a href="/" class="logo-link" id="logo-link" aria-label="DEV Home"><%= inline_svg("devplain.svg", class: "logo", size: '20% * 20%') %></a>
<div id="nav-search-form-root">
<div class="nav-search-form">
<form acceptCharset="UTF-8" method="get">
<input class="nav-search-form__input" type="text" name="q" id="nav-search" placeholder="search" autoComplete="off" />
</form>
</div>
</div>
<a href="/new" id="write-link" class="cta nav-link write">WRITE A POST</a>
<a href="/connect" id="connect-link" class="nav-link connect-icon" aria-label="Connect">
<%=inline_svg("connect.svg", size: '100% * 100%')%>
<div class="connect-number" id="connect-number"></div>
</a>
<a href="/notifications" id="notifications-link" class="nav-link notifications-icon" aria-label="Notifications">
<%=inline_svg("bell.svg", size: '100% * 100%')%>
<div class="notifications-number" id="notifications-number"></div>
</a>
<div class="navbar-menu-wrapper" id="navbar-menu-wrapper">
<button class="navigation-butt" id="navigation-butt" aria-label="Navigation">
<% if user_signed_in? %>
<div class="nav-profile-image-wrapper"><img alt="" class="nav-profile-image" id="nav-profile-image"/>
<% else %>
<%= inline_svg("menu.svg", class: "bars", size: '20% * 20%') %>
<% end %>
</button>
<div class="menubg" id="menubg"></div>
<%= render "layouts/nav_menu" %>
<a href="/" class="logo-link" id="logo-link" aria-label="DEV Home"><%= inline_svg("devplain.svg", class: "logo", size: "20% * 20%") %></a>
<div id="nav-search-form-root">
<div class="nav-search-form">
<form acceptCharset="UTF-8" method="get">
<input class="nav-search-form__input" type="text" name="q" id="nav-search" placeholder="search" autoComplete="off" />
</form>
</div>
</div>
<a href="/new" id="write-link" class="cta nav-link write">WRITE A POST</a>
<a href="/connect" id="connect-link" class="nav-link connect-icon" aria-label="Connect">
<%= inline_svg("connect.svg", size: "100% * 100%") %>
<div class="connect-number" id="connect-number"></div>
</a>
<a href="/notifications" id="notifications-link" class="nav-link notifications-icon" aria-label="Notifications">
<%= inline_svg("bell.svg", size: "100% * 100%") %>
<div class="notifications-number" id="notifications-number"></div>
</a>
<div class="navbar-menu-wrapper" id="navbar-menu-wrapper">
<button class="navigation-butt" id="navigation-butt" aria-label="Navigation">
<% if user_signed_in? %>
<div class="nav-profile-image-wrapper"><img alt="" class="nav-profile-image" id="nav-profile-image" />
<% else %>
<%= inline_svg("menu.svg", class: "bars", size: "20% * 20%") %>
<% end %>
</button>
<div class="menubg" id="menubg"></div>
<%= render "layouts/nav_menu" %>
</div>
</nav>
</div>

26
app/views/layouts/application.html.erb
View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<% title = yield(:title) %>
<title><%= title || 'DEV Community' %></title>
<title><%= title || "DEV Community" %></title>
<% if internal_navigation? %>
<style>
.universal-page-content-wrapper{
@ -37,23 +37,23 @@
<%= javascript_pack_tag "manifest", defer: true %>
<%= javascript_pack_tag "vendor", defer: true %>
<%= javascript_pack_tag 'Search', defer: true %>
<%= javascript_pack_tag "Search", defer: true %>
<% if core_pages? %>
<%= javascript_include_tag 'base', defer: true %>
<%= javascript_include_tag "base", defer: true %>
<% if user_signed_in? %>
<%= javascript_pack_tag 'Onboarding', defer: true %>
<%= javascript_pack_tag "Onboarding", defer: true %>
<% end %>
<% end %>
<% if !core_pages? %>
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= stylesheet_link_tag "application", media: "all" %>
<% if render_js? %>
<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
<%= javascript_include_tag 'application' %>
<%= javascript_include_tag "application" %>
<% end %>
<% end %>
<% if view_class == "users users-signout_confirm" %>
<%= javascript_include_tag 'application' %>
<%= javascript_include_tag "application" %>
<% end %>
<%= yield(:page_meta) %>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@ -67,12 +67,12 @@
<meta name="apple-mobile-web-app-title" content="dev.to">
<meta name="application-name" content="dev.to">
<meta property="fb:pages" content="568966383279687" />
<meta name="theme-color" content="#000000"/>
<meta name="theme-color" content="#000000" />
<% if view_class.include? "users-signout_confirm" %>
<%= csrf_meta_tags %>
<% end %>
<link rel="manifest" href="/manifest.json" />
<link rel="search" href="https://dev.to/search.xml" type="application/opensearchdescription+xml" title="The DEV Community"/>
<link rel="search" href="https://dev.to/search.xml" type="application/opensearchdescription+xml" title="The DEV Community" />
<% end %>
</head>
<body data-user-status="<%= user_logged_in_status %>" data-pusher-key="<%= ApplicationConfig["PUSHER_KEY"] %>">
@ -81,7 +81,7 @@
<%= yield(:audio) %>
</div>
<% end %>
<% cache("application-top-bar--#{user_signed_in?}--#{internal_navigation?}", :expires_in => 100.hours) do %>
<% cache("application-top-bar--#{user_signed_in?}--#{internal_navigation?}", expires_in: 100.hours) do %>
<%= render "layouts/top_bar" unless internal_navigation? %>
<% end %>
<div id="message-notice"></div>
@ -91,13 +91,13 @@
</div>
</div>
<% unless internal_navigation? %>
<% cache("footer-and-signup-modal--#{user_signed_in?}--#{ApplicationConfig["DEPLOYMENT_SIGNATURE"].to_s}", :expires_in => 200.hours) do %>
<% cache("footer-and-signup-modal--#{user_signed_in?}--#{ApplicationConfig['DEPLOYMENT_SIGNATURE']}", expires_in: 200.hours) do %>
<%= render "layouts/footer" %>
<%= render "layouts/signup_modal" unless user_signed_in? %>
<% end %>
<div id="live-article-indicator" class="live-article-indicator"></div>
<%= image_tag("twitter-logo.svg", class:"icon-img", style:"display:none") %>
<%= image_tag("github-logo.svg", class:"icon-img", style:"display:none") %>
<%= image_tag("twitter-logo.svg", class: "icon-img", style: "display:none") %>
<%= image_tag("github-logo.svg", class: "icon-img", style: "display:none") %>
<% end %>
</body>
</html>

4
app/views/layouts/internal.html.erb
View file

@ -21,7 +21,7 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
<!-- Latest compiled and minified JavaScript -->
<%= javascript_include_tag 'internal' %>
<%= javascript_include_tag "internal" %>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> </head>
<style>
.starter-template{padding-top:60px;font-size:1.4em;}
@ -112,7 +112,7 @@
<div class="starter-template">
<% flash.each do |type, message| %>
<div class="alert alert-<%= type %>">
<button class="close"data-dismiss="alert">X</button>
<button class="close" data-dismiss="alert">X</button>
<%= message %>
</div>
<% end %>

6
app/views/layouts/mailer.html.erb
View file

@ -14,10 +14,10 @@
<% else %>
Reminder: You used <b>Twitter</b> to authenticate your account, so use that to sign in if prompted.
<% end %>
<br/><br/>
<br /><br />
<div style="font-size:0.78em">
<%if @unsubscribe %>
<%= link_to "Unsubscribe", email_subscriptions_unsubscribe_url(ut: @unsubscribe), style:"color:#7d7d7d" %> | <a href="https://dev.to/settings/notifications" style="color:#7d7d7d">Adjust your email settings</a>
<% if @unsubscribe %>
<%= link_to "Unsubscribe", email_subscriptions_unsubscribe_url(ut: @unsubscribe), style: "color:#7d7d7d" %> | <a href="https://dev.to/settings/notifications" style="color:#7d7d7d">Adjust your email settings</a>
<% else %>
Don't want to get emails like this? Adjust your email settings at <a href="https://dev.to/settings/notifications">dev.to/settings/notifications</a>
<% end %>