Commit be5e09b563734c87d19eb2776c014ac632ef71ad
1 parent
16475058
Exists in
refactor_software_info_to_software
and in
1 other branch
Fix cucumber tests
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing
27 changed files
with
159 additions
and
159 deletions
Show diff stats
src/noosfero-spb/software_communities/features/categories_and_tags_block.feature
@@ -22,8 +22,8 @@ Feature: go to software search when click on category | @@ -22,8 +22,8 @@ Feature: go to software search when click on category | ||
22 | | Software Two | true | Health, Education | some finality | | 22 | | Software Two | true | Health, Education | some finality | |
23 | | Software Three | false | Education | some finality | | 23 | | Software Three | false | Education | some finality | |
24 | And the following blocks | 24 | And the following blocks |
25 | - | owner | type | | ||
26 | - | software-three | CategoriesAndTagsBlock | | 25 | + | owner | type | |
26 | + | software-three | SoftwareCommunitiesPlugin::CategoriesAndTagsBlock | | ||
27 | 27 | ||
28 | Scenario: Search softwares by education category | 28 | Scenario: Search softwares by education category |
29 | Given I go to /software-three | 29 | Given I go to /software-three |
src/noosfero-spb/software_communities/features/categories_softwares_block.feature
@@ -22,8 +22,8 @@ Feature: go to software search when click on category | @@ -22,8 +22,8 @@ Feature: go to software search when click on category | ||
22 | | Software Two | true | Health, Education | some finality | | 22 | | Software Two | true | Health, Education | some finality | |
23 | | Software Three | false | Education | some finality | | 23 | | Software Three | false | Education | some finality | |
24 | And the following blocks | 24 | And the following blocks |
25 | - | owner | type | | ||
26 | - | environment | CategoriesSoftwareBlock | | 25 | + | owner | type | |
26 | + | environment | SoftwareCommunitiesPlugin::CategoriesSoftwareBlock | | ||
27 | 27 | ||
28 | Scenario: Search softwares by education category | 28 | Scenario: Search softwares by education category |
29 | Given I go to / | 29 | Given I go to / |
src/noosfero-spb/software_communities/features/software_block.feature
@@ -14,19 +14,19 @@ Feature: edit adherent fields | @@ -14,19 +14,19 @@ Feature: edit adherent fields | ||
14 | | Public Software | true | some finality | | 14 | | Public Software | true | some finality | |
15 | | Generic Software | false | some finality | | 15 | | Generic Software | false | some finality | |
16 | And the following blocks | 16 | And the following blocks |
17 | - | owner | type | | ||
18 | - | environment | SoftwaresBlock | | 17 | + | owner | type | |
18 | + | environment | SoftwareCommunitiesPlugin::SoftwaresBlock | | ||
19 | 19 | ||
20 | Scenario: Change software block to generic software block | 20 | Scenario: Change software block to generic software block |
21 | Given I go to /admin/environment_design | 21 | Given I go to /admin/environment_design |
22 | - And I follow "Edit" within ".block.softwares-block" | 22 | + And I follow "Edit" within ".block.software-communities-plugin_softwares-block" |
23 | When I select "Generic" from "block_software_type" | 23 | When I select "Generic" from "block_software_type" |
24 | And I press "Save" | 24 | And I press "Save" |
25 | Then I should see "Generic Software" | 25 | Then I should see "Generic Software" |
26 | 26 | ||
27 | Scenario: Change software block to generic software block | 27 | Scenario: Change software block to generic software block |
28 | Given I go to /admin/environment_design | 28 | Given I go to /admin/environment_design |
29 | - And I follow "Edit" within ".block.softwares-block" | 29 | + And I follow "Edit" within ".block.software-communities-plugin_softwares-block" |
30 | When I select "Public" from "block_software_type" | 30 | When I select "Public" from "block_software_type" |
31 | And I press "Save" | 31 | And I press "Save" |
32 | Then I should see "Public Software" | 32 | Then I should see "Public Software" |
src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
1 | Given /^SoftwareInfo has initial default values on database$/ do | 1 | Given /^SoftwareInfo has initial default values on database$/ do |
2 | - LicenseInfo.create(:version=>"None", :link=>"") | ||
3 | - LicenseInfo.create(:version=>"GPL-2", :link =>"www.gpl2.com") | ||
4 | - LicenseInfo.create(:version=>"GPL-3", :link =>"www.gpl3.com") | ||
5 | - | ||
6 | - ProgrammingLanguage.create(:name=>"C") | ||
7 | - ProgrammingLanguage.create(:name=>"C++") | ||
8 | - ProgrammingLanguage.create(:name=>"Ruby") | ||
9 | - ProgrammingLanguage.create(:name=>"Python") | ||
10 | - | ||
11 | - DatabaseDescription.create(:name => "Oracle") | ||
12 | - DatabaseDescription.create(:name => "MySQL") | ||
13 | - DatabaseDescription.create(:name => "Apache") | ||
14 | - DatabaseDescription.create(:name => "PostgreSQL") | ||
15 | - | ||
16 | - OperatingSystemName.create(:name=>"Debian") | ||
17 | - OperatingSystemName.create(:name=>"Fedora") | ||
18 | - OperatingSystemName.create(:name=>"CentOS") | 2 | + SoftwareCommunitiesPlugin::LicenseInfo.create(:version=>"None", :link=>"") |
3 | + SoftwareCommunitiesPlugin::LicenseInfo.create(:version=>"GPL-2", :link =>"www.gpl2.com") | ||
4 | + SoftwareCommunitiesPlugin::LicenseInfo.create(:version=>"GPL-3", :link =>"www.gpl3.com") | ||
5 | + | ||
6 | + SoftwareCommunitiesPlugin::ProgrammingLanguage.create(:name=>"C") | ||
7 | + SoftwareCommunitiesPlugin::ProgrammingLanguage.create(:name=>"C++") | ||
8 | + SoftwareCommunitiesPlugin::ProgrammingLanguage.create(:name=>"Ruby") | ||
9 | + SoftwareCommunitiesPlugin::ProgrammingLanguage.create(:name=>"Python") | ||
10 | + | ||
11 | + SoftwareCommunitiesPlugin::DatabaseDescription.create(:name => "Oracle") | ||
12 | + SoftwareCommunitiesPlugin::DatabaseDescription.create(:name => "MySQL") | ||
13 | + SoftwareCommunitiesPlugin::DatabaseDescription.create(:name => "Apache") | ||
14 | + SoftwareCommunitiesPlugin::DatabaseDescription.create(:name => "PostgreSQL") | ||
15 | + | ||
16 | + SoftwareCommunitiesPlugin::OperatingSystemName.create(:name=>"Debian") | ||
17 | + SoftwareCommunitiesPlugin::OperatingSystemName.create(:name=>"Fedora") | ||
18 | + SoftwareCommunitiesPlugin::OperatingSystemName.create(:name=>"CentOS") | ||
19 | end | 19 | end |
20 | 20 | ||
21 | Given /^Institutions has initial default values on database$/ do | 21 | Given /^Institutions has initial default values on database$/ do |
22 | - GovernmentalPower.create(:name => "Executivo") | ||
23 | - GovernmentalPower.create(:name => "Legislativo") | ||
24 | - GovernmentalPower.create(:name => "Judiciario") | 22 | + SoftwareCommunitiesPlugin::GovernmentalPower.create(:name => "Executivo") |
23 | + SoftwareCommunitiesPlugin::GovernmentalPower.create(:name => "Legislativo") | ||
24 | + SoftwareCommunitiesPlugin::GovernmentalPower.create(:name => "Judiciario") | ||
25 | 25 | ||
26 | - GovernmentalSphere.create(:name => "Federal") | 26 | + SoftwareCommunitiesPlugin::GovernmentalSphere.create(:name => "Federal") |
27 | 27 | ||
28 | - JuridicalNature.create(:name => "Autarquia") | ||
29 | - JuridicalNature.create(:name => "Administracao Direta") | ||
30 | - JuridicalNature.create(:name => "Empresa Publica") | ||
31 | - JuridicalNature.create(:name => "Fundacao") | ||
32 | - JuridicalNature.create(:name => "Orgao Autonomo") | ||
33 | - JuridicalNature.create(:name => "Sociedade") | ||
34 | - JuridicalNature.create(:name => "Sociedade Civil") | ||
35 | - JuridicalNature.create(:name => "Sociedade de Economia Mista") | 28 | + SoftwareCommunitiesPlugin::JuridicalNature.create(:name => "Autarquia") |
29 | + SoftwareCommunitiesPlugin::JuridicalNature.create(:name => "Administracao Direta") | ||
30 | + SoftwareCommunitiesPlugin::JuridicalNature.create(:name => "Empresa Publica") | ||
31 | + SoftwareCommunitiesPlugin::JuridicalNature.create(:name => "Fundacao") | ||
32 | + SoftwareCommunitiesPlugin::JuridicalNature.create(:name => "Orgao Autonomo") | ||
33 | + SoftwareCommunitiesPlugin::JuridicalNature.create(:name => "Sociedade") | ||
34 | + SoftwareCommunitiesPlugin::JuridicalNature.create(:name => "Sociedade Civil") | ||
35 | + SoftwareCommunitiesPlugin::JuridicalNature.create(:name => "Sociedade de Economia Mista") | ||
36 | 36 | ||
37 | national_region = NationalRegion.new | 37 | national_region = NationalRegion.new |
38 | national_region.name = "Distrito Federal" | 38 | national_region.name = "Distrito Federal" |
@@ -99,12 +99,12 @@ Given /^the following public institutions?$/ do |table| | @@ -99,12 +99,12 @@ Given /^the following public institutions?$/ do |table| | ||
99 | community.city = item[:city] | 99 | community.city = item[:city] |
100 | community.save! | 100 | community.save! |
101 | 101 | ||
102 | - governmental_power = GovernmentalPower.where(:name => item[:governmental_power]).first | ||
103 | - governmental_sphere = GovernmentalSphere.where(:name => item[:governmental_sphere]).first | 102 | + governmental_power = SoftwareCommunitiesPlugin::GovernmentalPower.where(:name => item[:governmental_power]).first |
103 | + governmental_sphere = SoftwareCommunitiesPlugin::GovernmentalSphere.where(:name => item[:governmental_sphere]).first | ||
104 | 104 | ||
105 | - juridical_nature = JuridicalNature.create(:name => item[:juridical_nature]) | 105 | + juridical_nature = SoftwareCommunitiesPlugin::JuridicalNature.create(:name => item[:juridical_nature]) |
106 | 106 | ||
107 | - institution = PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere) | 107 | + institution = SoftwareCommunitiesPlugin::PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere) |
108 | institution.community = community | 108 | institution.community = community |
109 | institution.corporate_name = item[:corporate_name] | 109 | institution.corporate_name = item[:corporate_name] |
110 | institution.save! | 110 | institution.save! |
@@ -113,8 +113,8 @@ end | @@ -113,8 +113,8 @@ end | ||
113 | 113 | ||
114 | Given /^the following software language$/ do |table| | 114 | Given /^the following software language$/ do |table| |
115 | table.hashes.each do |item| | 115 | table.hashes.each do |item| |
116 | - programming_language = ProgrammingLanguage.where(:name=>item[:programing_language]).first | ||
117 | - software_language = SoftwareLanguage::new | 116 | + programming_language = SoftwareCommunitiesPlugin::ProgrammingLanguage.where(:name=>item[:programing_language]).first |
117 | + software_language = SoftwareCommunitiesPlugin::SoftwareLanguage::new | ||
118 | 118 | ||
119 | software_language.programming_language = programming_language | 119 | software_language.programming_language = programming_language |
120 | software_language.version = item[:version] | 120 | software_language.version = item[:version] |
@@ -126,8 +126,8 @@ end | @@ -126,8 +126,8 @@ end | ||
126 | 126 | ||
127 | Given /^the following software databases$/ do |table| | 127 | Given /^the following software databases$/ do |table| |
128 | table.hashes.each do |item| | 128 | table.hashes.each do |item| |
129 | - database_description = DatabaseDescription.where(:name=>item[:database_name]).first | ||
130 | - software_database = SoftwareDatabase::new | 129 | + database_description = SoftwareCommunitiesPlugin::DatabaseDescription.where(:name=>item[:database_name]).first |
130 | + software_database = SoftwareCommunitiesPlugin::SoftwareDatabase::new | ||
131 | 131 | ||
132 | software_database.database_description = database_description | 132 | software_database.database_description = database_description |
133 | software_database.version = item[:version] | 133 | software_database.version = item[:version] |
@@ -140,8 +140,8 @@ end | @@ -140,8 +140,8 @@ end | ||
140 | 140 | ||
141 | Given /^the following operating systems$/ do |table| | 141 | Given /^the following operating systems$/ do |table| |
142 | table.hashes.each do |item| | 142 | table.hashes.each do |item| |
143 | - operating_system_name = OperatingSystemName.where(:name=>item[:operating_system_name]).first | ||
144 | - operating_system = OperatingSystem::new | 143 | + operating_system_name = SoftwareCommunitiesPlugin::OperatingSystemName.where(:name=>item[:operating_system_name]).first |
144 | + operating_system = SoftwareCommunitiesPlugin::OperatingSystem::new | ||
145 | 145 | ||
146 | operating_system.operating_system_name = operating_system_name | 146 | operating_system.operating_system_name = operating_system_name |
147 | operating_system.version = item[:version] | 147 | operating_system.version = item[:version] |
@@ -152,7 +152,7 @@ end | @@ -152,7 +152,7 @@ end | ||
152 | 152 | ||
153 | Given /^the following softwares$/ do |table| | 153 | Given /^the following softwares$/ do |table| |
154 | table.hashes.each do |item| | 154 | table.hashes.each do |item| |
155 | - software_info = SoftwareInfo.new | 155 | + software_info = SoftwareCommunitiesPlugin::SoftwareInfo.new |
156 | community = Community.create(:name=>item[:name]) | 156 | community = Community.create(:name=>item[:name]) |
157 | software_info.community = community | 157 | software_info.community = community |
158 | 158 | ||
@@ -164,23 +164,23 @@ Given /^the following softwares$/ do |table| | @@ -164,23 +164,23 @@ Given /^the following softwares$/ do |table| | ||
164 | software_info.objectives = item[:objectives] if item[:objectives] | 164 | software_info.objectives = item[:objectives] if item[:objectives] |
165 | software_info.features = item[:features] if item[:features] | 165 | software_info.features = item[:features] if item[:features] |
166 | software_info.public_software = item[:public_software] == "true" if item[:public_software] | 166 | software_info.public_software = item[:public_software] == "true" if item[:public_software] |
167 | - software_info.license_info = LicenseInfo.create :version=>"GPL - 1.0" | 167 | + software_info.license_info = SoftwareCommunitiesPlugin::LicenseInfo.create :version=>"GPL - 1.0" |
168 | 168 | ||
169 | if item[:software_language] | 169 | if item[:software_language] |
170 | - programming_language = ProgrammingLanguage.where(:name=>item[:software_language]).first | ||
171 | - software_language = SoftwareLanguage.where(:programming_language_id=>programming_language).first | 170 | + programming_language = SoftwareCommunitiesPlugin::ProgrammingLanguage.where(:name=>item[:software_language]).first |
171 | + software_language = SoftwareCommunitiesPlugin::SoftwareLanguage.where(:programming_language_id=>programming_language).first | ||
172 | software_info.software_languages << software_language | 172 | software_info.software_languages << software_language |
173 | end | 173 | end |
174 | 174 | ||
175 | if item[:software_database] | 175 | if item[:software_database] |
176 | - database_description = DatabaseDescription.where(:name=>item[:software_database]).first | ||
177 | - software_database = SoftwareDatabase.where(:database_description_id=>database_description).first | 176 | + database_description = SoftwareCommunitiesPlugin::DatabaseDescription.where(:name=>item[:software_database]).first |
177 | + software_database = SoftwareCommunitiesPlugin::SoftwareDatabase.where(:database_description_id=>database_description).first | ||
178 | software_info.software_databases << software_database | 178 | software_info.software_databases << software_database |
179 | end | 179 | end |
180 | 180 | ||
181 | if item[:operating_system] | 181 | if item[:operating_system] |
182 | - operating_system_name = OperatingSystemName.where(:name => item[:operating_system]).first | ||
183 | - operating_system = OperatingSystem.where(:operating_system_name_id => operating_system_name).first | 182 | + operating_system_name = SoftwareCommunitiesPlugin::OperatingSystemName.where(:name => item[:operating_system]).first |
183 | + operating_system = SoftwareCommunitiesPlugin::OperatingSystem.where(:operating_system_name_id => operating_system_name).first | ||
184 | software_info.operating_systems << operating_system | 184 | software_info.operating_systems << operating_system |
185 | end | 185 | end |
186 | 186 |
src/noosfero-spb/software_communities/views/box_organizer/_categories_and_tags_block.html.erb
src/noosfero-spb/software_communities/views/box_organizer/_categories_software_block.html.erb
src/noosfero-spb/software_communities/views/box_organizer/_download_block.html.erb
@@ -1,11 +0,0 @@ | @@ -1,11 +0,0 @@ | ||
1 | -<div id='edit-download-block'> | ||
2 | - | ||
3 | - <h3><%= _('Download options') %></h3> | ||
4 | - <div id ="droppable-list-downloads"> | ||
5 | - <% @block.downloads.each do |download| %> | ||
6 | - <%= render :partial => 'download_list', :locals => {:download => download} %> | ||
7 | - <% end %> | ||
8 | - </div> | ||
9 | - | ||
10 | - <%= link_to_function _('New link'), 'softwareDownload.addNewDonwload(); return false', :class => 'button icon-add with-text download-new-link-button' %> | ||
11 | -</div> |
src/noosfero-spb/software_communities/views/box_organizer/_download_list.html.erb
@@ -1 +0,0 @@ | @@ -1 +0,0 @@ | ||
1 | -<%= render :partial => 'box_organizer/download_list_template', :locals => {:download => download} %> |
src/noosfero-spb/software_communities/views/box_organizer/_download_list_template.html.erb
@@ -1,25 +0,0 @@ | @@ -1,25 +0,0 @@ | ||
1 | -<li class='download-option download-forms'> | ||
2 | - <ul> | ||
3 | - <li> | ||
4 | - <%= labelled_form_field(_('Name'), text_field_tag('block[downloads][][name]', (defined? download) ? download[:name] : '')) %> | ||
5 | - </li> | ||
6 | - | ||
7 | - <li> | ||
8 | - <%= labelled_form_field(_('Link'), text_field_tag('block[downloads][][link]', (defined? download) ? download[:link] : '')) %> | ||
9 | - </li> | ||
10 | - | ||
11 | - <li> | ||
12 | - <%= labelled_form_field(_('Platforms'), text_field_tag('block[downloads][][software_description]', (defined? download) ? download[:software_description] : '')) %> | ||
13 | - </li> | ||
14 | - | ||
15 | - <li> | ||
16 | - <%= labelled_form_field(_('Minimum Requirements'), text_field_tag('block[downloads][][minimum_requirements]', (defined? download) ? download[:minimum_requirements] : '')) %> | ||
17 | - </li> | ||
18 | - | ||
19 | - <li> | ||
20 | - <%= labelled_form_field(_('Size'), text_field_tag('block[downloads][][size]', (defined? download) ? download[:size] : '')) %> | ||
21 | - </li> | ||
22 | - | ||
23 | - <li class='delete-download-button'><%= button_without_text(:delete, _('Delete'), "#" , { :onclick => 'softwareDownload.deleteDownload(this); return false', :class=>"delete-link-list-row" }) %></li> | ||
24 | - </ul> | ||
25 | -</li> |
src/noosfero-spb/software_communities/views/box_organizer/_search_catalog_block.html.erb
src/noosfero-spb/software_communities/views/box_organizer/_software_events_block.html.erb
@@ -1,8 +0,0 @@ | @@ -1,8 +0,0 @@ | ||
1 | -<div id='edit-software-events-block' class='formfieldline'> | ||
2 | - <%= label_tag 'block_amount_of_events', _('Amount of events to display:') %> | ||
3 | - <span class='hint' title=" <%= _('This field must contain values bigger than 0') %>"> (?) </span> | ||
4 | - <div class='formfield'> | ||
5 | - <%= number_field_tag 'block[amount_of_events]', @block.amount_of_events, min: 1, max: 100 %> | ||
6 | - </div> | ||
7 | -</div> | ||
8 | - |
src/noosfero-spb/software_communities/views/box_organizer/_software_tab_data_block.html.erb
@@ -1,15 +0,0 @@ | @@ -1,15 +0,0 @@ | ||
1 | -<br /> | ||
2 | - | ||
3 | -<% if not @block.blogs.empty? %> | ||
4 | - <label for="block_displayed_blog"> | ||
5 | - <%= _("Which blog should have its posts displayed: ")%> | ||
6 | - </label> | ||
7 | - | ||
8 | - <br /> | ||
9 | - | ||
10 | - <%= select_tag 'block[displayed_blog]', options_from_collection_for_select(@block.blogs, :id, :name, @block.actual_blog.id) %> | ||
11 | -<% else %> | ||
12 | - <div class="software-blog-empty"> | ||
13 | - <h2> <%= _("This community has no blogs") %> </h2> | ||
14 | - </div> | ||
15 | -<% end %> |
src/noosfero-spb/software_communities/views/box_organizer/_softwares_block.html.erb
@@ -1,4 +0,0 @@ | @@ -1,4 +0,0 @@ | ||
1 | -<div id='edit-softwares-block'> | ||
2 | - <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %> | ||
3 | - <%= labelled_form_field _('Software Type:'), select_tag('block[software_type]', options_for_select(["Public", "Generic", "All"], @block.software_type) )%> | ||
4 | -</div> |
src/noosfero-spb/software_communities/views/box_organizer/_statistic_block.html.erb
@@ -1,9 +0,0 @@ | @@ -1,9 +0,0 @@ | ||
1 | -<div id='edit-softwares-block'> | ||
2 | - <% benefited_people = @block.owner.software_info.benefited_people + 5 %> | ||
3 | - <% saved_resources = @block.owner.software_info.saved_resources + 5 %> | ||
4 | - | ||
5 | - <p> <%= _("Statistics to be displayed ") %> | ||
6 | - | ||
7 | - <p> <%= _("People Benefited: ") %> <span> <%= number_to_human(benefited_people) %> </span> </p> | ||
8 | - <p> <%= _("Saved Resources: ") %> <span> <%= float_to_currency(saved_resources) %> </span> </p> | ||
9 | -</div> |
src/noosfero-spb/software_communities/views/box_organizer/_wiki_block.html.erb
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_categories_and_tags_block.html.erb
0 → 100644
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_categories_software_block.html.erb
0 → 100644
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_download_block.html.erb
0 → 100644
@@ -0,0 +1,11 @@ | @@ -0,0 +1,11 @@ | ||
1 | +<div id='edit-download-block'> | ||
2 | + | ||
3 | + <h3><%= _('Download options') %></h3> | ||
4 | + <div id ="droppable-list-downloads"> | ||
5 | + <% @block.downloads.each do |download| %> | ||
6 | + <%= render :partial => 'download_list', :locals => {:download => download} %> | ||
7 | + <% end %> | ||
8 | + </div> | ||
9 | + | ||
10 | + <%= link_to_function _('New link'), 'softwareDownload.addNewDonwload(); return false', :class => 'button icon-add with-text download-new-link-button' %> | ||
11 | +</div> |
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_download_list.html.erb
0 → 100644
@@ -0,0 +1 @@ | @@ -0,0 +1 @@ | ||
1 | +<%= render :partial => 'box_organizer/download_list_template', :locals => {:download => download} %> |
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_download_list_template.html.erb
0 → 100644
@@ -0,0 +1,25 @@ | @@ -0,0 +1,25 @@ | ||
1 | +<li class='download-option download-forms'> | ||
2 | + <ul> | ||
3 | + <li> | ||
4 | + <%= labelled_form_field(_('Name'), text_field_tag('block[downloads][][name]', (defined? download) ? download[:name] : '')) %> | ||
5 | + </li> | ||
6 | + | ||
7 | + <li> | ||
8 | + <%= labelled_form_field(_('Link'), text_field_tag('block[downloads][][link]', (defined? download) ? download[:link] : '')) %> | ||
9 | + </li> | ||
10 | + | ||
11 | + <li> | ||
12 | + <%= labelled_form_field(_('Platforms'), text_field_tag('block[downloads][][software_description]', (defined? download) ? download[:software_description] : '')) %> | ||
13 | + </li> | ||
14 | + | ||
15 | + <li> | ||
16 | + <%= labelled_form_field(_('Minimum Requirements'), text_field_tag('block[downloads][][minimum_requirements]', (defined? download) ? download[:minimum_requirements] : '')) %> | ||
17 | + </li> | ||
18 | + | ||
19 | + <li> | ||
20 | + <%= labelled_form_field(_('Size'), text_field_tag('block[downloads][][size]', (defined? download) ? download[:size] : '')) %> | ||
21 | + </li> | ||
22 | + | ||
23 | + <li class='delete-download-button'><%= button_without_text(:delete, _('Delete'), "#" , { :onclick => 'softwareDownload.deleteDownload(this); return false', :class=>"delete-link-list-row" }) %></li> | ||
24 | + </ul> | ||
25 | +</li> |
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_search_catalog_block.html.erb
0 → 100644
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_software_events_block.html.erb
0 → 100644
@@ -0,0 +1,8 @@ | @@ -0,0 +1,8 @@ | ||
1 | +<div id='edit-software-events-block' class='formfieldline'> | ||
2 | + <%= label_tag 'block_amount_of_events', _('Amount of events to display:') %> | ||
3 | + <span class='hint' title=" <%= _('This field must contain values bigger than 0') %>"> (?) </span> | ||
4 | + <div class='formfield'> | ||
5 | + <%= number_field_tag 'block[amount_of_events]', @block.amount_of_events, min: 1, max: 100 %> | ||
6 | + </div> | ||
7 | +</div> | ||
8 | + |
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_software_tab_data_block.html.erb
0 → 100644
@@ -0,0 +1,15 @@ | @@ -0,0 +1,15 @@ | ||
1 | +<br /> | ||
2 | + | ||
3 | +<% if not @block.blogs.empty? %> | ||
4 | + <label for="block_displayed_blog"> | ||
5 | + <%= _("Which blog should have its posts displayed: ")%> | ||
6 | + </label> | ||
7 | + | ||
8 | + <br /> | ||
9 | + | ||
10 | + <%= select_tag 'block[displayed_blog]', options_from_collection_for_select(@block.blogs, :id, :name, @block.actual_blog.id) %> | ||
11 | +<% else %> | ||
12 | + <div class="software-blog-empty"> | ||
13 | + <h2> <%= _("This community has no blogs") %> </h2> | ||
14 | + </div> | ||
15 | +<% end %> |
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_softwares_block.html.erb
0 → 100644
@@ -0,0 +1,4 @@ | @@ -0,0 +1,4 @@ | ||
1 | +<div id='edit-softwares-block'> | ||
2 | + <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %> | ||
3 | + <%= labelled_form_field _('Software Type:'), select_tag('block[software_type]', options_for_select(["Public", "Generic", "All"], @block.software_type) )%> | ||
4 | +</div> |
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_statistic_block.html.erb
0 → 100644
@@ -0,0 +1,9 @@ | @@ -0,0 +1,9 @@ | ||
1 | +<div id='edit-softwares-block'> | ||
2 | + <% benefited_people = @block.owner.software_info.benefited_people + 5 %> | ||
3 | + <% saved_resources = @block.owner.software_info.saved_resources + 5 %> | ||
4 | + | ||
5 | + <p> <%= _("Statistics to be displayed ") %> | ||
6 | + | ||
7 | + <p> <%= _("People Benefited: ") %> <span> <%= number_to_human(benefited_people) %> </span> </p> | ||
8 | + <p> <%= _("Saved Resources: ") %> <span> <%= float_to_currency(saved_resources) %> </span> </p> | ||
9 | +</div> |
src/noosfero-spb/software_communities/views/box_organizer/software_communities_plugin/_wiki_block.html.erb
0 → 100644
src/noosfero-spb/software_communities/views/search/_full_community.html.erb
@@ -3,9 +3,9 @@ | @@ -3,9 +3,9 @@ | ||
3 | <div class="search-software-item-column-left"> | 3 | <div class="search-software-item-column-left"> |
4 | <div class="vcard"> | 4 | <div class="vcard"> |
5 | 5 | ||
6 | - <% unless community.organization_ratings.empty? %> | ||
7 | - <%= render :partial => 'shared/organization_average_rating_block', :locals => {:community => community}%> | ||
8 | - <% end %> | 6 | + <%# unless community.organization_ratings.empty? %> |
7 | + <%#= render :partial => 'shared/organization_average_rating_block', :locals => {:community => community}%> | ||
8 | + <%# end %> | ||
9 | 9 | ||
10 | <%=render :partial => 'shared/software_publish_date', :locals => {:community => community, :order => @order} %> | 10 | <%=render :partial => 'shared/software_publish_date', :locals => {:community => community, :order => @order} %> |
11 | </div> | 11 | </div> |