From: Ira W. Snyder Date: Sun, 25 Nov 2007 00:14:11 +0000 (-0800) Subject: Prettify the login page X-Git-Tag: turned-in~40 X-Git-Url: https://www.irasnyder.com/gitweb/?a=commitdiff_plain;h=38bf6e867a85ce3283a5b696bfa54afc63fa75bd;p=cs356-p2-videostore.git Prettify the login page Signed-off-by: Ira W. Snyder --- diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml index c6dda9a..429a923 100644 --- a/app/views/layouts/admin.rhtml +++ b/app/views/layouts/admin.rhtml @@ -1,11 +1,33 @@ -<%= stylesheet_link_tag "scaffold", "depot", :media => "all" %> - + -<%= link_to "Products", :controller => 'admin', :action => 'list' %> -<%= link_to "List users", :controller => 'login', :action => 'list_users' %> -<%= link_to "Add user", :controller => 'login', :action => 'add_user' %> -<%= link_to "Logout", :controller => 'login', :action => 'logout' %> - -<% if flash[:notice] -%> -<%= flash[:notice] %> -<% end -%> <%= yield :layout %> + + + PripPropPrix Video + <%= stylesheet_link_tag "scaffold", "depot", :media => "all" %> + + + +
+
+

<%= link_to "Make A Purchase", :controller => 'purchase', :action => 'begin' %>

+

<%= link_to "Return Items", :controller => 'coitem', :action => 'return' %>

+
+

<%= link_to "Video Maintenence", :controller => 'video', :action => 'list' %>

+

<%= link_to "Game Maintenence", :controller => 'game', :action => 'list' %>

+

<%= link_to "Checked Out Items", :controller => 'coitem', :acion => 'list' %>

+

<%= link_to "Customer Maintenence", :controller => 'customer', :action => 'list' %>

+
+

<%= link_to "Logout", :controller => 'login', :action => 'logout' %>

+
+
+ <% if flash[:notice] -%> +
<%= flash[:notice] %>
+ <% end -%> <%= yield :layout %> +
+
+ + diff --git a/app/views/login/index.rhtml b/app/views/login/index.rhtml index 872918c..bea5952 100644 --- a/app/views/login/index.rhtml +++ b/app/views/login/index.rhtml @@ -1,4 +1,4 @@

Welcome

It's <%= Time.now %>. -FIXME: Add menu here! +

Please navigate using the menu on the left!

diff --git a/db/development.sqlite3 b/db/development.sqlite3 index b910a37..7f2b35a 100644 Binary files a/db/development.sqlite3 and b/db/development.sqlite3 differ diff --git a/public/images/logo.png b/public/images/logo.png new file mode 100644 index 0000000..352c90b Binary files /dev/null and b/public/images/logo.png differ diff --git a/public/images/logo2.png b/public/images/logo2.png new file mode 100644 index 0000000..e4873eb Binary files /dev/null and b/public/images/logo2.png differ