From e531dd970fd7ca899ee9e7757812b8bda446d593 Mon Sep 17 00:00:00 2001
From: AurelioAHeckert <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Mon, 10 Mar 2008 22:36:40 +0000
Subject: [PATCH] ActionItem235: new friend tasks are beaulty now

---
 app/views/tasks/_add_friend.rhtml                              | 38 +++++++++++++++++++++++---------------
 app/views/tasks/index.rhtml                                    |  6 ++++--
 app/views/tasks/processed.rhtml                                | 24 +++++++++---------------
 public/designs/themes/default/stylesheets/controller_tasks.css | 36 ++++++++++++++++++++++++++++++++++++
 public/stylesheets/controller_tasks.css                        | 12 ++++++++++++
 5 files changed, 84 insertions(+), 32 deletions(-)
 create mode 100644 public/designs/themes/default/stylesheets/controller_tasks.css
 create mode 100644 public/stylesheets/controller_tasks.css

diff --git a/app/views/tasks/_add_friend.rhtml b/app/views/tasks/_add_friend.rhtml
index 2cc9a69..5523146 100644
--- a/app/views/tasks/_add_friend.rhtml
+++ b/app/views/tasks/_add_friend.rhtml
@@ -1,32 +1,40 @@
 <h2><%= _('New friend')  %></h2>
 
-<p>
-<%= _('%s wants to connect to you as a friend.') % task.requestor.name %>
-</p>
+<%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %>
+
+<%= _('%s wants to connect to you as a friend.') % link_to( task.requestor.name, task.requestor.public_profile_url ) %>
 
 <% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
 
   <div>
-    <%= radio_button_tag(:decision, 'finish', true, :id => "decision-finish-#{task.id}", :onclick => "Element.show('group-for-friend-#{task.id}')") %>
-    <%= _('Accept') %>
+
+    <%= radio_button_tag(:decision, 'finish', true,
+        :id => "decision-finish-#{task.id}",
+        :onclick => "Element.show('group-for-friend-#{task.id}')") %>
+    <label for="<%= "decision-finish-#{task.id}" %>"><%= _('Accept') %></label>
+
+    &nbsp; &nbsp;
+
+    <%= radio_button_tag(:decision, 'cancel', false,
+        :id => "decision-cancel-#{task.id}",
+        :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
+    <label for="<%= "decision-cancel-#{task.id}" %>"><%= _('Ignore') %></label>
 
     <%
-      content_tag('div', :id => "group-for-friend-#{task.id}", :help => _('You can type the first letters of an existing group and have the system present you the available options, or you can type the name of a new group if you want.')) do %>
-        <%= _('Classify your new friend %s:') % task.requestor.name %>
-        <%= text_field_with_local_autocomplete("task[group_for_friend]", profile.suggested_friend_groups, :id => "field-group-for-friend-#{task.id}") %>
-      <p>
+      content_tag('div', :id => "group-for-friend-#{task.id}",
+                  :help => _('You can type the first letters of an existing group and have the system present you the available options, or you can type the name of a new group if you want.'))              do %>
+        <%= _('Classify your new friend:') %>
+        <%= text_field_with_local_autocomplete("task[group_for_friend]",
+            profile.suggested_friend_groups,
+            :id => "field-group-for-friend-#{task.id}") %>
+      <p class="friend-classify-suggestions">
       <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>
       </p>
 
     <% end %>
   </div>
 
-  <div>
-    <%= radio_button_tag(:decision, 'cancel', false, :id => "decision-cancel-#{task.id}", :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
-    <%= _('Ignore') %>
-  </div>
-
   <% button_bar do %>
-    <%= submit_button(:ok, _('OK')) %>
+    <%= submit_button(:ok, _('Ok!')) %>
   <% end %>
 <% end %>
diff --git a/app/views/tasks/index.rhtml b/app/views/tasks/index.rhtml
index 20583e4..7f2172f 100644
--- a/app/views/tasks/index.rhtml
+++ b/app/views/tasks/index.rhtml
@@ -1,14 +1,16 @@
 <h1><%= _("%s's pending tasks") % profile.name %></h1>
 
+<p>
 <% if @tasks.empty? %>
-  <p><em><%= _('No pending tasks for %s' % profile.name) %></em></p>
+  <em><%= _('No pending tasks for %s' % profile.name) %></em>
 <% else %>
   <ul class='task-list'>
     <% @tasks.each do |item| %>
-      <li><%= render :partial => partial_for_class(item.class), :locals => { :task => item } %></li>
+      <li class="task-<%= item.class %>"><%= render :partial => partial_for_class(item.class), :locals => { :task => item } %></li>
     <% end %>
   </ul>
 <% end %>
+</p>
 
 <% button_bar do %>
   <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
diff --git a/app/views/tasks/processed.rhtml b/app/views/tasks/processed.rhtml
index e0ff929..979b918 100644
--- a/app/views/tasks/processed.rhtml
+++ b/app/views/tasks/processed.rhtml
@@ -1,29 +1,23 @@
 <h1><%= _("%s's processed tasks") % profile.name %></h1>
 
+<p>
 <% if @tasks.empty? %>
-  <p><em><%= _('No processed tasks.') %></em></p>
+  <em><%= _('No processed tasks.') %></em>
 <% else %>
   <ul>
     <% @tasks.each do |item| %>
       <li>
-      <table>
-        <tr>
-          <th><%= _('Task') %></th>
-          <td><%= item.description %></td>
-        </tr>
-        <tr>
-          <th><%= _('Created') %></th>
-          <td><%= show_date (item.created_at) %></th>
-        </tr>
-        <tr>
-          <th><%= _('Processed') %></th>
-          <td><%= show_date (item.end_date) %></th>
-        </tr>
-      </table>
+        <strong><%= item.description %></strong> <br/>
+        <small>
+          <%= _('Created:')   +' '+ show_date(item.created_at) %>
+          &nbsp; &#151; &nbsp;
+          <%= _('Processed:') +' '+ show_date(item.end_date) %>
+        </small>
       </li>
     <% end %>
   </ul>
 <% end %>
+</p>
 
 <% button_bar do %>
   <%= button(:back, _('Back'), :action => 'index') %>
diff --git a/public/designs/themes/default/stylesheets/controller_tasks.css b/public/designs/themes/default/stylesheets/controller_tasks.css
new file mode 100644
index 0000000..e227988
--- /dev/null
+++ b/public/designs/themes/default/stylesheets/controller_tasks.css
@@ -0,0 +1,36 @@
+
+#content .task-list li {
+  margin: 10px 20px 10px 10px;
+  padding: 0px 10px;
+  list-style: none;
+  border: 1px solid #3465A4;
+  background: #B8CFE7;
+}
+
+.task-AddFriend h2 {
+  text-align: center;
+}
+
+.task-AddFriend img {
+  position: relative; /* msie sux */
+  float: left;
+  margin-right: 10px;
+}
+
+.task-AddFriend form {
+  margin: 5px 0px;
+}
+
+.friend-classify-suggestions {
+  font-size: 10px;
+}
+
+.task-AddFriend .submit {
+  position: relative;
+  top: -5px;
+  float: right;
+}
+.msie .task-AddFriend .submit {
+  top: -10px;
+}
+
diff --git a/public/stylesheets/controller_tasks.css b/public/stylesheets/controller_tasks.css
new file mode 100644
index 0000000..6d4512f
--- /dev/null
+++ b/public/stylesheets/controller_tasks.css
@@ -0,0 +1,12 @@
+
+#content .task-list {
+  margin: 0px;
+  padding: 0px;
+}
+
+#content .task-list li {
+  margin: 10px 0px;
+  padding: 0px;
+  list-style: none;
+  border: 1px solid #3465A4;
+}
--
libgit2 0.21.2