From 63112ca16eb80945072bacac1a52d79815f05bfc Mon Sep 17 00:00:00 2001 From: Ryan Shaw Date: Wed, 5 Dec 2012 16:29:26 -0700 Subject: [PATCH] better styles on Roster user page, fixes: #CNVS-1970 before: https://www.dropbox.com/s/ir1duda31kqv4kh/Screen%20Shot%202012-12-05%20at%204.15.45%20PM.png after:https://www.dropbox.com/s/j9a0f6tfb517a8p/Screen%20Shot%202012-12-05%20at%204.15.49%20PM.png THIS MUST GO OUT AT THE SAME TIME AS THE CORRESPONDING ANALYTICS COMMIT! Change-Id: I647b911f1a92f33d0e5cfe4b6fb4d31c95fda48f Reviewed-on: https://gerrit.instructure.com/15866 Tested-by: Jenkins QA-Review: Clare Hetherington Reviewed-by: Ryan Shaw --- app/stylesheets/blue/_components.scss | 38 +++++++------------ app/views/context/roster_user.html.erb | 28 +++++++------- spec/integration/student_interactions_spec.rb | 4 +- 3 files changed, 31 insertions(+), 39 deletions(-) diff --git a/app/stylesheets/blue/_components.scss b/app/stylesheets/blue/_components.scss index d76ed5c6e51..7dbeeaaa739 100644 --- a/app/stylesheets/blue/_components.scss +++ b/app/stylesheets/blue/_components.scss @@ -239,32 +239,22 @@ } .page-action-list { - margin: 0; - padding: 0; - list-style: none; - > li { - > a { - display: block; - color: $gray; - font-weight: bold; - border-bottom: solid 1px lighten($grayLight, 10%); - @include box-shadow(0 1px 0px rgba(255, 255, 255, 0.85)); - padding: 8px 0; + @include reset-list; + a { + display: block; + color: $gray; + font-weight: bold; + border-bottom: solid 1px lighten($grayLight, 10%); + @include box-shadow(0 1px 0px rgba(255, 255, 255, 0.85)); + padding: 8px 0; - &:hover { - text-decoration: none; - color: $blue; - i { - background-image: url(/images/blue/canvas-icons-16x16-blue.png); - } - } + &:hover { + text-decoration: none; + color: $blue; + } - &:active { - color: $grayLight; - i { - background-image: url(/images/blue/canvas-icons-16x16-ltgrey.png); - } - } + &:active { + color: $grayLight; } } } diff --git a/app/views/context/roster_user.html.erb b/app/views/context/roster_user.html.erb index 1e34af98291..0eb4a754d38 100644 --- a/app/views/context/roster_user.html.erb +++ b/app/views/context/roster_user.html.erb @@ -6,36 +6,39 @@ <% content_for :page_title do %><%= join_title context_user_name(@context, @user), @context.name %><% end %> <% content_for :right_side do %> -

<%= context_user_name(@context, @user) %>

-
+

<%= t 'links.more_about_this_user', "More About This User" %>

+
<% if can_do(@membership, @current_user, :read_grades) && @membership.is_a?(StudentEnrollment) %> - <%= t 'links.user_grades', "Grades for %{user}", :user => context_user_name(@context, @user) %> + <%= t 'links.user_grades', "Grades" %> <% end %> <% if can_do(@context, @current_user, :send_messages) %> - <%= t 'links.message_user', "Message %{user}", :user => context_user_name(@context, @user) %> + <%= t 'links.message_user', "Send Message" %> <% end %> <% if @domain_root_account.enable_user_notes and can_do(@user, @current_user, :read_user_notes) %> - <%= t 'links.faculty_journal', "Faculty Journal for %{user}", :user => context_user_name(@context, @user) %> + <%= t 'links.faculty_journal', "Faculty Journal" %> <% end %> <% if @context.is_a?(Course)%> <% if @context.user_is_instructor?(@user) && can_do(@user, @current_user, :view_statistics) %> - <%= link_to(t('links.teacher_activity', 'Student Interactions Report for %{user}', :user => context_user_name(@context, @user)), user_course_teacher_activity_url(@user, @context), :class => 'btn button-sidebar-wide') %> + <%= link_to(t('links.teacher_activity', 'Student Interactions Report'), user_course_teacher_activity_url(@user, @context)) %> <% elsif @context.user_has_been_student?(@user) && @context.user_is_instructor?(@current_user) && can_do(@context, @current_user, :read_reports) %> - <%= link_to(t('links.student_teacher_activity', 'Your Interactions Report with %{user}', :user => context_user_name(@context, @user)), user_student_teacher_activity_url(@current_user, @user), :class => 'btn button-sidebar-wide') %> + <% link_to(user_student_teacher_activity_url(@current_user, @user)) do %> + + <%= t('links.student_teacher_activity', 'Interactions with You') %> + <% end %> <% end %> <% end %> <% if can_do(@context, @current_user, :read_reports) %> - <%= t 'links.access_report', "Access Report for %{user}", :user => context_user_name(@context, @user) %> + <%= t 'links.access_report', "Access Report" %> <% end %> <% if @context.is_a?(Course) && @context.has_outcomes? && can_do(@context, @current_user, :manage) %> - <%= t 'links.user_outcomes', "Outcomes for %{user}", :user => @user.short_name %> + <%= t 'links.user_outcomes', "Outcomes" %> <% end %> <% if can_do(@domain_root_account, @current_user, :manage) %> - <%= t('links.user_account_details', %{User Account Details}) %> + <%= t('links.user_account_details', %{User Account Details}) %> <% end %>
-

<%= t 'headings.user_services', "%{user}'s Services", :user => @user.short_name %>

+

<%= t 'headings.user_services', "Registered Web Services" %>

<% if can_do(@membership, @current_user, :read_services) && !@membership.user.user_services.empty? %>

@@ -75,9 +78,8 @@ <% js_bundle :user_name %> <% jammit_css :roster_user %> -

<%= t 'headings.users_details', "%{user}'s Details", :user => @user.short_name %>

+

<%= @user.name %>

<% if can_do(@context, @current_user, :manage_students) && !@context.is_a?(Group)%> -

<%= t('headings.user_details', %{User Details}) %>

<%= render :partial => 'users/name' %> <%= t('links.more_user_details', %{more user details...}) %>