Download as
Browse Code »

Commit 704d0ad28751fee220e7857631d38d48e7bdf60d

Authored by Dylan Guedes
1 parent c684331b
Exists in review_message

Makes phrases about already accepted reports, and makes numbers more pleasant to humans. #469 

Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Showing 5 changed files with 66 additions and 17 deletions   Show diff stats
src/noosfero-spb/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb
  Diff comments   View file @704d0ad
1 <% if user_rating.institution %> 1 <% if user_rating.institution %>
2 -<div class="aditional-informations">  
3 - <div class="comments-user-institution">  
4 - <span><%=_("Institution")%> :</span> <%= user_rating.institution.name %>  
5 - </div>  
6 -  
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> 2 + <div class="aditional-informations">
  3 + <div class="comments-user-institution">
  4 + <span><%=_("Institution")%> :</span> <%= user_rating.institution.name %>
10 </div> 5 </div>
11 - <% end %>  
12 -</div> 6 +
  7 + <% if user_rating.institution.has_accepted_rating?(user_rating) %>
  8 + <div class="already-approved-report">
  9 + <span><%=_("* You already approved a report from this organization/enterprise. By accepting this report, the new value will be added.") %></span>
  10 + </div>
  11 + <% end %>
  12 + </div>
13 <% end %> 13 <% end %>
src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
  Diff comments   View file @704d0ad
@@ -679,8 +679,7 @@ @@ -679,8 +679,7 @@
679 679
680 .task_boxes .task_box .organization-rating-comment-body .aditional-informations{ 680 .task_boxes .task_box .organization-rating-comment-body .aditional-informations{
681 margin-top: 10px; 681 margin-top: 10px;
682 - margin-bottom: 10px;  
683 - border-bottom: 1px solid #CDCDCD; 682 + /*margin-bottom: 10px;*/
684 padding-bottom: 15px; 683 padding-bottom: 15px;
685 } 684 }
686 685
@@ -733,4 +732,24 @@ @@ -733,4 +732,24 @@
733 padding: 10px; 732 padding: 10px;
734 } 733 }
735 734
  735 +.organization-rating-comment-body .aditional-informations .comments-user-institution{
  736 + border-top: 1px solid #bbb;
  737 + padding-top: 10px;
  738 + margin-bottom: 10px;
  739 +}
  740 +
  741 +.organization-rating-comment-body .aditional-informations .already-approved-report{
  742 + border-top: 1px solid #bbb;
  743 + padding-top: 10px;
  744 + padding-top: 20px;
  745 +}
  746 +
  747 +.organization-rating-comment-body .aditional-informations .already-approved-report span{
  748 + background: #444444;
  749 + color: white;
  750 + display: block;
  751 + padding: 5px;
  752 + color: #dbdada;
  753 +}
  754 +
736 /*** end of organization-rating review page (tasks of software) ***/ 755 /*** end of organization-rating review page (tasks of software) ***/
src/noosfero-spb/software_communities/views/organization_ratings_container_extra_fields_show_statistics.html.erb
  Diff comments   View file @704d0ad
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, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter) unless user_rating.nil? %> 3 + <span><%=_("Benefited People")%>:</span> <%= number_to_human(user_rating.people_benefited) 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> <%= float_to_currency(user_rating.saved_value) unless user_rating.nil? %> 7 <span><%=_("Saved Resources")%>:</span> <%= float_to_currency(user_rating.saved_value) unless user_rating.nil? %>
8 </div> 8 </div>
9 </div> 9 </div>
10 -  
src/noosfero-spb/software_communities/views/organization_ratings_task_extra_fields_show_statistics.html.erb
  Diff comments   View file @704d0ad
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> <%= user_rating.people_benefited unless user_rating.nil? %> 3 + <span><%=_("Benefited People")%>:</span> <%= number_to_human (user_rating.people_benefited) 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> <%= user_rating.saved_value unless user_rating.nil? %> 7 + <span><%=_("Saved Resources")%>:</span> <%= float_to_currency (user_rating.saved_value) unless user_rating.nil? %>
8 </div> 8 </div>
9 </div> 9 </div>
10 -  
src/noosfero-spb/software_communities/views/software_communities_plugin_profile/discussion_lists.html.erb 0 → 100644
  Diff comments   View file @704d0ad
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
  1 +<div class='discussion-lists'>
  2 + <div class='how-to-join'>
  3 + <h1><%= _('Como participar da lista de discussão') %></h1>
  4 + <p>
  5 + <%= _('A principal diferença do antigo ambiente do <strong>Colab</strong> para o <strong>Novo Portal do SPB</strong> é a forma dos usuários interagirem com a comunidade. Foram criadas listas de discussão. E serão por meio delas que a comunidade deverá comunicar-se.') %>
  6 + </p>
  7 +
  8 + <p>
  9 + <%= _('A economia de recursos é somente uma das vantagens na adoção do <strong>Software público</strong>, além da liberdade de escolha dos fornecedores e garantia de continuidade do sistema, uma vez apoiado pelo <strong>Ministério do Planejamento</strong>.') %>
  10 + </p>
  11 + </div>
  12 +
  13 + <div class='discussion-lists-faq'>
  14 + <h2><%= _('Duvidas frequentes') %></h2>
  15 + <ul>
  16 + <li class='list-items discussion-list-button'>
  17 + <span class='fa fa-th-list'></span>
  18 + <%= link_to _('Como se inscrever nas listas?'), '#' %>
  19 + </li>
  20 +
  21 + <li class='list-items discussion-list-button'>
  22 + <span class='fa fa-ban'></span>
  23 + <%= link_to _('Como cancelar minha assinatura nas listas?'), '#' %>
  24 + </li>
  25 +
  26 + <li class='list-items discussion-list-button'>
  27 + <span class='fa fa-paper-plane'></span>
  28 + <%= link_to _('Como enviar mensagens para as listas?'), '#' %>
  29 + </li>
  30 + </ul>
  31 + </div>
  32 +</div>