Merge Request #111

← To merge requests From fix_members_pagination into master
Merged
softwarepublico/softwarepublico!111
Created by Thiago Ribeiro

Fix members pagination

@melissawen pra validar tbm se o que fizemos no tema foi correto

Assignee: Daniela Feitosa
Milestone: None

Merged by Daniela Feitosa

Source branch has been removed
Commits (1)
3 participants
    0743c2eb05e68c92baa5f8c498995a20?s=40&d=identicon
    Show/hide discussion
    Daniela Feitosa started a discussion on the outdated diff
    last updated by Daniela Feitosa
    src/noosfero-spb/noosfero-spb-theme/css/pagination.css 0 → 100644
      1 +.pagination_span_height span {
      2 + height: auto !important;
    1
    • 0743c2eb05e68c92baa5f8c498995a20?s=40&d=identicon
      Link here  
      Daniela Feitosa @daniela

      Devemos evitar usar important! no css.. o ideal é entender o motivo que faz o span da paginação ficar maior que o que deveria e consertar.

      Nesse caso, o problema é por causa dessa linha: https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/blob/master/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css#L1058

      Pelo que entendi, esse height no span foi incluído para organizar a lista de membros, mas como está pouco específico, está sendo aplicado na paginação também.

      Se alterar a linha https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/blob/master/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css#L1055 para .action-profile-members .box-1 .common-profile-list-block .profile-list-members span{, a listagem de membros não é alterada e já conserta a altura do botão da paginação.

      Choose File ...   File name...
      Cancel
    0743c2eb05e68c92baa5f8c498995a20?s=40&d=identicon
    Show/hide discussion
    Daniela Feitosa started a discussion on the outdated diff
    last updated by Daniela Feitosa
    src/noosfero-spb/noosfero-spb-theme/style.css
    28 28 @import url(css/popover.css);
    29 29 @import url(css/notifications.css);
    30 30 @import url(css/modal.css);
      31 +@import url(css/pagination.css);
    1
    0743c2eb05e68c92baa5f8c498995a20?s=40&d=identicon
    Show/hide discussion
    Daniela Feitosa started a discussion on the outdated diff
    last updated by Daniela Feitosa
    src/noosfero-spb/software_communities/views/profile/_profile_members_list.html.erb
    12 12 <%= profile_image_link(u) %>
    13 13 <% end %>
    14 14 </ul>
      15 +
      16 +<%= pagination_links users, :param_name => "npage", :class => "pagination pagination_span_height" %>
    1
    • 0743c2eb05e68c92baa5f8c498995a20?s=40&d=identicon
      Link here  
      Daniela Feitosa @daniela

      Colocar como nome de classe algo tão específico ("pagination_span_height"), não é bom.. Só poderia ter na definição o height do span?

      Choose File ...   File name...
      Cancel
  • 0743c2eb05e68c92baa5f8c498995a20?s=40&d=identicon
    Link here  
    Daniela Feitosa @daniela

    @thiago, Acho que só essas duas alterações já são suficientes:

    diff --git a/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
index 611ff83..4f5e6fb 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
@@ -1052,7 +1052,7 @@ float: left;
   padding-bottom: 30px;
 }

-.action-profile-members .box-1 .common-profile-list-block span{
+.action-profile-members .box-1 .common-profile-list-block .profile-list-members span{
   margin-right: 0px;
   width: 90px;
   height: 86px;
diff --git a/src/noosfero-spb/software_communities/views/profile/_profile_members_list.html.erb b/src/noosfero-spb/software_communities/views/profile/_profile_members_list.html.erb
index 0e6c700..68105ef 100644
--- a/src/noosfero-spb/software_communities/views/profile/_profile_members_list.html.erb
+++ b/src/noosfero-spb/software_communities/views/profile/_profile_members_list.html.erb
@@ -12,3 +12,5 @@
       <%= profile_image_link(u) %>
     <% end %>
 </ul>
+
+<%= pagination_links users, :param_name => "npage" %>

    @melissawen pode confirmar que a alteração no css não alterou o que não devia, por favor? :)

    Choose File ...   File name...
    Cancel
    members_pagination.diff
  • 800e3af93350753db9dee1864cef10ff?s=40&d=identicon
    Link here  
    Thiago Ribeiro @thiago

    Added 4 new commits:

    • 9e6d7e74 - Fix software box organize task
    • 4febc283 - Remove softwre with nil community.
    • ac727c47 - Merge branch 'fix_remove_software_without_communities' into 'master'
    • 55b79c67 - Fixes pagination in members page
    Choose File ...   File name...
    Cancel
  • 0743c2eb05e68c92baa5f8c498995a20?s=40&d=identicon
    Link here  
    Daniela Feitosa @daniela

    mentioned in commit c5b9dcdda121accbaffda557474b51af218a9879

    Choose File ...   File name...
    Cancel
    • C4080a80fcc0372266ae71bfd83b63b5?s=40&d=identicon
    Show/hide discussion
    Thiago Ribeiro started a discussion on commit 55b79c67
    last updated by Thiago Ribeiro
  • C4080a80fcc0372266ae71bfd83b63b5?s=40&d=identicon
    Link here  
    Thiago Ribeiro @thiagovsk

    mentioned in commit ce7a76d4f2bf7538ffaa525dfba26e85995c70b1

    Choose File ...   File name...
    Cancel