summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Mercier <tylermercier@gmail.com>2013-07-29 15:38:31 -0600
committerTyler Mercier <tylermercier@gmail.com>2013-07-29 15:38:31 -0600
commit07580e5e131d1f731662af24c348e31a65fea1c7 (patch)
tree007d1b0cee675594e2f68e93d6beaf37af8433b8
parentce1cb7ea7997961fc2fc9ea1b40558e717c0ef05 (diff)
cleanup html files
-rw-r--r--app/assets/images/.keep0
-rw-r--r--app/views/layouts/_navigation.html.erb1
-rw-r--r--app/views/layouts/application.html.erb72
3 files changed, 34 insertions, 39 deletions
diff --git a/app/assets/images/.keep b/app/assets/images/.keep
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/images/.keep
+++ /dev/null
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
deleted file mode 100644
index e84e1cd..0000000
--- a/app/views/layouts/_navigation.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%# navigaion %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 995cf49..6b91cbd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,58 +1,54 @@
<!doctype html>
<html>
- <head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title><%= content_for?(:title) ? yield(:title) : "Parley" %></title>
- <meta name="description" content="">
- <meta name="author" content="">
- <%= favicon_link_tag 'favicon.ico' %>
- <link rel="apple-touch-icon" href="/assets/touch-icon-iphone.png" />
- <link rel="apple-touch-icon" sizes="72x72" href="/assets/touch-icon-ipad.png" />
- <link rel="apple-touch-icon" sizes="114x114" href="/assets/touch-icon-iphone4.png" />
- <%= stylesheet_link_tag "application", :media => "all" %>
- <%= javascript_include_tag "application" %>
- <%= csrf_meta_tags %>
- <%= yield(:head) %>
- </head>
- <body>
- <div id="main" role="main">
- <div class="container">
- <div class="content">
- <div class="row">
- <div class="span12">
- <h1 id="logo">Parley</h1>
- <%= render 'layouts/messages' %>
- <%= yield %>
- </div>
- </div>
- </div>
- </div> <!--! end of .container -->
- </div> <!--! end of #main -->
- <footer>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title><%= content_for?(:title) ? yield(:title) : "Parley" %></title>
+ <meta name="description" content="">
+ <meta name="author" content="">
+ <%= favicon_link_tag 'favicon.ico' %>
+ <link rel="apple-touch-icon" href="/assets/touch-icon-iphone.png" />
+ <link rel="apple-touch-icon" sizes="72x72" href="/assets/touch-icon-ipad.png" />
+ <link rel="apple-touch-icon" sizes="114x114" href="/assets/touch-icon-iphone4.png" />
+ <%= stylesheet_link_tag "application", :media => "all" %>
+ <%= javascript_include_tag "application" %>
+ <%= csrf_meta_tags %>
+</head>
+<body>
+ <div id="main" role="main">
+ <div class="container">
<div class="content">
- <div class="row">
- <%= link_to "Privacy Policy", page_path("privacy") %> &copy; 2013 Parley, Inc. All rights reserved.
+ <div class="row">
+ <div class="span12">
+ <h1 id="logo">Parley</h1>
+ <%= render 'layouts/messages' %>
+ <%= yield %>
</div>
</div>
- </footer>
+ </div>
+ </div> <!--! end of .container -->
+</div> <!--! end of #main -->
+<footer>
+ <div class="content">
+ <div class="row">
+ <%= link_to "Privacy Policy", page_path("privacy") %> &copy; 2013 Parley, Inc. All rights reserved.
+ </div>
+ </div>
+</footer>
<%= javascript_include_tag :application %>
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<%= yield :javascript %>
<script type="text/javascript">
-
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-42669511-1']);
_gaq.push(['_trackPageview']);
-
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
-</script>
- </body>
+ </script>
+</body>
</html>