Download as
Browse Code »

Commit 8ee24462a194d7c4f151ae9ee545304df341f77b

Authored by Dylan Guedes
Committed by Melissa Wen
1 parent ac32fe08
Exists in master and in 51 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_software_api

Fixes minor style bugs that occurred in dev. Adds humanized style for numbers. F… 

…ixes in translations.

closes #469 #559

Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Peter Lima <peterlima@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Showing 5 changed files with 131 additions and 111 deletions   Show diff stats
src/noosfero-spb/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb
  Diff comments   View file @8ee2446
1 <% if user_rating.institution %> 1 <% if user_rating.institution %>
2 <div class="aditional-informations"> 2 <div class="aditional-informations">
3 <div class="comments-user-institution"> 3 <div class="comments-user-institution">
4 - <span><%=_("Institution")%> :</span> <%= user_rating.institution.name %> 4 + <span><%=_("Institution")%>:</span> <%= user_rating.institution.name %>
5 </div> 5 </div>
6 </div> 6 </div>
7 <% end %> 7 <% end %>
src/noosfero-spb/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb
  Diff comments   View file @8ee2446
1 <% if user_rating.institution %> 1 <% if user_rating.institution %>
2 <div class="aditional-informations"> 2 <div class="aditional-informations">
3 <div class="comments-user-institution"> 3 <div class="comments-user-institution">
4 - <span><%=_("Institution")%> :</span> <%= user_rating.institution.name %> 4 + <span><%=_("Institution")%>:</span> <%= user_rating.institution.name %>
5 </div> 5 </div>
6 6
7 <% if user_rating.institution.has_accepted_rating?(user_rating) %> 7 <% if user_rating.institution.has_accepted_rating?(user_rating) %>
8 - <div class="">  
9 - <span><%=_("This instiution already has an accepted rating. Accepting it will automatically update the saved value.") %></span> 8 + <div class="already-approved-report">
  9 + <span><%=_("This institution already has an accepted rating. Accepting it will automatically update the saved value.") %></span>
10 </div> 10 </div>
11 <% end %> 11 <% end %>
12 </div> 12 </div>
src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
  Diff comments   View file @8ee2446
@@ -633,107 +633,3 @@ @@ -633,107 +633,3 @@
633 } 633 }
634 634
635 /*** end fo software internal pages ***/ 635 /*** end fo software internal pages ***/
636 -  
637 -/*** organization-rating review page (tasks of software) ***/  
638 -  
639 -.task-list .task_boxes{  
640 - font-family: Arial;  
641 -}  
642 -  
643 -.task-list .task_boxes .task_box .task_date{  
644 - position: absolute;  
645 - left: 80px;  
646 -}  
647 -  
648 -.task_boxes .task_box .task_title{  
649 - position: absolute;  
650 - left: 80px;  
651 - font-weight: 500;  
652 - margin-top: 10px;  
653 -}  
654 -  
655 -.task_boxes .task_box .task_responsible{  
656 - text-align: right;  
657 -}  
658 -  
659 -.task_boxes .task_box .task_responsible span select{  
660 - padding: 4px 15px 1px 4px;  
661 -}  
662 -  
663 -.task_boxes .task_box .task_decisions{  
664 - float: right;  
665 - padding-right: 5px;  
666 -}  
667 -  
668 -.task_boxes .task_box .task_information{  
669 - margin-top: 40px;  
670 - font-size: 13px;  
671 -}  
672 -  
673 -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited{  
674 - float: left;  
675 - font-weight: 900;  
676 -}  
677 -  
678 -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value{  
679 - font-weight: 900;  
680 - margin-left: 160px;  
681 -}  
682 -  
683 -.task_boxes .task_box .organization-rating-comment-body .aditional-informations{  
684 - margin-top: 10px;  
685 - margin-bottom: 10px;  
686 - border-bottom: 1px solid #CDCDCD;  
687 - padding-bottom: 15px;  
688 -}  
689 -  
690 -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-user-institution span span{  
691 - font-weight: 900;  
692 -}  
693 -  
694 -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited span{  
695 - font-weight: 100;  
696 -}  
697 -  
698 -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value span{  
699 - font-weight: 100;  
700 -}  
701 -  
702 -.task_boxes .task_box .organization-rating-comment-body .task-comment span{  
703 - font-weight: 600;  
704 - color: rgb(140, 140, 140);  
705 - font-size: 11px;  
706 -}  
707 -  
708 -.task_boxes .task_box .organization-rating-comment-body .task-comment{  
709 - margin-bottom: 15px;  
710 -}  
711 -  
712 -.task_boxes .task_box .organization-rating-comment-body .task-comment span p{  
713 - font-weight: 100;  
714 - font-size: 12px;  
715 - color: black;  
716 - line-height: 16px;  
717 -}  
718 -  
719 -.task_boxes .task_box .organization-rating-comment-body .task-comment{  
720 - line-height: 25px;  
721 -}  
722 -  
723 -.task_boxes .task_box .organization-rating-comment-body .rating-notice{  
724 - display: block;  
725 - color: #F11467;  
726 - padding: 5px 5px;  
727 - background: #ccc;  
728 -}  
729 -  
730 -.task_boxes .task_box .organization-rating-comment-body .task-star-container{  
731 - margin-bottom: 30px;  
732 - margin-top: 10px;  
733 -}  
734 -  
735 -.action-tasks-index .task_box{  
736 - padding: 10px;  
737 -}  
738 -  
739 -/*** end of organization-rating review page (tasks of software) ***/  
src/noosfero-spb/noosfero-spb-theme/css/use-report.css
  Diff comments   View file @8ee2446
@@ -555,3 +555,128 @@ @@ -555,3 +555,128 @@
555 .comments-software-extra-fields .tooltip-inner { 555 .comments-software-extra-fields .tooltip-inner {
556 display: block; 556 display: block;
557 } 557 }
  558 +
  559 +/*** organization-rating review page (tasks of software) ***/
  560 +
  561 +.task-list .task_boxes{
  562 + font-family: Arial;
  563 +}
  564 +
  565 +.task-list .task_boxes .task_box .task_date{
  566 + position: absolute;
  567 + left: 80px;
  568 +}
  569 +
  570 +.task_boxes .task_box .task_title{
  571 + position: absolute;
  572 + left: 80px;
  573 + font-weight: 500;
  574 + margin-top: 10px;
  575 +}
  576 +
  577 +.task_boxes .task_box .task_responsible{
  578 + text-align: right;
  579 +}
  580 +
  581 +.task_boxes .task_box .task_responsible span select{
  582 + padding: 4px 15px 1px 4px;
  583 + width: 97px;
  584 +}
  585 +
  586 +.task_boxes .task_box .task_decisions{
  587 + float: right;
  588 + padding-right: 5px;
  589 +}
  590 +
  591 +.task_boxes .task_box .task_information{
  592 + margin-top: 40px;
  593 + font-size: 13px;
  594 +}
  595 +
  596 +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited{
  597 + float: left;
  598 + font-weight: 900;
  599 + margin-right: 10px;
  600 +}
  601 +
  602 +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value{
  603 + font-weight: 900;
  604 + margin-left: 160px;
  605 +}
  606 +
  607 +.task_boxes .task_box .organization-rating-comment-body .aditional-informations{
  608 + margin-top: 10px;
  609 + padding-bottom: 15px;
  610 +}
  611 +
  612 +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-user-institution span span{
  613 + font-weight: 900;
  614 +}
  615 +
  616 +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited span{
  617 + font-weight: 100;
  618 +}
  619 +
  620 +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value span{
  621 + font-weight: 100;
  622 +}
  623 +
  624 +.task_boxes .task_box .organization-rating-comment-body .task-comment span{
  625 + font-weight: 600;
  626 + color: rgb(140, 140, 140);
  627 + font-size: 11px;
  628 +}
  629 +
  630 +.task_boxes .task_box .organization-rating-comment-body .task-comment{
  631 + margin-bottom: 15px;
  632 + line-height: 25px;
  633 +}
  634 +
  635 +.task_boxes .task_box .organization-rating-comment-body .task-comment span p{
  636 + font-weight: 100;
  637 + font-size: 12px;
  638 + color: black;
  639 + line-height: 16px;
  640 +}
  641 +
  642 +.task_boxes .task_box .organization-rating-comment-body .task-comment p{
  643 + font-size: 13px;
  644 +}
  645 +
  646 +.task_boxes .task_box .organization-rating-comment-body .rating-notice{
  647 + display: block;
  648 + color: #F11467;
  649 + padding: 5px 5px;
  650 + background: #ccc;
  651 +}
  652 +
  653 +.task_boxes .task_box .organization-rating-comment-body .task-star-container{
  654 + margin-bottom: 30px;
  655 + margin-top: 10px;
  656 +}
  657 +
  658 +.action-tasks-index .task_box{
  659 + padding: 10px;
  660 +}
  661 +
  662 +.organization-rating-comment-body .aditional-informations .comments-user-institution{
  663 + border-top: 1px solid #bbb;
  664 + padding-top: 10px;
  665 + margin-bottom: 10px;
  666 +}
  667 +
  668 +.organization-rating-comment-body .aditional-informations .already-approved-report{
  669 + border-top: 1px solid #bbb;
  670 + padding-top: 10px;
  671 + padding-top: 20px;
  672 +}
  673 +
  674 +.organization-rating-comment-body .aditional-informations .already-approved-report span{
  675 + background: #444444;
  676 + color: white;
  677 + display: block;
  678 + padding: 5px;
  679 + color: #dbdada;
  680 +}
  681 +
  682 +/*** end of organization-rating review page (tasks of software) ***/
src/noosfero-spb/software_communities/views/organization_ratings_task_extra_fields_show_statistics.html.erb
  Diff comments   View file @8ee2446
1 <div class="aditional-informations"> 1 <div class="aditional-informations">
2 <div class="comments-people-benefited"> 2 <div class="comments-people-benefited">
3 - <span><%=_("Benefited People")%> :</span> <%= number_with_delimiter(user_rating.people_benefited, :locale => :pt) unless user_rating.nil? %> 3 + <span><%=_("Benefited People")%>:</span> <%= number_with_delimiter(user_rating.people_benefited, :locale => :pt) unless user_rating.nil? %>
4 </div> 4 </div>
5 5
6 <div class="comments-saved-value"> 6 <div class="comments-saved-value">
7 - <span><%=_("Saved Resources")%> :</span> <%= number_to_currency(user_rating.saved_value) unless user_rating.nil? %> 7 + <span><%=_("Saved Resources")%>:</span> <%= number_to_currency(user_rating.saved_value) unless user_rating.nil? %>
8 </div> 8 </div>
9 </div> 9 </div>
10 -