From 704d0ad28751fee220e7857631d38d48e7bdf60d Mon Sep 17 00:00:00 2001 From: DylanGuedes Date: Mon, 7 Dec 2015 19:26:03 -0200 Subject: [PATCH] Makes phrases about already accepted reports, and makes numbers more pleasant to humans. #469 --- src/noosfero-spb/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb | 20 ++++++++++---------- src/noosfero-spb/noosfero-spb-theme/css/software-pages.css | 23 +++++++++++++++++++++-- src/noosfero-spb/software_communities/views/organization_ratings_container_extra_fields_show_statistics.html.erb | 3 +-- src/noosfero-spb/software_communities/views/organization_ratings_task_extra_fields_show_statistics.html.erb | 5 ++--- src/noosfero-spb/software_communities/views/software_communities_plugin_profile/discussion_lists.html.erb | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 src/noosfero-spb/software_communities/views/software_communities_plugin_profile/discussion_lists.html.erb diff --git a/src/noosfero-spb/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb b/src/noosfero-spb/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb index 7aee1dc..7995501 100644 --- a/src/noosfero-spb/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb +++ b/src/noosfero-spb/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb @@ -1,13 +1,13 @@ <% if user_rating.institution %> -
-
- <%=_("Institution")%> : <%= user_rating.institution.name %> -
- - <% if user_rating.institution.has_accepted_rating?(user_rating) %> -
- <%=_("This instiution already has an accepted rating. Accepting it will automatically update the saved value.") %> +
+
+ <%=_("Institution")%> : <%= user_rating.institution.name %>
- <% end %> -
+ + <% if user_rating.institution.has_accepted_rating?(user_rating) %> +
+ <%=_("* You already approved a report from this organization/enterprise. By accepting this report, the new value will be added.") %> +
+ <% end %> +
<% end %> diff --git a/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css index 4a18d44..d3328c6 100644 --- a/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css +++ b/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css @@ -679,8 +679,7 @@ .task_boxes .task_box .organization-rating-comment-body .aditional-informations{ margin-top: 10px; - margin-bottom: 10px; - border-bottom: 1px solid #CDCDCD; + /*margin-bottom: 10px;*/ padding-bottom: 15px; } @@ -733,4 +732,24 @@ padding: 10px; } +.organization-rating-comment-body .aditional-informations .comments-user-institution{ + border-top: 1px solid #bbb; + padding-top: 10px; + margin-bottom: 10px; +} + +.organization-rating-comment-body .aditional-informations .already-approved-report{ + border-top: 1px solid #bbb; + padding-top: 10px; + padding-top: 20px; +} + +.organization-rating-comment-body .aditional-informations .already-approved-report span{ + background: #444444; + color: white; + display: block; + padding: 5px; + color: #dbdada; +} + /*** end of organization-rating review page (tasks of software) ***/ diff --git a/src/noosfero-spb/software_communities/views/organization_ratings_container_extra_fields_show_statistics.html.erb b/src/noosfero-spb/software_communities/views/organization_ratings_container_extra_fields_show_statistics.html.erb index 497b402..e6dec98 100644 --- a/src/noosfero-spb/software_communities/views/organization_ratings_container_extra_fields_show_statistics.html.erb +++ b/src/noosfero-spb/software_communities/views/organization_ratings_container_extra_fields_show_statistics.html.erb @@ -1,10 +1,9 @@
- <%=_("Benefited People")%>: <%= number_with_delimiter(user_rating.people_benefited, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter) unless user_rating.nil? %> + <%=_("Benefited People")%>: <%= number_to_human(user_rating.people_benefited) unless user_rating.nil? %>
<%=_("Saved Resources")%>: <%= float_to_currency(user_rating.saved_value) unless user_rating.nil? %>
- diff --git a/src/noosfero-spb/software_communities/views/organization_ratings_task_extra_fields_show_statistics.html.erb b/src/noosfero-spb/software_communities/views/organization_ratings_task_extra_fields_show_statistics.html.erb index 0e57615..db93364 100644 --- a/src/noosfero-spb/software_communities/views/organization_ratings_task_extra_fields_show_statistics.html.erb +++ b/src/noosfero-spb/software_communities/views/organization_ratings_task_extra_fields_show_statistics.html.erb @@ -1,10 +1,9 @@
- <%=_("Benefited People")%> : <%= user_rating.people_benefited unless user_rating.nil? %> + <%=_("Benefited People")%>: <%= number_to_human (user_rating.people_benefited) unless user_rating.nil? %>
- <%=_("Saved Resources")%> : <%= user_rating.saved_value unless user_rating.nil? %> + <%=_("Saved Resources")%>: <%= float_to_currency (user_rating.saved_value) unless user_rating.nil? %>
- diff --git a/src/noosfero-spb/software_communities/views/software_communities_plugin_profile/discussion_lists.html.erb b/src/noosfero-spb/software_communities/views/software_communities_plugin_profile/discussion_lists.html.erb new file mode 100644 index 0000000..874368c --- /dev/null +++ b/src/noosfero-spb/software_communities/views/software_communities_plugin_profile/discussion_lists.html.erb @@ -0,0 +1,32 @@ +
+
+

<%= _('Como participar da lista de discussão') %>

+

+ <%= _('A principal diferença do antigo ambiente do Colab para o Novo Portal do SPB é 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.') %> +

+ +

+ <%= _('A economia de recursos é somente uma das vantagens na adoção do Software público, além da liberdade de escolha dos fornecedores e garantia de continuidade do sistema, uma vez apoiado pelo Ministério do Planejamento.') %> +

+
+ +
+

<%= _('Duvidas frequentes') %>

+
    +
  • + + <%= link_to _('Como se inscrever nas listas?'), '#' %> +
    • + +
  • + + <%= link_to _('Como cancelar minha assinatura nas listas?'), '#' %> +
    • + +
  • + + <%= link_to _('Como enviar mensagens para as listas?'), '#' %> +
    • +
+
+
-- libgit2 0.21.2