From 8d870af2090c0296617b0c2b97a45396f8f5b6c5 Mon Sep 17 00:00:00 2001
From: Luke Barratt <luke@barratt.me>
Date: Thu, 17 Apr 2014 21:26:25 +0100
Subject: [PATCH] Added teams edit page styling
---
app/assets/stylesheets/components/_forms.scss | 17 ++-
app/assets/stylesheets/pages/_teams.scss | 12 ++
app/views/teams/edit.html.erb | 114 ++++++++++--------
3 files changed, 91 insertions(+), 52 deletions(-)
diff --git a/app/assets/stylesheets/components/_forms.scss b/app/assets/stylesheets/components/_forms.scss
index 335b219..f4d1ccf 100644
--- a/app/assets/stylesheets/components/_forms.scss
+++ b/app/assets/stylesheets/components/_forms.scss
@@ -46,6 +46,7 @@ form {
position: relative;
display: inline-block;
margin-right: em(10);
+ float: left;
select {
@include appearance(none);
@@ -234,18 +235,32 @@ form.square {
line-height: em(16);
}
- .inputs,
input[type=text],
input[type=password],
input[type=email],
textarea {
@include span-columns(9);
}
+
+ .inputs {
+ @include span-columns(9);
+
+ input[type=text],
+ input[type=password],
+ input[type=email] {
+ width: 100%;
+ }
+ }
}
.controls {
@include span-columns(9);
@include shift(3);
+
+ &.inline {
+ margin-left: 0;
+ width: auto;
+ }
}
}
diff --git a/app/assets/stylesheets/pages/_teams.scss b/app/assets/stylesheets/pages/_teams.scss
index 4b9c1bc..e088654 100644
--- a/app/assets/stylesheets/pages/_teams.scss
+++ b/app/assets/stylesheets/pages/_teams.scss
@@ -27,6 +27,18 @@
width: 20%;
text-align: right;
}
+
+ &.edit {
+ @include span-columns(12);
+
+ h1 {
+ margin-bottom: 1em;
+ }
+
+ .tabbed-contents {
+ margin-bottom: em(20);
+ }
+ }
}
/*
diff --git a/app/views/teams/edit.html.erb b/app/views/teams/edit.html.erb
index e1a551b..b053792 100644
--- a/app/views/teams/edit.html.erb
+++ b/app/views/teams/edit.html.erb
@@ -1,56 +1,58 @@
-<h1>Editing team: <%= h @team.name %></h1>
+<div id="teams" class="tabbed edit">
+ <h1>Manage Team: <%=h @team.name %></h1>
-<div id="teamsTab">
- <ul id="teamsTab-nav" class="tabs">
- <li><a href="#detailsTab">Details</a></li>
- <li><a href="#membersTab">Members</a></li>
- <li><a href="#contestsTab">Contests</a></li>
+ <ul id="teams-nav" class="tabs">
+ <li><a href="#details">Details</a></li>
+ <li><a href="#members">Members</a></li>
+ <li><a href="#contests">Contests</a></li>
</ul>
- <div class="box wide tabs">
- <div id="detailsTab" class="tab">
- <%= form_for @team, :html => {:multipart => true} do |f| %>
+ <div class="tabbed-contents">
+ <div id="details" class="tab">
+ <%= form_for @team, html: { multipart: true, class: 'square' } do |f| %>
<%= f.error_messages %>
- <p>
- <%= f.label :name %><br />
+ <div class="fields horizontal">
+ <%= f.label :name %>
<%= f.text_field :name %>
- </p>
- <p>
- <%= f.label :irc %><br />
+ </div>
+ <div class="fields horizontal">
+ <%= f.label :irc %>
<%= f.text_field :irc %>
- </p>
- <p>
- <%= f.label :web %><br />
+ </div>
+ <div class="fields horizontal">
+ <%= f.label :web %>
<%= f.text_field :web %>
- </p>
- <p>
- <%= f.label :tag %><br />
+ </div>
+ <div class="fields horizontal">
+ <%= f.label :tag %>
<%= f.text_field :tag %>
- </p>
- <p>
- <%= f.label :country %><br />
+ </div>
+ <div class="fields horizontal">
+ <%= f.label :country %>
<%= country_code_select :team, :country %>
- </p>
- <p>
- <%= f.label :comment %><br />
+ </div>
+ <div class="fields horizontal">
+ <%= f.label :comment %>
<%= f.text_field :comment %>
- </p>
- <p>
- <%= f.label :recruiting %><br />
- <%= f.text_field :recruiting %><br />
- Leave empty if you are not recruiting, otherwise write the recruiting criteria above.
- </p>
- <p>
- <%= f.label :logo %><br />
- <%= f.file_field :logo %><br />
- </p>
- <p>
+ </div>
+ <div class="fields horizontal">
+ <%= f.label :recruiting %>
+ <div class="inputs">
+ <%= f.text_field :recruiting %>
+ <p>Leave empty if you are not recruiting, otherwise write the recruiting criteria above.</p>
+ </div>
+ </div>
+ <div class="fields horizontal">
+ <%= f.label :logo %>
+ <%= f.file_field :logo %>
+ </div>
+ <div class="controls">
<%= f.submit "Update" %>
- </p>
+ </div>
<% end %>
</div>
- <div id="membersTab" class="tab">
+ <div id="members" class="tab">
<%= form_for @team do |f| %>
<table class="data">
<tr>
@@ -60,8 +62,8 @@
<th>Actions</th>
</tr>
<% @team.teamers.present.each do |member| %>
- <tr class="<%= cycle('even', 'odd') %>">
- <td <% if member.team_id == member.user.team_id %>id="teamsPrimary"<% end %>>
+ <tr class="fields">
+ <td id="<%= 'primary' if member.team_id == member.user.team_id %>">
<%= link_to (h member.user.username), member.user %>
</td>
<td>
@@ -71,23 +73,31 @@
<%= select_tag "rank[#{member.id}]", options_for_select(member.ranks.invert, member.rank) %>
</td>
<td>
- <%= link_to 'Remove', member, :confirm => 'Are you sure?', :method => :delete%>
+ <%= link_to member, confirm: 'Are you sure?', method: :delete, class: 'button tiny' do %>
+ <%= icon 'times' %> Remove
+ <% end %>
</td>
</tr>
<% end %>
</table>
- <p>
+ <div class="controls">
<%= f.submit "Update" %>
- </p>
+ </div>
<% end %>
</div>
- <div id="contestsTab" class="tab">
+ <div id="contests" class="tab">
<p>
- <%= form_for @team.contesters.build do |f| %>
+ <%= form_for @team.contesters.build, html: { class: 'square' } do |f| %>
<%= f.hidden_field :team_id %>
- <%= f.collection_select :contest_id, Contest.active, :id, :name %>
- <%= f.submit "Join" %>
+
+ <div class="fields inline">
+ <%= f.collection_select :contest_id, Contest.active, :id, :name %>
+ </div>
+
+ <div class="controls inline">
+ <%= f.submit "Join" %>
+ </div>
<% end %>
</p>
</div>
@@ -95,8 +105,10 @@
</div>
<script type="text/javascript">
- var tabber1 = new Yetii({id: 'teamsTab'});
+ new Yetii({
+ id: 'teams'
+ });
</script>
-<%= link_to 'Show', @team %> |
-<%= link_to 'Back', teams_path %>
+<%= link_to 'Show', @team, class: 'button' %>
+<%= link_to 'Back', teams_path, class: 'button' %>