Download as
Browse Code »

Commit d38eca1bb31d2868c6cdce3833c5999dacc423b0

Authored by Fabio Teixeira
1 parent f5240f14
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

reformulacao_software: Add tabs to software edit 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
Showing 2 changed files with 177 additions and 179 deletions   Show diff stats
views/mpog_software_plugin_myprofile/_public_software_info.html.erb
  Diff comments   View file @d38eca1
1   -<h1 class="database-button-show"><a href="#" class="button with-text icon-add"><%= _('Show edit software') %></a></h1>
2   -<h1 class="database-button-hide"><%= _('Edit software') %></h1>
3   -<div class = "database-info ">
4   - <div>
5   - <div class="formfield type-text">
6   - <%= label_tag("acronym" ,_("Acronym"), :class=>"formlabel") %>
7   - <%= text_field_tag(:acronym) %>
8   - </div>
9   -
10   - <div class="formfieldline">
11   - <%= label_tag _("Adherent to e-PING ?") %>
12   -
13   - <%= label_tag "e_ping_true", "Yes" %>
14   - <%= radio_button_tag(:e_ping,true)%>
15   - <%= label_tag "e_ping_false", "No"%>
16   - <%= radio_button_tag(:e_ping,false)%>
17   - </div>
18   -
19   - <div class="formfieldline">
20   - <%= label_tag _("Adherent to e-MAG ?") %>
21   -
22   - <%= label_tag "e_mag_true", "Yes"%>
23   - <%= radio_button_tag(:e_mag,true)%>
24   - <%= label_tag "e_mag_false", "No"%>
25   - <%= radio_button_tag(:e_mag,false)%>
26   - </div>
27   -
28   - <div class="formfieldline">
29   - <%= label_tag _("Adherent to ICP-Brasil ?") %>
30   -
31   - <%= label_tag "icp_brasil_true", "Yes"%>
32   - <%= radio_button_tag(:icp_brasil,true)%>
33   - <%= label_tag "icp_brasil_false", "No"%>
34   - <%= radio_button_tag(:icp_brasil,false)%>
35   - </div>
36   -
37   - <div class="formfieldline">
38   - <%= label_tag _("Adherent to e-ARQ ?") %>
39   -
40   - <%= label_tag "e_arq_true", "Yes"%>
41   - <%= radio_button_tag(:e_arq,true)%>
42   - <%= label_tag "e_arq_false", "No"%>
43   - <%= radio_button_tag(:e_arq,false)%>
44   - </div>
45   -
46   - <div class="formfieldline">
47   - <%= label_tag _("Internacionalizable ?") %>
48   -
49   - <%= label_tag "intern_true", "Yes" %>
50   - <%= radio_button_tag(:intern,true)%>
51   - <%= label_tag "intern_false", "No"%>
52   - <%= radio_button_tag(:intern,false)%>
53   - <div class="formfieldline">
54   - <%= label_tag "operating_platform", _("Operating Platform: ") %> <br />
55   - <%= text_area_tag :operating_platform %>
56   - </div>
57   -
58   - <div class="formfieldline">
59   - <%= label_tag "objectives", _("Objectives: ")%><br />
60   - <%= text_area_tag :objectives %>
61   - </div>
62   -
63   - <div class="formfieldline">
64   - <%= label_tag "features", _("Features: ")%><br />
65   - <%= text_area_tag :features %>
66   - </div>
67   -
68   - <div id='libraries_fields'>
69   - <h4> <%= _("Libraries") %> </h4>
70   - <% if @list_libraries.blank? %>
71   - <%= LibraryHelper.library_as_tables(nil).call %>
72   - <% else %>
73   - <%= render :partial => 'library_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
74   - <% end %>
75   - </div>
76   - <br />
77   -
78   - <div id='operating_system_fields'>
79   - <h4> <%= _("Operating Systems") %> </h4>
80   - <% if @list_operating_systems.blank? %>
81   - <%= OperatingSystemHelper.operating_system_as_tables(nil, false).call %>
82   - <% else %>
83   - <%= render :partial => 'operating_system_fields', :locals => {:object_name => 'community', :profile => @community, :operating_systems_fields => @list_operating_systems} %>
84   - <% end %>
85   - </div>
86   - <br />
87   -
88   - <br />
89   - <div id='programming_languages_fields'>
90   - <h4> <%= _("Programming languages") %> </h4>
91   - <% if @list_languages.blank? %>
92   - <%= SoftwareLanguageHelper.language_as_tables(nil, false).call %>
93   - <% else %>
94   - <%= render :partial => 'language_fields', :locals => { :object_name => 'community', :profile => @community, :languages => @list_languages } %>
95   - <% end %>
96   - </div>
97   -
98   - <br />
99   - <div id='database_fields'>
100   - <h4> <%= _("Databases") %> </h4>
101   - <% if @list_databases.blank? %>
102   - <%= DatabaseHelper.database_as_tables(nil, true).call %>
103   - <% else %>
104   - <%= render :partial => 'database_fields', :locals => {:object_name => 'community', :profile => @community, :database => @list_databases } %>
105   - <% end %>
106   - </div>
107   -
108   - <div id="software_categories_fields">
109   - <h4> <%= _("Software Categories:") %> </h4>
110   -
111   - <%= check_box_tag :administration %>
112   - <%= label_tag :administration, _("Administration") %><br />
113   -
114   - <%= check_box_tag :agriculture %>
115   - <%= label_tag :agriculture, _("Agriculture") %><br />
116   -
117   - <%= check_box_tag :business_and_services %>
118   - <%= label_tag :business_and_services, _("Business_and Services") %><br />
119   -
120   - <%= check_box_tag :communication %>
121   - <%= label_tag :communication, _("Communication") %><br />
122   -
123   - <%= check_box_tag :culture %>
124   - <%= label_tag :culture, _("Culture") %><br />
125   -
126   - <%= check_box_tag :national_defense %>
127   - <%= label_tag :national_defense, _("National Defense") %><br />
128   -
129   - <%= check_box_tag :economy_and_finances %>
130   - <%= label_tag :economy_and_finances, _("Economy and Finances") %><br />
131   -
132   - <%= check_box_tag :education %>
133   - <%= label_tag :education, _("Education") %><br />
134   -
135   - <%= check_box_tag :energy %>
136   - <%= label_tag :energy, _("Energy") %><br />
137   -
138   - <%= check_box_tag :sports %>
139   - <%= label_tag :sports, _("Sports") %><br />
140   -
141   - <%= check_box_tag :habitation %>
142   - <%= label_tag :habitation, _("Habitation") %><br />
143   -
144   - <%= check_box_tag :industry %>
145   - <%= label_tag :industry, _("Industry") %><br />
146   -
147   - <%= check_box_tag :environment %>
148   - <%= label_tag :environment, _("Environment") %><br />
149   -
150   - <%= check_box_tag :research_and_development %>
151   - <%= label_tag :research_and_development, _("Research and Development") %><br />
152   -
153   - <%= check_box_tag :social_security %>
154   - <%= label_tag :social_security, _("Social Security") %><br />
155   -
156   - <%= check_box_tag :social_protection %>
157   - <%= label_tag :social_protection, _("Social Protection") %><br />
158   -
159   - <%= check_box_tag :sanitation %>
160   - <%= label_tag :sanitation, _("Sanitation") %><br />
161   -
162   - <%= check_box_tag :health %>
163   - <%= label_tag :health, _("Health") %><br />
164   -
165   - <%= check_box_tag :security_public_order %>
166   - <%= label_tag :security_public_order, _("Security and Public Order") %><br />
  1 +<h1><%= _('Edit software') %></h1>
  2 +
  3 +<div class="formfield type-text">
  4 + <%= label_tag("acronym" ,_("Acronym"), :class=>"formlabel") %>
  5 + <%= text_field_tag(:acronym) %>
  6 +</div>
  7 +
  8 +<div class="formfieldline">
  9 + <%= label_tag _("Adherent to e-PING ?") %>
  10 +
  11 + <%= label_tag "e_ping_true", "Yes" %>
  12 + <%= radio_button_tag(:e_ping,true)%>
  13 + <%= label_tag "e_ping_false", "No"%>
  14 + <%= radio_button_tag(:e_ping,false)%>
  15 +</div>
  16 +
  17 +<div class="formfieldline">
  18 + <%= label_tag _("Adherent to e-MAG ?") %>
  19 +
  20 + <%= label_tag "e_mag_true", "Yes"%>
  21 + <%= radio_button_tag(:e_mag,true)%>
  22 + <%= label_tag "e_mag_false", "No"%>
  23 + <%= radio_button_tag(:e_mag,false)%>
  24 +</div>
  25 +
  26 +<div class="formfieldline">
  27 + <%= label_tag _("Adherent to ICP-Brasil ?") %>
  28 +
  29 + <%= label_tag "icp_brasil_true", "Yes"%>
  30 + <%= radio_button_tag(:icp_brasil,true)%>
  31 + <%= label_tag "icp_brasil_false", "No"%>
  32 + <%= radio_button_tag(:icp_brasil,false)%>
  33 +</div>
  34 +
  35 +<div class="formfieldline">
  36 + <%= label_tag _("Adherent to e-ARQ ?") %>
  37 +
  38 + <%= label_tag "e_arq_true", "Yes"%>
  39 + <%= radio_button_tag(:e_arq,true)%>
  40 + <%= label_tag "e_arq_false", "No"%>
  41 + <%= radio_button_tag(:e_arq,false)%>
  42 +</div>
  43 +
  44 +<div class="formfieldline">
  45 + <%= label_tag _("Internacionalizable ?") %>
  46 +
  47 + <%= label_tag "intern_true", "Yes" %>
  48 + <%= radio_button_tag(:intern,true)%>
  49 + <%= label_tag "intern_false", "No"%>
  50 + <%= radio_button_tag(:intern,false)%>
  51 +<div class="formfieldline">
  52 + <%= label_tag "operating_platform", _("Operating Platform: ") %> <br />
  53 + <%= text_area_tag :operating_platform %>
  54 +</div>
  55 +
  56 +<div class="formfieldline">
  57 + <%= label_tag "objectives", _("Objectives: ")%><br />
  58 + <%= text_area_tag :objectives %>
  59 +</div>
  60 +
  61 +<div class="formfieldline">
  62 + <%= label_tag "features", _("Features: ")%><br />
  63 + <%= text_area_tag :features %>
  64 +</div>
  65 +
  66 +<div id='libraries_fields'>
  67 + <h4> <%= _("Libraries") %> </h4>
  68 + <% if @list_libraries.blank? %>
  69 + <%= LibraryHelper.library_as_tables(nil).call %>
  70 + <% else %>
  71 + <%= render :partial => 'library_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
  72 + <% end %>
  73 +</div>
  74 +<br />
  75 +
  76 +<div id='operating_system_fields'>
  77 + <h4> <%= _("Operating Systems") %> </h4>
  78 + <% if @list_operating_systems.blank? %>
  79 + <%= OperatingSystemHelper.operating_system_as_tables(nil, false).call %>
  80 + <% else %>
  81 + <%= render :partial => 'operating_system_fields', :locals => {:object_name => 'community', :profile => @community, :operating_systems_fields => @list_operating_systems} %>
  82 + <% end %>
  83 +</div>
  84 +<br />
  85 +
  86 +<br />
  87 +<div id='programming_languages_fields'>
  88 + <h4> <%= _("Programming languages") %> </h4>
  89 + <% if @list_languages.blank? %>
  90 + <%= SoftwareLanguageHelper.language_as_tables(nil, false).call %>
  91 + <% else %>
  92 + <%= render :partial => 'language_fields', :locals => { :object_name => 'community', :profile => @community, :languages => @list_languages } %>
  93 + <% end %>
  94 +</div>
  95 +
  96 +<br />
  97 +<div id='database_fields'>
  98 + <h4> <%= _("Databases") %> </h4>
  99 + <% if @list_databases.blank? %>
  100 + <%= DatabaseHelper.database_as_tables(nil, true).call %>
  101 + <% else %>
  102 + <%= render :partial => 'database_fields', :locals => {:object_name => 'community', :profile => @community, :database => @list_databases } %>
  103 + <% end %>
  104 +</div>
  105 +
  106 +<div id="software_categories_fields">
  107 + <h4> <%= _("Software Categories:") %> </h4>
  108 +
  109 + <%= check_box_tag :administration %>
  110 + <%= label_tag :administration, _("Administration") %><br />
  111 +
  112 + <%= check_box_tag :agriculture %>
  113 + <%= label_tag :agriculture, _("Agriculture") %><br />
  114 +
  115 + <%= check_box_tag :business_and_services %>
  116 + <%= label_tag :business_and_services, _("Business_and Services") %><br />
  117 +
  118 + <%= check_box_tag :communication %>
  119 + <%= label_tag :communication, _("Communication") %><br />
  120 +
  121 + <%= check_box_tag :culture %>
  122 + <%= label_tag :culture, _("Culture") %><br />
  123 +
  124 + <%= check_box_tag :national_defense %>
  125 + <%= label_tag :national_defense, _("National Defense") %><br />
  126 +
  127 + <%= check_box_tag :economy_and_finances %>
  128 + <%= label_tag :economy_and_finances, _("Economy and Finances") %><br />
  129 +
  130 + <%= check_box_tag :education %>
  131 + <%= label_tag :education, _("Education") %><br />
  132 +
  133 + <%= check_box_tag :energy %>
  134 + <%= label_tag :energy, _("Energy") %><br />
  135 +
  136 + <%= check_box_tag :sports %>
  137 + <%= label_tag :sports, _("Sports") %><br />
  138 +
  139 + <%= check_box_tag :habitation %>
  140 + <%= label_tag :habitation, _("Habitation") %><br />
  141 +
  142 + <%= check_box_tag :industry %>
  143 + <%= label_tag :industry, _("Industry") %><br />
  144 +
  145 + <%= check_box_tag :environment %>
  146 + <%= label_tag :environment, _("Environment") %><br />
  147 +
  148 + <%= check_box_tag :research_and_development %>
  149 + <%= label_tag :research_and_development, _("Research and Development") %><br />
  150 +
  151 + <%= check_box_tag :social_security %>
  152 + <%= label_tag :social_security, _("Social Security") %><br />
  153 +
  154 + <%= check_box_tag :social_protection %>
  155 + <%= label_tag :social_protection, _("Social Protection") %><br />
  156 +
  157 + <%= check_box_tag :sanitation %>
  158 + <%= label_tag :sanitation, _("Sanitation") %><br />
167 159  
168   - <%= check_box_tag :work %>
169   - <%= label_tag :work, _("Work") %><br />
170   -
171   - <%= check_box_tag :transportation %>
172   - <%= label_tag :transportation, _("Transportation") %><br />
  160 + <%= check_box_tag :health %>
  161 + <%= label_tag :health, _("Health") %><br />
  162 +
  163 + <%= check_box_tag :security_public_order %>
  164 + <%= label_tag :security_public_order, _("Security and Public Order") %><br />
173 165  
174   - <%= check_box_tag :urbanism %>
175   - <%= label_tag :urbanism, _("Urbanism") %><br />
176   - </div>
177   - </div>
  166 + <%= check_box_tag :work %>
  167 + <%= label_tag :work, _("Work") %><br />
  168 +
  169 + <%= check_box_tag :transportation %>
  170 + <%= label_tag :transportation, _("Transportation") %><br />
  171 +
  172 + <%= check_box_tag :urbanism %>
  173 + <%= label_tag :urbanism, _("Urbanism") %><br />
178 174 </div>
179 175 \ No newline at end of file
... ...
views/mpog_software_plugin_myprofile/edit_software.html.erb
  Diff comments   View file @d38eca1
1   -<%= _("Basic") %>
  1 +<% tabs = [] %>
2 2  
3   -<%= render :partial => 'main_software_editor_extras' %>
  3 +<% tabs << {:title => _("Basic"), :id => 'basic-info',
  4 + :content => (render :partial => 'main_software_editor_extras')} %>
4 5  
5   -<%= _("Especific") %>
  6 +<% tabs << {:title => _("Especific"), :id => 'especific-info',
  7 + :content => (render :partial => 'public_software_info')} %>
6 8  
7   -<%= render :partial => 'public_software_info' %>
  9 +<%= render_tabs(tabs) %>
... ...