Commit 1e1361d1ed312851cde7fa6a5e0c428440669f79
Committed by
Álvaro Fernando Matos de Souza
1 parent
3f40e084
Adds SIORG code to institution creation forms
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Showing
11 changed files
with
163 additions
and
92 deletions
Show diff stats
src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb
... | ... | @@ -114,7 +114,7 @@ class GovUserPluginController < ApplicationController |
114 | 114 | params[:community] ||= {} |
115 | 115 | params[:institutions] ||= {} |
116 | 116 | |
117 | - @show_sisp_field = user.is_admin? | |
117 | + @show_admin_fields = user.is_admin? | |
118 | 118 | @governmental_sphere = get_governmental_spheres() |
119 | 119 | @governmental_power = get_governmental_powers() |
120 | 120 | @juridical_nature = get_juridical_natures() | ... | ... |
src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb
... | ... | @@ -7,7 +7,7 @@ class GovUserPluginMyprofileController < MyProfileController |
7 | 7 | end |
8 | 8 | |
9 | 9 | def edit_institution |
10 | - @show_sisp_field = user.is_admin? | |
10 | + @show_admin_fields = user.is_admin? | |
11 | 11 | @state_list = NationalRegion.find( |
12 | 12 | :all, |
13 | 13 | :conditions => { :national_region_type_id => 2 }, | ... | ... |
src/noosfero-spb/gov_user/db/migrate/20160525181858_change_siorg_column_type.rb
0 → 100644
src/noosfero-spb/gov_user/lib/institution.rb
... | ... | @@ -46,8 +46,18 @@ class Institution < ActiveRecord::Base |
46 | 46 | } |
47 | 47 | |
48 | 48 | validate :validate_country, :validate_state, :validate_city, |
49 | - :verify_institution_type | |
49 | + :verify_institution_type, :verify_siorg_code | |
50 | 50 | |
51 | + def verify_siorg_code | |
52 | + if (self.siorg_code =~ /^[0-9]+$/).nil? | |
53 | + self.errors.add( | |
54 | + :siorg_code, | |
55 | + _("invalid, only numbers are allowed.") | |
56 | + ) | |
57 | + return false | |
58 | + end | |
59 | + true | |
60 | + end | |
51 | 61 | |
52 | 62 | def has_accepted_rating? user_rating |
53 | 63 | rating_ids = OrganizationRating.where(institution_id: self.id, organization_id: user_rating.organization_id).map(&:id) | ... | ... |
src/noosfero-spb/gov_user/po/gov_user.pot
... | ... | @@ -8,8 +8,8 @@ msgid "" |
8 | 8 | msgstr "" |
9 | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2016-05-30 11:46-0300\n" | |
12 | -"PO-Revision-Date: 2016-05-30 11:46-0300\n" | |
11 | +"POT-Creation-Date: 2016-05-30 14:37-0300\n" | |
12 | +"PO-Revision-Date: 2016-05-30 14:37-0300\n" | |
13 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
15 | 15 | "Language: \n" |
... | ... | @@ -84,15 +84,19 @@ msgstr "" |
84 | 84 | msgid "institution" |
85 | 85 | msgstr "" |
86 | 86 | |
87 | -#: ../lib/institution.rb:68 | |
87 | +#: ../lib/institution.rb:55 | |
88 | +msgid "invalid, only numbers are allowed." | |
89 | +msgstr "" | |
90 | + | |
91 | +#: ../lib/institution.rb:78 | |
88 | 92 | msgid "invalid, only public and private institutions are allowed." |
89 | 93 | msgstr "" |
90 | 94 | |
91 | -#: ../lib/institution.rb:80 ../lib/institution.rb:91 ../lib/institution.rb:107 | |
95 | +#: ../lib/institution.rb:90 ../lib/institution.rb:101 ../lib/institution.rb:117 | |
92 | 96 | msgid "can't be blank" |
93 | 97 | msgstr "" |
94 | 98 | |
95 | -#: ../lib/institution.rb:94 | |
99 | +#: ../lib/institution.rb:104 | |
96 | 100 | msgid "invalid state" |
97 | 101 | msgstr "" |
98 | 102 | |
... | ... | @@ -155,105 +159,109 @@ msgstr "" |
155 | 159 | msgid "Private Institution" |
156 | 160 | msgstr "" |
157 | 161 | |
158 | -#: ../views/gov_user_plugin/_institution.html.erb:48 | |
162 | +#: ../views/gov_user_plugin/_institution.html.erb:46 | |
159 | 163 | #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:45 |
160 | 164 | msgid "Corporate Name" |
161 | 165 | msgstr "" |
162 | 166 | |
163 | -#: ../views/gov_user_plugin/_institution.html.erb:53 | |
167 | +#: ../views/gov_user_plugin/_institution.html.erb:51 | |
164 | 168 | msgid "Institution name already exists" |
165 | 169 | msgstr "" |
166 | 170 | |
171 | +#: ../views/gov_user_plugin/_institution.html.erb:56 | |
172 | +#: ../views/gov_user_plugin/_institution.html.erb:58 | |
173 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:75 | |
174 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:77 | |
175 | +msgid "Acronym" | |
176 | +msgstr "" | |
177 | + | |
167 | 178 | #: ../views/gov_user_plugin/_institution.html.erb:57 |
168 | -#: ../views/gov_user_plugin/_institution.html.erb:105 | |
179 | +#: ../views/gov_user_plugin/_institution.html.erb:67 | |
169 | 180 | #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:48 |
170 | 181 | #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:76 |
171 | 182 | msgid "Fantasy name" |
172 | 183 | msgstr "" |
173 | 184 | |
174 | -#: ../views/gov_user_plugin/_institution.html.erb:65 | |
185 | +#: ../views/gov_user_plugin/_institution.html.erb:76 | |
175 | 186 | #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:54 |
176 | 187 | msgid "Country" |
177 | 188 | msgstr "" |
178 | 189 | |
179 | -#: ../views/gov_user_plugin/_institution.html.erb:69 | |
190 | +#: ../views/gov_user_plugin/_institution.html.erb:80 | |
180 | 191 | #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:54 |
181 | 192 | msgid "Select a country" |
182 | 193 | msgstr "" |
183 | 194 | |
184 | -#: ../views/gov_user_plugin/_institution.html.erb:74 | |
195 | +#: ../views/gov_user_plugin/_institution.html.erb:85 | |
185 | 196 | #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:58 |
186 | 197 | msgid "State" |
187 | 198 | msgstr "" |
188 | 199 | |
189 | -#: ../views/gov_user_plugin/_institution.html.erb:78 | |
200 | +#: ../views/gov_user_plugin/_institution.html.erb:89 | |
190 | 201 | #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:58 |
191 | 202 | msgid "Select a state" |
192 | 203 | msgstr "" |
193 | 204 | |
194 | -#: ../views/gov_user_plugin/_institution.html.erb:83 | |
205 | +#: ../views/gov_user_plugin/_institution.html.erb:94 | |
195 | 206 | msgid "City" |
196 | 207 | msgstr "" |
197 | 208 | |
198 | -#: ../views/gov_user_plugin/_institution.html.erb:95 | |
209 | +#: ../views/gov_user_plugin/_institution.html.erb:106 | |
199 | 210 | #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:68 |
200 | 211 | msgid "CNPJ" |
201 | 212 | msgstr "" |
202 | 213 | |
203 | -#: ../views/gov_user_plugin/_institution.html.erb:104 | |
204 | -#: ../views/gov_user_plugin/_institution.html.erb:106 | |
205 | -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:75 | |
206 | -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:77 | |
207 | -msgid "Acronym" | |
208 | -msgstr "" | |
209 | - | |
210 | -#: ../views/gov_user_plugin/_institution.html.erb:114 | |
214 | +#: ../views/gov_user_plugin/_institution.html.erb:117 | |
211 | 215 | msgid "Governmental Sphere" |
212 | 216 | msgstr "" |
213 | 217 | |
214 | -#: ../views/gov_user_plugin/_institution.html.erb:125 | |
218 | +#: ../views/gov_user_plugin/_institution.html.erb:128 | |
215 | 219 | msgid "Governmental Power" |
216 | 220 | msgstr "" |
217 | 221 | |
218 | -#: ../views/gov_user_plugin/_institution.html.erb:136 | |
222 | +#: ../views/gov_user_plugin/_institution.html.erb:139 | |
219 | 223 | msgid "Juridical Nature" |
220 | 224 | msgstr "" |
221 | 225 | |
222 | -#: ../views/gov_user_plugin/_institution.html.erb:150 | |
223 | -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:121 | |
226 | +#: ../views/gov_user_plugin/_institution.html.erb:153 | |
227 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:132 | |
224 | 228 | msgid "SISP?" |
225 | 229 | msgstr "" |
226 | 230 | |
227 | -#: ../views/gov_user_plugin/_institution.html.erb:155 | |
228 | -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:126 | |
231 | +#: ../views/gov_user_plugin/_institution.html.erb:158 | |
232 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:137 | |
229 | 233 | #: ../views/profile/_institution_tab.html.erb:19 |
230 | 234 | msgid "Yes" |
231 | 235 | msgstr "" |
232 | 236 | |
233 | -#: ../views/gov_user_plugin/_institution.html.erb:160 | |
234 | -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:130 | |
235 | -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:133 | |
237 | +#: ../views/gov_user_plugin/_institution.html.erb:163 | |
238 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:141 | |
239 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:144 | |
236 | 240 | #: ../views/profile/_institution_tab.html.erb:19 |
237 | 241 | msgid "No" |
238 | 242 | msgstr "" |
239 | 243 | |
240 | -#: ../views/gov_user_plugin/_institution.html.erb:170 | |
241 | -#: ../views/gov_user_plugin/_institution.html.erb:173 | |
242 | -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:143 | |
244 | +#: ../views/gov_user_plugin/_institution.html.erb:171 | |
245 | +msgid "SIORG Code" | |
246 | +msgstr "" | |
247 | + | |
248 | +#: ../views/gov_user_plugin/_institution.html.erb:180 | |
249 | +#: ../views/gov_user_plugin/_institution.html.erb:183 | |
250 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:154 | |
243 | 251 | msgid "Save" |
244 | 252 | msgstr "" |
245 | 253 | |
246 | -#: ../views/gov_user_plugin/_institution.html.erb:171 | |
247 | -#: ../views/gov_user_plugin/_institution.html.erb:174 | |
248 | -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:144 | |
254 | +#: ../views/gov_user_plugin/_institution.html.erb:181 | |
255 | +#: ../views/gov_user_plugin/_institution.html.erb:184 | |
256 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:155 | |
249 | 257 | msgid "Cancel" |
250 | 258 | msgstr "" |
251 | 259 | |
252 | -#: ../views/gov_user_plugin/_institution.html.erb:175 | |
260 | +#: ../views/gov_user_plugin/_institution.html.erb:185 | |
253 | 261 | msgid "Could not send the form data to the server" |
254 | 262 | msgstr "" |
255 | 263 | |
256 | -#: ../views/gov_user_plugin/_institution.html.erb:183 | |
264 | +#: ../views/gov_user_plugin/_institution.html.erb:193 | |
257 | 265 | msgid "Creating institution" |
258 | 266 | msgstr "" |
259 | 267 | |
... | ... | @@ -283,6 +291,10 @@ msgstr "" |
283 | 291 | msgid "Juridical Nature:" |
284 | 292 | msgstr "" |
285 | 293 | |
294 | +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:119 | |
295 | +msgid "SIORG Code:" | |
296 | +msgstr "" | |
297 | + | |
286 | 298 | #: ../views/incomplete_registration.html.erb:3 |
287 | 299 | msgid "Complete Profile" |
288 | 300 | msgstr "" | ... | ... |
src/noosfero-spb/gov_user/po/pt/gov_user.po
... | ... | @@ -60,6 +60,9 @@ msgstr "Instituição" |
60 | 60 | msgid "institution" |
61 | 61 | msgstr "instituição" |
62 | 62 | |
63 | +msgid "invalid, only numbers are allowed." | |
64 | +msgstr "inválido, apenas números são permitidos." | |
65 | + | |
63 | 66 | msgid "invalid, only public and private institutions are allowed." |
64 | 67 | msgstr "Inválido, somente instituições públicas e privadas são permitidas." |
65 | 68 | |
... | ... | @@ -120,6 +123,9 @@ msgstr "Razão Social" |
120 | 123 | msgid "Institution name already exists" |
121 | 124 | msgstr "Nome de Instituição já existe" |
122 | 125 | |
126 | +msgid "Acronym" | |
127 | +msgstr "Sigla" | |
128 | + | |
123 | 129 | msgid "Fantasy name" |
124 | 130 | msgstr "Nome Fantasia" |
125 | 131 | |
... | ... | @@ -141,9 +147,6 @@ msgstr "Cidade" |
141 | 147 | msgid "CNPJ" |
142 | 148 | msgstr "CNPJ" |
143 | 149 | |
144 | -msgid "Acronym" | |
145 | -msgstr "Sigla" | |
146 | - | |
147 | 150 | msgid "Governmental Sphere" |
148 | 151 | msgstr "Esfera Governamental:" |
149 | 152 | |
... | ... | @@ -162,6 +165,9 @@ msgstr "Sim" |
162 | 165 | msgid "No" |
163 | 166 | msgstr "Não" |
164 | 167 | |
168 | +msgid "SIORG Code" | |
169 | +msgstr "Código SIORG" | |
170 | + | |
165 | 171 | msgid "Save" |
166 | 172 | msgstr "Salvar" |
167 | 173 | |
... | ... | @@ -195,6 +201,9 @@ msgstr "Poder Governamental:" |
195 | 201 | msgid "Juridical Nature:" |
196 | 202 | msgstr "Natureza Jurídica:" |
197 | 203 | |
204 | +msgid "SIORG Code:" | |
205 | +msgstr "Código SIORG:" | |
206 | + | |
198 | 207 | msgid "Complete Profile" |
199 | 208 | msgstr "Complete o Perfil" |
200 | 209 | ... | ... |
src/noosfero-spb/gov_user/public/views/create-institution.js
... | ... | @@ -45,6 +45,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] |
45 | 45 | |
46 | 46 | |
47 | 47 | function get_institution_post_data() { |
48 | + | |
48 | 49 | return { |
49 | 50 | cnpj: $("#institutions_cnpj").val(), |
50 | 51 | type: $("input[name='institutions[type]']:checked").val(), |
... | ... | @@ -52,7 +53,9 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] |
52 | 53 | governmental_power: $("#institutions_governmental_power").selected().val(), |
53 | 54 | governmental_sphere: $("#institutions_governmental_sphere").selected().val(), |
54 | 55 | juridical_nature: $("#institutions_juridical_nature").selected().val(), |
55 | - corporate_name: $("#institutions_corporate_name").val() | |
56 | + corporate_name: $("#institutions_corporate_name").val(), | |
57 | + siorg_code: $("#institutions_siorg_code").val(), | |
58 | + sisp: $('input[name="institutions[sisp]"]:checked').val() | |
56 | 59 | }; |
57 | 60 | } |
58 | 61 | ... | ... |
src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
... | ... | @@ -30,36 +30,47 @@ |
30 | 30 | <%= hidden_field_tag "edit_institution_page", false %> |
31 | 31 | <%= fields_for :institutions do |inst| %> |
32 | 32 | <div class="spb-row no-margin-top"> |
33 | - <div class='spb-col spb-col-3'> | |
33 | + <div class='spb-col'> | |
34 | 34 | <%= labelled_radio_button _('Public Institution'), 'institutions[type]', 'PublicInstitution', true %> |
35 | 35 | </div> |
36 | 36 | |
37 | - <div class="spb-col spb-col-3"> | |
37 | + <div class="spb-col"> | |
38 | 38 | <%= labelled_radio_button _('Private Institution'), 'institutions[type]', 'PrivateInstitution' %> |
39 | 39 | </div> |
40 | 40 | |
41 | - <div class="spb-col spb-col-3"></div> | |
42 | - <div class="spb-col spb-col-3"></div> | |
43 | 41 | </div> |
44 | 42 | |
45 | 43 | <div class="spb-row"> |
46 | - <div class="spb-col spb-col-5"> | |
44 | + <div class="spb-col spb-col-9"> | |
47 | 45 | <label for="community_name" class="formlabel"> |
48 | 46 | <%= _("Corporate Name") %><!-- razão social --> |
49 | 47 | <span class="required-field">(*)</span> |
50 | 48 | </label> |
51 | 49 | |
52 | - <%= f.text_field(:name, :class => flash[:error_community_name], :value => params[:community][:name]) %> | |
50 | + <%= f.text_field(:name, :class => flash[:error_community_name], :maxlength => 250, :value => params[:community][:name]) %> | |
53 | 51 | <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %> |
54 | 52 | </div> |
55 | 53 | |
56 | - <div class="spb-col spb-col-6"> | |
54 | + <div class="public-institutions-fields"> | |
55 | + <div class="spb-col spb-col-3"> | |
56 | + <%= hidden_field_tag "acronym_translate", _("Acronym") %> | |
57 | + <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %> | |
58 | + <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel", id: "institution_acronym_label") %> | |
59 | + <%= inst.text_field(:acronym, :value => params[:institutions][:acronym], :maxlength => 12) %> | |
60 | + </div> | |
61 | + </div> | |
62 | + | |
63 | + </div> | |
64 | + | |
65 | + <div class="spb-row"> | |
66 | + <div class="spb-col spb-col-12"> | |
57 | 67 | <%= inst.label "corporate_name", _("Fantasy name"), :class=>"formlabel" %><!-- Nome fantasia --> |
58 | - <%= inst.text_field(:corporate_name, :value => params[:institutions][:corporate_name], :size => 55) %> | |
68 | + <%= inst.text_field(:corporate_name, :value => params[:institutions][:corporate_name], :size => 55, :maxlength => 250) %> | |
59 | 69 | </div> |
60 | 70 | </div> |
61 | 71 | |
62 | 72 | <div class="spb-row"> |
73 | + | |
63 | 74 | <div class="spb-col spb-col-5"> |
64 | 75 | <label for="community_country" class="formlabel"> |
65 | 76 | <%= _("Country") %> |
... | ... | @@ -84,7 +95,7 @@ |
84 | 95 | <span class="required-field">(*)</span> |
85 | 96 | </label> |
86 | 97 | |
87 | - <%= f.text_field(:city, :class => flash[:error_community_city], :value => params[:community][:city]) %> | |
98 | + <%= f.text_field(:city, :class => flash[:error_community_city], :value => params[:community][:city], :maxlength => 250) %> | |
88 | 99 | </div> |
89 | 100 | </div> |
90 | 101 | |
... | ... | @@ -99,14 +110,6 @@ |
99 | 110 | </div> |
100 | 111 | </div> |
101 | 112 | |
102 | - <div class="spb-row"> | |
103 | - <div class="spb-col spb-col-12"> | |
104 | - <%= hidden_field_tag "acronym_translate", _("Acronym") %> | |
105 | - <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %> | |
106 | - <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel") %> | |
107 | - <%= inst.text_field(:acronym, :value => params[:institutions][:acronym]) %> | |
108 | - </div> | |
109 | - </div> | |
110 | 113 | |
111 | 114 | <div class="spb-row public-institutions-fields"> |
112 | 115 | <div class="spb-col spb-col-6"> |
... | ... | @@ -141,28 +144,35 @@ |
141 | 144 | </div> |
142 | 145 | </div> |
143 | 146 | |
144 | - <div class="spb-row public-institutions-fields"> | |
145 | - <div class="spc-col spb-col-12 sisp-fields"> | |
146 | - <div class="spb-col spb-col-3"> | |
147 | - <% if @show_sisp_field %> | |
147 | + <% if @show_admin_fields %> | |
148 | + <div class="spb-row public-institutions-fields"> | |
149 | + <div class="spc-col spb-col-12 sisp-fields"> | |
150 | + <div class="spb-col spb-col-3"> | |
148 | 151 | |
149 | - <div class="spb-col spb-col-12"> | |
150 | - <%= _("SISP?") %> | |
151 | - </div> | |
152 | + <div class="spb-col spb-col-12"> | |
153 | + <%= _("SISP?") %> | |
154 | + </div> | |
152 | 155 | |
153 | - <div class="spb-col spb-col-5"> | |
154 | - <%= inst.radio_button(:sisp, true, :class => "#{flash[:error_institution_sisp]}" ) %> | |
155 | - <%= inst.label :sisp ,_("Yes"), :value => true %> | |
156 | - </div> | |
156 | + <div class="spb-col spb-col-5"> | |
157 | + <%= inst.radio_button(:sisp, true, :class => "#{flash[:error_institution_sisp]}" ) %> | |
158 | + <%= inst.label :sisp ,_("Yes"), :value => true %> | |
159 | + </div> | |
157 | 160 | |
158 | - <div class="spb-col spb-col-6"> | |
159 | - <%= inst.radio_button(:sisp, false, :checked=>"checked", :class => "#{flash[:error_institution_sisp]}") %> | |
160 | - <%= inst.label :sisp ,_("No"), :value => false %> | |
161 | + <div class="spb-col spb-col-6"> | |
162 | + <%= inst.radio_button(:sisp, false, :checked=>"checked", :class => "#{flash[:error_institution_sisp]}") %> | |
163 | + <%= inst.label :sisp ,_("No"), :value => false %> | |
164 | + </div> | |
161 | 165 | </div> |
162 | - <% end %> | |
163 | 166 | </div> |
164 | 167 | </div> |
165 | - </div> | |
168 | + | |
169 | + <div class="spb-row public-institutions-fields"> | |
170 | + <div class="spb-col spb-col-12"> | |
171 | + <%= inst.label("siorg_code" ,_("SIORG Code"), :class=>"formlabel") %> | |
172 | + <%= inst.text_field(:siorg_code, :value => params[:institutions][:siorg_code]) %> | |
173 | + </div> | |
174 | + </div> | |
175 | + <% end %> | |
166 | 176 | |
167 | 177 | <div class="spb-row modal-form-actions"> |
168 | 178 | <div class="spb-col spb-col-6"> | ... | ... |
src/noosfero-spb/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb
... | ... | @@ -112,6 +112,17 @@ |
112 | 112 | </div> |
113 | 113 | </div> |
114 | 114 | |
115 | + <div class="spb-row public-institutions-fields"> | |
116 | + <div class="spb-col spb-col-6"> | |
117 | + <span class='required-field public-institutions-fields'> | |
118 | + <div class="formfield type-text"> | |
119 | + <%= inst.label("siorg_code" ,_("SIORG Code:"), :class=>"formlabel") %> | |
120 | + <%= inst.text_field(:siorg_code, :value => @institution.siorg_code) %> | |
121 | + </div> | |
122 | + </span> | |
123 | + </div> | |
124 | + </div> | |
125 | + | |
115 | 126 | <div class="spc-col spb-col-12 sisp-fields"> |
116 | 127 | <div class="spb-row public-institutions-fields"> |
117 | 128 | <div class="spb-col spb-col-3"> |
... | ... | @@ -120,7 +131,7 @@ |
120 | 131 | <div class="spb-col spb-col-12"> |
121 | 132 | <%= _("SISP?") %> |
122 | 133 | </div> |
123 | - <% if @show_sisp_field %> | |
134 | + <% if @show_admin_fields %> | |
124 | 135 | <div class="spb-col spb-col-4"> |
125 | 136 | <%= inst.radio_button(:sisp, true, :checked=>(@institution.sisp ? true : false)) %> |
126 | 137 | <%= inst.label("sisp" ,_("Yes")) %> | ... | ... |
src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css
... | ... | @@ -352,7 +352,7 @@ |
352 | 352 | } |
353 | 353 | |
354 | 354 | .action-gov_user_plugin-create_institution_admin #community_name { |
355 | - width: 200px; | |
355 | + width: 372px; | |
356 | 356 | } |
357 | 357 | |
358 | 358 | .action-gov_user_plugin_myprofile-edit_institution #institutions_corporate_name { |
... | ... | @@ -360,8 +360,10 @@ |
360 | 360 | color: black; |
361 | 361 | } |
362 | 362 | |
363 | +.action-gov_user_plugin_myprofile-edit_institution #institutions_cnpj, | |
364 | +.action-gov_user_plugin-create_institution_admin #institutions_cnpj, | |
363 | 365 | .action-gov_user_plugin-create_institution_admin #institutions_corporate_name { |
364 | - width: 310px; | |
366 | + width: 508px; | |
365 | 367 | } |
366 | 368 | |
367 | 369 | .action-gov_user_plugin_myprofile-edit_institution #community_country { |
... | ... | @@ -388,15 +390,13 @@ |
388 | 390 | } |
389 | 391 | |
390 | 392 | .action-gov_user_plugin-create_institution_admin #community_city { |
391 | - width: 222px; | |
393 | + width: 199px; | |
392 | 394 | } |
393 | 395 | |
394 | -.action-gov_user_plugin_myprofile-edit_institution #institutions_cnpj, | |
395 | 396 | .action-gov_user_plugin_myprofile-edit_institution #institutions_acronym, |
396 | -.action-gov_user_plugin-create_institution_admin #institutions_cnpj, | |
397 | 397 | .action-gov_user_plugin-create_institution_admin #institutions_acronym { |
398 | 398 | text-indent: 5px; |
399 | - width: 530px; | |
399 | + width: 111px; | |
400 | 400 | } |
401 | 401 | |
402 | 402 | .action-gov_user_plugin_myprofile-edit_institution .modal-form-actions, |
... | ... | @@ -694,6 +694,13 @@ |
694 | 694 | color: #585858; |
695 | 695 | } |
696 | 696 | |
697 | +#noosfero_profile-content #content .main-content #profile-data #institutions_siorg_code, | |
698 | +.action-profile_editor-edit #content .main-content #profile-data #institutions_siorg_code, | |
699 | +.action-gov_user_plugin-create_institution_admin #content .main-content #institutions_siorg_code, | |
700 | +.action-organization_ratings_plugin_profile-new_rating #content .main-content #institutions_siorg_code { | |
701 | + width: 189px; | |
702 | +} | |
703 | + | |
697 | 704 | .action-users-send_mail #content .main-content{ |
698 | 705 | font-family: Arial; |
699 | 706 | } | ... | ... |
src/noosfero-spb/noosfero-spb-theme/css/modal.css
... | ... | @@ -235,13 +235,15 @@ |
235 | 235 | .action-profile_editor-edit #content .main-content #profile-data .modal #community_name, |
236 | 236 | .modal #community_name { |
237 | 237 | height: 16px; |
238 | - width: 200px; | |
238 | + width: 392px; | |
239 | 239 | } |
240 | 240 | |
241 | +.action-profile_editor-edit #content .main-content #profile-data .modal #institutions_cnpj, | |
241 | 242 | .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_corporate_name, |
243 | +.modal #institutions_cnpj, | |
242 | 244 | .modal #institutions_corporate_name { |
243 | 245 | height: 16px; |
244 | - width: 285px; | |
246 | + width: 533px; | |
245 | 247 | } |
246 | 248 | |
247 | 249 | .action-profile_editor-edit #content .main-content #profile-data .modal #community_country, |
... | ... | @@ -257,16 +259,14 @@ |
257 | 259 | .action-profile_editor-edit #content .main-content #profile-data .modal #community_city, |
258 | 260 | .modal #community_city { |
259 | 261 | height: 16px; |
260 | - width: 190px; | |
262 | + width: 205px; | |
261 | 263 | margin-top: 2px; |
262 | 264 | } |
263 | 265 | |
264 | -.action-profile_editor-edit #content .main-content #profile-data .modal #institutions_cnpj, | |
265 | 266 | .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_acronym, |
266 | -.modal #institutions_cnpj, | |
267 | 267 | .modal #institutions_acronym { |
268 | 268 | height: 16px; |
269 | - width: 530px; | |
269 | + width: 111px; | |
270 | 270 | } |
271 | 271 | |
272 | 272 | .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-add, | ... | ... |