homepage redesign
This commit is contained in:
Lee Lawlor
7
app/views/layouts/_flash.html.erb
Normal file
7
app/views/layouts/_flash.html.erb
Normal file
@ -0,0 +1,7 @@
|
||||
<% if notice.present? %>
|
||||
<p class="flash alert alert-success"><%= notice %><span class="dismiss">X</span></p>
|
||||
<% end %>
|
||||
<% if alert.present? %>
|
||||
<p class="flash alert alert-danger"><%= alert %><span class="dismiss">X</span></p>
|
||||
<% end %>
|
||||
|
||||
@ -1,71 +1,20 @@
|
||||
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<%= link_to root_path do %>
|
||||
<%= image_tag 'thingspeak_logo.png', :size => '190x50', :style => 'padding: 0 8px;' %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<head>
|
||||
<title><%= @title.nil? ? (@menu.nil? ? 'ThingSpeak' : @menu.capitalize + ' - ThingSpeak') : @title + ' - ThingSpeak' %></title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootswatch/3.1.1/cerulean/bootstrap.min.css" />
|
||||
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" media="screen" rel="stylesheet" />
|
||||
<%= stylesheet_link_tag 'application' %>
|
||||
|
||||
<% if current_user %>
|
||||
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
|
||||
<script type='text/javascript' src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
|
||||
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"></script>
|
||||
<%= javascript_include_tag 'application' %>
|
||||
|
||||
<li class="<%= "active " if @menu == 'channels' %>dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=t(:channels)%> <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= link_to t(:channels_my), channels_path %></li>
|
||||
<li><%= link_to t(:watched_channels), watched_channels_path %></li>
|
||||
<li><%= link_to t(:channels_public), public_channels_path %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li <%= "class=active" if @menu == 'plugins' %>><%= link_to t(:plugins), plugins_path %></li>
|
||||
<li class="<%= "active " if @menu == 'account' %>dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=t(:account)%> <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= link_to t(:myaccount), account_path %></li>
|
||||
<li><%= link_to t(:account_edit), edit_account_path %></li>
|
||||
<li><%= link_to t(:public_profile), user_profile_path(current_user.login) %></li>
|
||||
<li><%= link_to t(:profile_edit), edit_profile_path %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<% if current_admin_user.present? %>
|
||||
<li><%= link_to t(:admin), "/admin" %></li>
|
||||
<% end %>
|
||||
<%= csrf_meta_tag %>
|
||||
<% if Rails.env == 'production' %>
|
||||
<%= render 'layouts/ga' %>
|
||||
<% end %>
|
||||
|
||||
<% else %>
|
||||
<li <%= "class=active" if @menu == 'channels' %>><%= link_to t(:channels), public_channels_path %></li>
|
||||
<li <%= "class=active" if @menu == 'features' %>><%= link_to t(:features), features_pages_path %></li>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
|
||||
<li class="<%= "active " if @menu == 'support' %>dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=t(:support)%> <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="/docs"><%= t(:documentation) %></a></li>
|
||||
<li><a href="http://community.thingspeak.com/tutorials/"><%= t(:tutorials) %></a></li>
|
||||
<li><a href="http://community.thingspeak.com/forum/"><%= t(:forum) %></a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li><a href="http://community.thingspeak.com/"><%= t(:blog)%></a></li>
|
||||
|
||||
<% if current_user %>
|
||||
<li><%= link_to t(:signout), logout_path %></li>
|
||||
<% else %>
|
||||
<li><%= link_to t(:signin), login_path %></li>
|
||||
<li><%= link_to t(:signup), new_user_registration_path %></li>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
</div><!--/.nav-collapse -->
|
||||
</div>
|
||||
</div>
|
||||
<%= yield :head %>
|
||||
</head>
|
||||
|
||||
|
||||
70
app/views/layouts/_nav.html.erb
Normal file
70
app/views/layouts/_nav.html.erb
Normal file
@ -0,0 +1,70 @@
|
||||
<div class="navbar navbar-inverse navbar-default navbar-fixed-top" role="navigation">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<%= link_to root_path do %>
|
||||
<%= image_tag 'thingspeak_logo_white.png', :size => '188x35', :style => 'padding: 0 8px; margin-top: 7px;' %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
|
||||
<% if current_user %>
|
||||
|
||||
<li class="<%= "active " if @menu == 'channels' %>dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=t(:channels)%> <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= link_to t(:channels_my), channels_path %></li>
|
||||
<li><%= link_to t(:watched_channels), watched_channels_path %></li>
|
||||
<li><%= link_to t(:channels_public), public_channels_path %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li <%= "class=active" if @menu == 'plugins' %>><%= link_to t(:plugins), plugins_path %></li>
|
||||
<li class="<%= "active " if @menu == 'account' %>dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=t(:account)%> <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= link_to t(:myaccount), account_path %></li>
|
||||
<li><%= link_to t(:account_edit), edit_account_path %></li>
|
||||
<li><%= link_to t(:public_profile), user_profile_path(current_user.login) %></li>
|
||||
<li><%= link_to t(:profile_edit), edit_profile_path %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<% if current_admin_user.present? %>
|
||||
<li><%= link_to t(:admin), "/admin" %></li>
|
||||
<% end %>
|
||||
|
||||
<% else %>
|
||||
<li <%= "class=active" if @menu == 'channels' %>><%= link_to t(:channels), public_channels_path %></li>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
|
||||
<li class="<%= "active " if @menu == 'support' %>dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=t(:support)%> <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="/docs"><%= t(:documentation) %></a></li>
|
||||
<li><a href="/docs/tutorials/"><%= t(:tutorials) %></a></li>
|
||||
<li><a href="http://community.thingspeak.com/forum/"><%= t(:forum) %></a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li><a href="http://community.thingspeak.com/"><%= t(:blog)%></a></li>
|
||||
|
||||
<% if current_user %>
|
||||
<li><%= link_to t(:signout), logout_path %></li>
|
||||
<% else %>
|
||||
<li><%= link_to t(:signin), login_path %></li>
|
||||
<li><%= link_to t(:signup), new_user_registration_path %></li>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
</div><!--/.nav-collapse -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,34 +1,13 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title><%= @title.nil? ? (@menu.nil? ? 'ThingSpeak' : @menu.capitalize + ' - ThingSpeak') : @title + ' - ThingSpeak' %></title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<%= stylesheet_link_tag 'application' %>
|
||||
|
||||
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
|
||||
<script type='text/javascript' src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
|
||||
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"></script>
|
||||
<%= javascript_include_tag 'application' %>
|
||||
|
||||
<%= csrf_meta_tag %>
|
||||
<% if Rails.env == 'production' %>
|
||||
<%= render 'layouts/ga' %>
|
||||
<% end %>
|
||||
|
||||
<%= yield :head %>
|
||||
</head>
|
||||
<%= render 'layouts/header' %>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="wrap">
|
||||
<%= render 'layouts/header' %>
|
||||
<%= render 'layouts/nav' %>
|
||||
<div class="container">
|
||||
<% if notice.present? %>
|
||||
<p class="flash alert alert-success"><%= notice %><span class="dismiss">X</span></p>
|
||||
<% end %>
|
||||
<% if alert.present? %>
|
||||
<p class="flash alert alert-danger"><%= alert %><span class="dismiss">X</span></p>
|
||||
<% end %>
|
||||
<%= render 'layouts/flash' %>
|
||||
<%= yield %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
14
app/views/layouts/home.html.erb
Normal file
14
app/views/layouts/home.html.erb
Normal file
@ -0,0 +1,14 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<%= render 'layouts/header' %>
|
||||
|
||||
<body style='padding-top: 50px;'>
|
||||
|
||||
<%= render 'layouts/nav' %>
|
||||
<%= yield %>
|
||||
|
||||
<%= render 'layouts/footer' %>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user