diff --git a/src/noosfero-spb/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb b/src/noosfero-spb/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb index b11c44c..fa3ca68 100644 --- a/src/noosfero-spb/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb +++ b/src/noosfero-spb/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb @@ -1,7 +1,7 @@ <% if user_rating.institution %>
- <%=_("Institution")%> : <%= user_rating.institution.name %> + <%=_("Institution")%>: <%= user_rating.institution.name %>
<% end %> 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..ac36f23 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,12 +1,12 @@ <% if user_rating.institution %>
- <%=_("Institution")%> : <%= user_rating.institution.name %> + <%=_("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.") %> +
+ <%=_("This institution already has an accepted rating. Accepting it will automatically update the saved value.") %>
<% 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 c0e2aaf..e3a8182 100644 --- a/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css +++ b/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css @@ -633,107 +633,3 @@ } /*** end fo software internal pages ***/ - -/*** organization-rating review page (tasks of software) ***/ - -.task-list .task_boxes{ - font-family: Arial; -} - -.task-list .task_boxes .task_box .task_date{ - position: absolute; - left: 80px; -} - -.task_boxes .task_box .task_title{ - position: absolute; - left: 80px; - font-weight: 500; - margin-top: 10px; -} - -.task_boxes .task_box .task_responsible{ - text-align: right; -} - -.task_boxes .task_box .task_responsible span select{ - padding: 4px 15px 1px 4px; -} - -.task_boxes .task_box .task_decisions{ - float: right; - padding-right: 5px; -} - -.task_boxes .task_box .task_information{ - margin-top: 40px; - font-size: 13px; -} - -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited{ - float: left; - font-weight: 900; -} - -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value{ - font-weight: 900; - margin-left: 160px; -} - -.task_boxes .task_box .organization-rating-comment-body .aditional-informations{ - margin-top: 10px; - margin-bottom: 10px; - border-bottom: 1px solid #CDCDCD; - padding-bottom: 15px; -} - -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-user-institution span span{ - font-weight: 900; -} - -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited span{ - font-weight: 100; -} - -.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value span{ - font-weight: 100; -} - -.task_boxes .task_box .organization-rating-comment-body .task-comment span{ - font-weight: 600; - color: rgb(140, 140, 140); - font-size: 11px; -} - -.task_boxes .task_box .organization-rating-comment-body .task-comment{ - margin-bottom: 15px; -} - -.task_boxes .task_box .organization-rating-comment-body .task-comment span p{ - font-weight: 100; - font-size: 12px; - color: black; - line-height: 16px; -} - -.task_boxes .task_box .organization-rating-comment-body .task-comment{ - line-height: 25px; -} - -.task_boxes .task_box .organization-rating-comment-body .rating-notice{ - display: block; - color: #F11467; - padding: 5px 5px; - background: #ccc; -} - -.task_boxes .task_box .organization-rating-comment-body .task-star-container{ - margin-bottom: 30px; - margin-top: 10px; -} - -.action-tasks-index .task_box{ - padding: 10px; -} - -/*** end of organization-rating review page (tasks of software) ***/ diff --git a/src/noosfero-spb/noosfero-spb-theme/css/use-report.css b/src/noosfero-spb/noosfero-spb-theme/css/use-report.css index 17d35b2..dfa6755 100644 --- a/src/noosfero-spb/noosfero-spb-theme/css/use-report.css +++ b/src/noosfero-spb/noosfero-spb-theme/css/use-report.css @@ -555,3 +555,128 @@ .comments-software-extra-fields .tooltip-inner { display: block; } + +/*** organization-rating review page (tasks of software) ***/ + +.task-list .task_boxes{ + font-family: Arial; +} + +.task-list .task_boxes .task_box .task_date{ + position: absolute; + left: 80px; +} + +.task_boxes .task_box .task_title{ + position: absolute; + left: 80px; + font-weight: 500; + margin-top: 10px; +} + +.task_boxes .task_box .task_responsible{ + text-align: right; +} + +.task_boxes .task_box .task_responsible span select{ + padding: 4px 15px 1px 4px; + width: 97px; +} + +.task_boxes .task_box .task_decisions{ + float: right; + padding-right: 5px; +} + +.task_boxes .task_box .task_information{ + margin-top: 40px; + font-size: 13px; +} + +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited{ + float: left; + font-weight: 900; + margin-right: 10px; +} + +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value{ + font-weight: 900; + margin-left: 160px; +} + +.task_boxes .task_box .organization-rating-comment-body .aditional-informations{ + margin-top: 10px; + padding-bottom: 15px; +} + +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-user-institution span span{ + font-weight: 900; +} + +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited span{ + font-weight: 100; +} + +.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value span{ + font-weight: 100; +} + +.task_boxes .task_box .organization-rating-comment-body .task-comment span{ + font-weight: 600; + color: rgb(140, 140, 140); + font-size: 11px; +} + +.task_boxes .task_box .organization-rating-comment-body .task-comment{ + margin-bottom: 15px; + line-height: 25px; +} + +.task_boxes .task_box .organization-rating-comment-body .task-comment span p{ + font-weight: 100; + font-size: 12px; + color: black; + line-height: 16px; +} + +.task_boxes .task_box .organization-rating-comment-body .task-comment p{ + font-size: 13px; +} + +.task_boxes .task_box .organization-rating-comment-body .rating-notice{ + display: block; + color: #F11467; + padding: 5px 5px; + background: #ccc; +} + +.task_boxes .task_box .organization-rating-comment-body .task-star-container{ + margin-bottom: 30px; + margin-top: 10px; +} + +.action-tasks-index .task_box{ + 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_task_extra_fields_show_statistics.html.erb b/src/noosfero-spb/software_communities/views/organization_ratings_task_extra_fields_show_statistics.html.erb index 2d52d58..dbecea3 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")%> : <%= number_with_delimiter(user_rating.people_benefited, :locale => :pt) unless user_rating.nil? %> + <%=_("Benefited People")%>: <%= number_with_delimiter(user_rating.people_benefited, :locale => :pt) unless user_rating.nil? %>
- <%=_("Saved Resources")%> : <%= number_to_currency(user_rating.saved_value) unless user_rating.nil? %> + <%=_("Saved Resources")%>: <%= number_to_currency(user_rating.saved_value) unless user_rating.nil? %>
- -- libgit2 0.21.2