From 5d934c5ff1595176e2fb48b1f874934f3867685b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 18 Jul 2013 16:54:44 +0200 Subject: [PATCH] cleanups and return of alert dialog --- views/index.erb | 22 +++++++++++++++------- views/layout.erb | 2 +- views/layout.slim | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/views/index.erb b/views/index.erb index eb3bbfcb..ceaf33cf 100644 --- a/views/index.erb +++ b/views/index.erb @@ -93,9 +93,15 @@ -
-

Alert message goes here

-
+ <% if flash.keys.length > 0 %> +
+

+ <% flash.keys.each do |key| %> + <%= flash[key] %> + <% end %> +

+
+ <% end %> @@ -136,17 +142,19 @@
- <% if !signed_in? %> + <% if signed_in? %> <% else %> diff --git a/views/layout.erb b/views/layout.erb index 858461e5..91bd34cf 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -5,7 +5,7 @@ - Neocities.org: About Neocities.org + Neocities - <%= request.path.gsub('/', '').capitalize %> diff --git a/views/layout.slim b/views/layout.slim index d8d0292b..9113655c 100644 --- a/views/layout.slim +++ b/views/layout.slim @@ -1,7 +1,7 @@ doctype html html head - title NeoCities #{@title.nil? ? '' : " - #{@title}"} + title Neocities #{@title.nil? ? '' : " - #{@title}"} link href="/favicon.ico" rel="icon" type="image/x-icon" link href="/css/bootstrap.min.css" rel="stylesheet" link href="/css/bootstrap-responsive.min.css" rel="stylesheet" @@ -52,4 +52,4 @@ html ga('create', 'UA-41925541-1', 'neocities.org'); ga('send', 'pageview'); - == erb :'_int-footer', layout: false \ No newline at end of file + == erb :'_int-footer', layout: false