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 @@

<%= _('New friend') %>

-

-<%= _('%s wants to connect to you as a friend.') % task.requestor.name %> -

+<%= 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| %>
- <%= 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}')") %> + + +     + + <%= radio_button_tag(:decision, 'cancel', false, + :id => "decision-cancel-#{task.id}", + :onclick => "Element.hide('group-for-friend-#{task.id}')") %> + <% - 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}") %> -

+ 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}") %> +

<%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>

<% end %>
-
- <%= radio_button_tag(:decision, 'cancel', false, :id => "decision-cancel-#{task.id}", :onclick => "Element.hide('group-for-friend-#{task.id}')") %> - <%= _('Ignore') %> -
- <% 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 @@

<%= _("%s's pending tasks") % profile.name %>

+

<% if @tasks.empty? %> -

<%= _('No pending tasks for %s' % profile.name) %>

+ <%= _('No pending tasks for %s' % profile.name) %> <% else %> <% end %> +

<% 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 @@

<%= _("%s's processed tasks") % profile.name %>

+

<% if @tasks.empty? %> -

<%= _('No processed tasks.') %>

+ <%= _('No processed tasks.') %> <% else %> <% end %> +

<% 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