Leaguer

From 5ce55c00ac72bc6fbdd095d7ee697cfa35ea8cc4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 May 2014 12:11:15 -0400 Subject: Redo styles to be "pure"/simple bootstrap, and fix found issues with forms. --- app/views/layouts/application.html.erb | 73 +++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 32 deletions(-) (limited to 'app/views/layouts/application.html.erb') diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index af26e29..28ec6f7 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,5 +1,5 @@ - + Leaguer @@ -16,42 +16,51 @@

- <%# This is the logo %> - - - <%# This is the search bar #%> -

- <%= form_tag("/search", method: "get", :class => "search") do %> - <%= text_field_tag(:query, params[:query], type: "search") %> - <%= submit_tag("Search", :name=>nil) %> - <% end %> -

- - <%# these are the log in buttons #%> -

- <% if signed_in? %> - <%= link_to current_user.user_name, current_user, :class => "user" %> - <%= link_to "Messages", pms_path, :class => "signup" %> - <% if current_user.can? :edit_server %> - <%= link_to "Server settings", edit_server_path, :class => "server" %> - <% end %> - <% if current_user.can? :create_alert %> - <%= link_to "Create Alert", new_alert_path, :class => "create-alert" %> - <% end %> - <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> - <%# if there is an unread alert then I wanna be able to show the notification icon by saying :style => display:inline. This will be Done by Guntas once he figures out how to get unread alerts. Psuedo if alerts.unread > 0 then display else don't.%> - <%= link_to "", alerts_path, :class => "alerts", :id => "alerts-ajax"%> - <% else %> - <%= link_to "Log in", new_session_path, :class => "signin" %> - <%= link_to "Sign up", new_user_path, :class => "signup" %> - <% end %> -

+ +

+ + <% if signed_in? %> +

<%= link_to "Messages", pms_path %>
<%= link_to "Server settings", edit_server_path, :class => "server" %>

+ <%# If there is an unread alert then I want to be able + to show the notification icon by saying :style => + display:inline. This will be Done by Guntas once + he figures out how to get unread alerts. Psuedo if + alerts.unread > 0 then display else don't.%> + <%= link_to "", alerts_path, :class => "alerts", :id => "alerts-ajax"%> + <% end %> + <%= form_tag("/search", method: :get, :id => "search") do %>

+ <%= text_field_tag(:query, params[:query], type: :search) %> + +

<% end %> +

<% if notice %>

<%= notice %>

<% end %> -

<%= yield %>

-- cgit v1.2.3 From 521eae01be1ca3f69b47b3170a0548c3268f4a22 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 May 2014 15:21:42 -0400 Subject: Make the form submit helpers use + <%= submit_tag "Search" %>

<% end %> -- cgit v1.2.3 From d7a0fffe1aab9de4b18db88c409fcd5dc486ab5c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 May 2014 16:19:34 -0400 Subject: clean up forms --- app/views/layouts/application.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/layouts/application.html.erb') diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1b83e53..7cb7e0f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -22,7 +22,7 @@

<% if signed_in? %> -- cgit v1.2.3 From 8c5772072066eb57cda4b0b8953aebe3af33ca2d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 May 2014 17:01:48 -0400 Subject: condense the stylesheets --- app/views/layouts/application.html.erb | 1 - 1 file changed, 1 deletion(-) (limited to 'app/views/layouts/application.html.erb') diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7cb7e0f..92ca6ad 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,7 +4,6 @@ Leaguer <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= stylesheet_link_tag "#{params[:controller]}", media: "all", "data-turbolinks-track" => true %> <%= javascript_include_tag "application", "data-turbolinks-track" => true %> <%= javascript_include_tag "#{params[:controller]}", "data-turbolinks-track" => true %> -- cgit v1.2.3