From 8fdc1332bbff9c23400459dc7018cba147279cc5 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 21:21:49 +0100 Subject: Added %thead and %tbody to the tables. --- app/views/users/_index_core.html.haml | 51 ++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'app/views/users') diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 7f2251a..87d3c4c 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -1,28 +1,29 @@ - cache(['user_table_row_inner_td', I18n.locale, current_user, users.reorder(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do %table{:class => 'table table-striped'} - %tr - %th - %th= t('users.index.user_name') - %th= t('users.index.email') - %th= t('users.index.first_name') - %th= t('users.index.last_name') - %th{:colspan => '3'} - - - for user in users - - cache(['user_table_row', I18n.locale, current_user, user]) do - %tr - %td - - if user.image? - =image_tag(user.image_url(:mini).to_s, :class => 'img-rounded') - - else - - if user.male? - = image_tag 'icons/user-male-16x.png', :class => 'img-rounded' + %thead + %tr + %th + %th= t('users.index.user_name') + %th= t('users.index.email') + %th= t('users.index.first_name') + %th= t('users.index.last_name') + + %tbody + - for user in users + - cache(['user_table_row', I18n.locale, current_user, user]) do + %tr + %td + - if user.image? + =image_tag(user.image_url(:mini).to_s, :class => 'img-rounded') - else - = image_tag 'icons/user-female-16x.png', :class => 'img-rounded' - %td= user.user_name - %td - - if !user.email.blank? - = mail_to user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + user.email) - %td= user.first_name - %td= user.last_name - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @tenant, :child => user} \ No newline at end of file + - if user.male? + = image_tag 'icons/user-male-16x.png', :class => 'img-rounded' + - else + = image_tag 'icons/user-female-16x.png', :class => 'img-rounded' + %td= user.user_name + %td + - if !user.email.blank? + = mail_to user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + user.email) + %td= user.first_name + %td= user.last_name + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @tenant, :child => user} \ No newline at end of file -- cgit v1.2.3 From 7c842dd79b3ac4a8bd462ef80ee1e27f5e74e4d3 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 23:46:57 +0100 Subject: Optimized views for phones. --- app/views/users/_index_core.html.haml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'app/views/users') diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 87d3c4c..77b8c95 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -4,8 +4,12 @@ %tr %th %th= t('users.index.user_name') - %th= t('users.index.email') - %th= t('users.index.first_name') + %th + %span.hidden-phone + = t('users.index.email') + %th + %span.hidden-phone + = t('users.index.first_name') %th= t('users.index.last_name') %tbody @@ -23,7 +27,10 @@ %td= user.user_name %td - if !user.email.blank? - = mail_to user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + user.email) - %td= user.first_name + %span.hidden-phone + = mail_to user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + user.email) + %td + %span.hidden-phone + = user.first_name %td= user.last_name =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @tenant, :child => user} \ No newline at end of file -- cgit v1.2.3 From f67005b1bcbf4b0049b8d60dfcc669bd98745a49 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 23 Jan 2013 13:11:03 +0100 Subject: UI --- app/views/users/show.html.haml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'app/views/users') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 4c39fd1..f38a4a1 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -4,12 +4,18 @@ .span3 - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do = image_tag @user.image_url(:small).to_s, :class => 'img-rounded' if @user.image? && @user.image_url(:small) - %p - %strong= t('users.show.user_name') + ":" - = @user.user_name - %p - %strong= t('users.show.email') + ":" - = @user.email + %table{:class => 'table table-striped'} + %tbody + %tr + %td + %strong= t('users.show.user_name') + ":" + %td + = @user.user_name + %tr + %td + %strong= t('users.show.email') + ":" + %td + = @user.email %p.controls = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @tenant, :child => @user } -- cgit v1.2.3 From b432f1930851c3b583b223d773341f5e208046a7 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 24 Jan 2013 12:47:00 +0100 Subject: Better user experience. One step setup. --- app/views/users/_form_core.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/views/users') diff --git a/app/views/users/_form_core.html.haml b/app/views/users/_form_core.html.haml index 24b15f5..980976d 100644 --- a/app/views/users/_form_core.html.haml +++ b/app/views/users/_form_core.html.haml @@ -2,7 +2,8 @@ - if GuiFunction.display?('name_data_fields_in_user_edit_form', current_user) = f.input :male, :collection => [[true, t('users.form.gender.male')], [false, t('users.form.gender.female')]], :label_method => :last, :value_method => :first, :label => t('users.form.male.label'), :hint => conditional_hint('users.form.gender.hint'), :label => t('users.form.gender.label'), :as => :radio_buttons = f.input :first_name, :label => t('users.form.first_name.label'), :hint => conditional_hint('users.form.first_name.hint'), :autofocus => true - = f.input :middle_name, :label => t('users.form.middle_name.label'), :hint => conditional_hint('users.form.middle_name.hint') + - if User.any? + = f.input :middle_name, :label => t('users.form.middle_name.label'), :hint => conditional_hint('users.form.middle_name.hint') = f.input :last_name, :label => t('users.form.last_name.label'), :hint => conditional_hint('users.form.last_name.hint') - if GuiFunction.display?('user_name_field_in_user_edit_form', current_user) = f.input :user_name, :label => t('users.form.user_name.label'), :hint => conditional_hint('users.form.user_name.hint') -- cgit v1.2.3 From af4a02e15a02481e23f9458ae0a430ec52c57417 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 15:13:35 +0100 Subject: UI --- app/views/users/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/users') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index f38a4a1..7d32cca 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -10,12 +10,12 @@ %td %strong= t('users.show.user_name') + ":" %td - = @user.user_name + = truncate(@user.user_name, :length => 14) %tr %td %strong= t('users.show.email') + ":" %td - = @user.email + = truncate(@user.email, :length => 14) %p.controls = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @tenant, :child => @user } -- cgit v1.2.3 From 6d5cc233d0db71f826a27c9151d0af121d0fe616 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 20:02:35 +0100 Subject: Changed the way the avatar is rendered and replaced e-mail address with e-mail. --- app/views/users/show.html.haml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'app/views/users') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 7d32cca..68fdc9d 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -3,7 +3,15 @@ .row .span3 - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do - = image_tag @user.image_url(:small).to_s, :class => 'img-rounded' if @user.image? && @user.image_url(:small) + + - if @user.image? && @user.image_url(:profile) + %span.hidden-phone + %ul.thumbnails + %li.span3 + %div.thumbnail + %a.thumbnail{:href => @user.image_url(:profile).to_s} + =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}") + %table{:class => 'table table-striped'} %tbody %tr -- cgit v1.2.3 From 680073d4cf7619bddfb7f79ea9e538a33d9dcdee Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 20:11:45 +0100 Subject: Refactoring --- app/views/users/_index_core.html.haml | 2 +- app/views/users/show.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/users') diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 77b8c95..9d63afc 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -1,5 +1,5 @@ - cache(['user_table_row_inner_td', I18n.locale, current_user, users.reorder(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do - %table{:class => 'table table-striped'} + %table.table.table-striped %thead %tr %th diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 68fdc9d..0b9c06e 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -12,7 +12,7 @@ %a.thumbnail{:href => @user.image_url(:profile).to_s} =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}") - %table{:class => 'table table-striped'} + %table.table.table-striped %tbody %tr %td -- cgit v1.2.3 From c23704427182d8b63600dd404f1295763e88addd Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 20:15:28 +0100 Subject: Show a rounded avatar photo and link to the original version of that photo. --- app/views/users/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/users') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 0b9c06e..639a52a 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -9,8 +9,8 @@ %ul.thumbnails %li.span3 %div.thumbnail - %a.thumbnail{:href => @user.image_url(:profile).to_s} - =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}") + %a.thumbnail{:href => @user.image_url} + =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}", :class => 'img-rounded') %table.table.table-striped %tbody -- cgit v1.2.3