rename contact_count to item_count

This commit is contained in:
mokus 2013-08-08 11:31:03 +02:00
parent d7e6ec8a4c
commit 44d76fc6da
4 changed files with 24 additions and 26 deletions

View file

@ -2068,6 +2068,19 @@ ul#requested-scopes
.scope-description .scope-description
:display none :display none
.item_count
:width 16px
:line-height 16px
:text-align center
@include border-radius(4px)
:color #999
:background
:color #eee
:display inline-block
:font
:size 11px
:weight 700
ul.left_nav ul.left_nav
:margin 0 :margin 0
:bottom 15px :bottom 15px
@ -2100,9 +2113,7 @@ ul.left_nav
> a:not(.sub_selected) > a:not(.sub_selected)
:color #333 :color #333
.contact_count .item_count
:font
:weight 700
:color #666 :color #666
a.aspect_selector, a.aspect_selector,
@ -2155,22 +2166,9 @@ ul.left_nav
:display none :display none
&:hover &:hover
@include opacity(1) @include opacity(1)
.contact_count
:width 16px
:line-height 16px
:text-align center
@include border-radius(4px)
:margin-top 1px
:color #999
:background
:color #eee
:display inline-block
:font
:size 11px
a.home_selector a.home_selector
.contact_count .item_count
:float right :float right
ul.sub_nav ul.sub_nav

View file

@ -297,7 +297,7 @@ ul.comments li.posted .controls .delete {
left: 10px; left: 10px;
} }
ul.left_nav .contact_count, ul.left_nav .edit { ul.left_nav .item_count, ul.left_nav .edit {
float: left; float: left;
} }

View file

@ -6,7 +6,7 @@
%li.all_aspects{:class => ("active" if params["set"] != "all" && params["set"] != "only_sharing" && !@spotlight)} %li.all_aspects{:class => ("active" if params["set"] != "all" && params["set"] != "only_sharing" && !@spotlight)}
%a.home_selector{:href => contacts_path, :class => ("sub_selected" if params["a_id"])} %a.home_selector{:href => contacts_path, :class => ("sub_selected" if params["a_id"])}
= t('contacts.index.my_contacts') = t('contacts.index.my_contacts')
.contact_count .item_count
= my_contacts_count = my_contacts_count
%ul.sub_nav %ul.sub_nav
@ -15,7 +15,7 @@
.icons-check_yes_ok{:class => ("invisible" if params["a_id"].to_i != aspect.id) } .icons-check_yes_ok{:class => ("invisible" if params["a_id"].to_i != aspect.id) }
%a.community_aspect_selector{:href => contacts_path(:a_id => aspect.id)} %a.community_aspect_selector{:href => contacts_path(:a_id => aspect.id)}
= aspect = aspect
.contact_count .item_count
= aspect.contacts.size = aspect.contacts.size
%li %li
@ -24,7 +24,7 @@
%li.all_contacts{:class => ("active" if params["set"] == "all" || params["set"] == "only_sharing")} %li.all_contacts{:class => ("active" if params["set"] == "all" || params["set"] == "only_sharing")}
%a.home_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")} %a.home_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")}
= t('contacts.index.all_contacts') = t('contacts.index.all_contacts')
.contact_count .item_count
= all_contacts_count = all_contacts_count
%ul.sub_nav %ul.sub_nav
@ -32,6 +32,6 @@
.icons-check_yes_ok{:class => ("invisible" if params["set"] == "only_sharing")} .icons-check_yes_ok{:class => ("invisible" if params["set"] == "only_sharing")}
%a.community_aspect_selector{:href => contacts_path(:set => "only_sharing")} %a.community_aspect_selector{:href => contacts_path(:set => "only_sharing")}
= t('contacts.index.only_sharing_with_me') = t('contacts.index.only_sharing_with_me')
.contact_count .item_count
= only_sharing_count = only_sharing_count

View file

@ -18,7 +18,7 @@
%br %br
%br %br
-if contact.sharing? || person == current_user.person -if contact.sharing? || person == current_user.person
%ul#aspect_nav.left_nav %ul#profile_information
- unless person.bio.blank? - unless person.bio.blank?
%li %li
@ -48,8 +48,8 @@
- unless @photos.blank? - unless @photos.blank?
%h4 %h4
= t('_photos') = t('_photos')
.contact_count .item_count
= " #{@photos.count}" = "#{@photos.count}"
- @thumbs = @photos.limit(3) - @thumbs = @photos.limit(3)
- for photo in @thumbs - for photo in @thumbs
= image_tag(photo.url(:thumb_small)) = image_tag(photo.url(:thumb_small))