Merge Request #257

← To merge requests From siorg_field_design into master
Closed
softwarepublico/softwarepublico!257
Created by Álvaro Fernando Matos de Souza

Siorg field design

Relacionado com #424

Assignee: Melissa Wen
Milestone: Prioridades para o Encerramento

Closed by Álvaro Fernando Matos de Souza

Changes were not merged into target branch

Commits (5)
4 participants
Noosfero Design
Showing 12 changed files   Show diff stats
src/colab-spb-theme-plugin/colab_spb_theme/static/css/screen.css
  Diff comments   Edit   View file @b5d4b95
... ... @@ -809,7 +809,6 @@ div#main-content .col-lg-12 a {
809 809 body div#main-content {
810 810 margin-top: 0;
811 811 color: #172738;
812   - max-width: 960px;
813 812 padding: 40px 0 60px 0;
814 813 }
815 814  
... ...
src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb
  Diff comments   Edit   View file @b5d4b95
... ... @@ -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
  Diff comments   Edit   View file @b5d4b95
... ... @@ -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
  Diff comments   Edit   View file @b5d4b95
... ... @@ -0,0 +1,9 @@
  1 +class ChangeSiorgColumnType < ActiveRecord::Migration
  2 + def self.up
  3 + change_column :institutions, :siorg_code, :string
  4 + end
  5 +
  6 + def self.down
  7 + change_column :institutions, :siorg_code, :integer
  8 + end
  9 +end
... ...
src/noosfero-spb/gov_user/lib/institution.rb
  Diff comments   Edit   View file @b5d4b95
... ... @@ -46,8 +46,18 @@ class Institution &lt; 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
  Diff comments   Edit   View file @b5d4b95
... ... @@ -8,8 +8,8 @@ msgid &quot;&quot;
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 &quot;&quot;
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 &quot;&quot;
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 &quot;&quot;
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
  Diff comments   Edit   View file @b5d4b95
... ... @@ -60,6 +60,9 @@ msgstr &quot;Instituição&quot;
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 &quot;Razão Social&quot;
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 &quot;Cidade&quot;
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 &quot;Sim&quot;
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 &quot;Poder Governamental:&quot;
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
  Diff comments   Edit   View file @b5d4b95
... ... @@ -45,6 +45,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
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(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
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  
... ... @@ -73,11 +76,11 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
73 76 add_selected_institution_to_list(institution_id, institution_name);
74 77  
75 78 $(".remove-institution").click(remove_institution);
76   - //$('#institution_dialog').dialog('close');
77 79 $('#institution_modal').modal('toggle');
78 80 }
79 81  
80 82  
  83 +
81 84 function success_ajax_response(response) {
82 85 close_loading();
83 86  
... ... @@ -104,6 +107,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
104 107 update_user_institutions_list();
105 108 } else {
106 109 var errors = create_error_list(response);
  110 +
107 111 $("#create_institution_errors").switchClass("hide-field", "show-field").html("<h2>"+response.message+"</h2>"+errors);
108 112  
109 113 show_errors_in_each_field(response.errors);
... ... @@ -114,8 +118,8 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
114 118 var errors = "<ul>";
115 119 var field_name;
116 120  
117   - for(var error in response.errors) {
118   - errors += "<li>"+response.errors[error]+"</li>";
  121 + for(var i =0;i<response.errors.length;i++) {
  122 + errors += "<li>"+response.errors[i]+"</li>";
119 123 }
120 124  
121 125 errors += "</ul>";
... ... @@ -161,12 +165,6 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
161 165 });
162 166 }
163 167  
164   - function cancel_institution(evt){
165   - evt.preventDefault();
166   - $('#institution_modal').modal('toggle');
167   - }
168   -
169   -
170 168 function institution_already_exists(){
171 169 if( this.value.length >= 3 ) {
172 170 $.get(AJAX_URL.institution_already_exists, {name:this.value}, function(response){
... ... @@ -368,7 +366,6 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
368 366 });
369 367  
370 368 $('#save_institution_button').click(save_institution);
371   - $('#cancel_institution_button').click(cancel_institution);
372 369  
373 370 $("#community_name").keyup(institution_already_exists);
374 371  
... ...
src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
  Diff comments   Edit   View file @b5d4b95
... ... @@ -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">
... ... @@ -171,7 +181,7 @@
171 181 <%= button(:cancel, _("Cancel"), {:controller => "admin_panel", :action => 'index'}) %>
172 182 <% else %>
173 183 <%= link_to(_('Save'), '#', :id=>'save_institution_button', :class=>'button with-text icon-add') %>
174   - <%= link_to(_('Cancel'), '#', :id=>"cancel_institution_button", :class=>'button with-text icon-cancel') %>
  184 + <%= link_to(_('Cancel'), '#', :id=>"cancel_institution_button", :class=>'button with-text icon-cancel', "data-dismiss".to_sym => "modal") %>
175 185 <%= hidden_field_tag :institution_error_message, _("Could not send the form data to the server") %>
176 186 <% end %>
177 187 </div>
... ...
src/noosfero-spb/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb
  Diff comments   Edit   View file @b5d4b95
... ... @@ -41,10 +41,21 @@
41 41 </div>
42 42  
43 43 <div class="spb-row">
44   - <div class="spb-col spb-col-4">
  44 + <div class="spb-col spb-col-7">
45 45 <%= required labelled_form_field(_('Corporate Name'), text_field_tag('community[name]', @institution.community.name)) %>
46 46 </div>
47   - <div class="spb-col spb-col-5">
  47 + <span class='optional-field'>
  48 + <div class="spb-col spb-col-5">
  49 + <%= hidden_field_tag "acronym_translate", _("Acronym") %>
  50 + <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %>
  51 + <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel") %>
  52 + <%= inst.text_field(:acronym, :value => @institution.acronym) %>
  53 + </div>
  54 + </div>
  55 + </div>
  56 +
  57 + <div class="spb-row">
  58 + <div class="spb-col spb-col-12">
48 59 <%= labelled_form_field(_('Fantasy name'), inst.text_field(:corporate_name, :value => @institution.corporate_name)) %>
49 60 </div>
50 61 </div>
... ... @@ -63,21 +74,16 @@
63 74 </div>
64 75 </div>
65 76  
66   - <span class='optional-field'>
67   - <div class="formfield type-text">
68   - <%= inst.label("cnpj" ,_("CNPJ"), :class=>"formlabel") %>
69   - <%= required inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => @institution.cnpj) %>
70   - </div>
71   - </span>
72   -
73   - <span class='optional-field'>
74   - <div class="formfield type-text">
75   - <%= hidden_field_tag "acronym_translate", _("Acronym") %>
76   - <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %>
77   - <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel") %>
78   - <%= inst.text_field(:acronym, :value => @institution.acronym) %>
  77 + <div class="spb-row">
  78 + <div class="spb-col spb-col-12">
  79 + <span class='optional-field'>
  80 + <div class="formfield type-text">
  81 + <%= inst.label("cnpj" ,_("CNPJ"), :class=>"formlabel") %>
  82 + <%= required inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => @institution.cnpj) %>
  83 + </div>
  84 + </span>
79 85 </div>
80   - </span>
  86 + </div>
81 87  
82 88 <div class="spb-row public-institutions-fields">
83 89 <div class="spb-col spb-col-6">
... ... @@ -112,6 +118,17 @@
112 118 </div>
113 119 </div>
114 120  
  121 + <div class="spb-row public-institutions-fields">
  122 + <div class="spb-col spb-col-6">
  123 + <span class='required-field public-institutions-fields'>
  124 + <div class="formfield type-text">
  125 + <%= inst.label("siorg_code" ,_("SIORG Code:"), :class=>"formlabel") %>
  126 + <%= inst.text_field(:siorg_code, :value => @institution.siorg_code) %>
  127 + </div>
  128 + </span>
  129 + </div>
  130 + </div>
  131 +
115 132 <div class="spc-col spb-col-12 sisp-fields">
116 133 <div class="spb-row public-institutions-fields">
117 134 <div class="spb-col spb-col-3">
... ... @@ -120,7 +137,7 @@
120 137 <div class="spb-col spb-col-12">
121 138 <%= _("SISP?") %>
122 139 </div>
123   - <% if @show_sisp_field %>
  140 + <% if @show_admin_fields %>
124 141 <div class="spb-col spb-col-4">
125 142 <%= inst.radio_button(:sisp, true, :checked=>(@institution.sisp ? true : false)) %>
126 143 <%= inst.label("sisp" ,_("Yes")) %>
... ...
src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css
  Diff comments   Edit   View file @b5d4b95
... ... @@ -346,22 +346,33 @@
346 346 margin-bottom: 10px;
347 347 }
348 348  
  349 +.action-gov_user_plugin_myprofile-edit_institution #content .main-content .formfieldline {
  350 + margin-top: 0;
  351 + padding: 0;
  352 +}
  353 +
349 354 .action-gov_user_plugin_myprofile-edit_institution #community_name {
350 355 color: black;
351   - width: 220px
  356 + width: 402px;
352 357 }
353 358  
354 359 .action-gov_user_plugin-create_institution_admin #community_name {
355   - width: 200px;
  360 + width: 372px;
356 361 }
357 362  
358 363 .action-gov_user_plugin_myprofile-edit_institution #institutions_corporate_name {
359   - width: 287px;
  364 + width: 537px;
360 365 color: black;
361 366 }
362 367  
  368 +.action-gov_user_plugin-create_institution_admin #institutions_cnpj,
363 369 .action-gov_user_plugin-create_institution_admin #institutions_corporate_name {
364   - width: 310px;
  370 + width: 508px;
  371 +}
  372 +
  373 +.action-gov_user_plugin_myprofile-edit_institution #institutions_cnpj {
  374 + width: 537px;
  375 + color: black;
365 376 }
366 377  
367 378 .action-gov_user_plugin_myprofile-edit_institution #community_country {
... ... @@ -383,20 +394,18 @@
383 394 }
384 395  
385 396 .action-gov_user_plugin_myprofile-edit_institution #community_city {
386   - width: 165px;
  397 + width: 171px;
387 398 color: black;
388 399 }
389 400  
390 401 .action-gov_user_plugin-create_institution_admin #community_city {
391   - width: 222px;
  402 + width: 199px;
392 403 }
393 404  
394   -.action-gov_user_plugin_myprofile-edit_institution #institutions_cnpj,
395 405 .action-gov_user_plugin_myprofile-edit_institution #institutions_acronym,
396   -.action-gov_user_plugin-create_institution_admin #institutions_cnpj,
397 406 .action-gov_user_plugin-create_institution_admin #institutions_acronym {
398 407 text-indent: 5px;
399   - width: 530px;
  408 + width: 111px;
400 409 }
401 410  
402 411 .action-gov_user_plugin_myprofile-edit_institution .modal-form-actions,
... ... @@ -409,7 +418,20 @@
409 418 margin-top: 15px;
410 419 }
411 420  
412   -.action-gov_user_plugin_myprofile-edit_institution #content form input.button.with-text,
  421 +.action-gov_user_plugin_myprofile-edit_institution #content .main-content input.button.with-text.icon-save.submit {
  422 + background: #3E67B1 none;
  423 + color: #fff;
  424 + border-radius: 4px;
  425 + border: 1px solid #3E67B1;
  426 + font-size: 14px;
  427 + font-family: "open_sansregular", Arial;
  428 + line-height: 17px;
  429 + max-height: 32px;
  430 + height: 32px;
  431 + padding: 5px 15px;
  432 + margin-right: 5px;
  433 +}
  434 +
413 435 .action-gov_user_plugin-create_institution_admin #content form input.button.with-text {
414 436 background-color: #3E67B1;
415 437 color: #fff;
... ... @@ -694,6 +716,14 @@
694 716 color: #585858;
695 717 }
696 718  
  719 +#noosfero_profile-content #content .main-content #profile-data #institutions_siorg_code,
  720 +.action-profile_editor-edit #content .main-content #profile-data #institutions_siorg_code,
  721 +.action-gov_user_plugin-create_institution_admin #content .main-content #institutions_siorg_code,
  722 +.action-gov_user_plugin_myprofile-edit_institution #content .main-content #institutions_siorg_code,
  723 +.action-organization_ratings_plugin_profile-new_rating #content .main-content #institutions_siorg_code {
  724 + width: 189px;
  725 +}
  726 +
697 727 .action-users-send_mail #content .main-content{
698 728 font-family: Arial;
699 729 }
... ...
src/noosfero-spb/noosfero-spb-theme/css/modal.css
  Diff comments   Edit   View file @b5d4b95
... ... @@ -19,15 +19,18 @@
19 19 overflow-y: auto;
20 20 }
21 21  
  22 +#noosfero_profile-content .fade,
22 23 .fade {
23 24 opacity: 0;
24 25 transition: opacity 0.15s linear 0s;
25 26 }
26 27  
  28 +#noosfero_profile-content .fade.in,
27 29 .fade.in {
28 30 opacity: 1;
29 31 }
30 32  
  33 +#noosfero_profile-content #content .main-content #profile-data .modal-dialog,
31 34 .action-profile_editor-edit #content .main-content #profile-data .modal-dialog,
32 35 .modal-dialog {
33 36 width: 45%;
... ... @@ -35,21 +38,25 @@
35 38 position: relative;
36 39 }
37 40  
  41 +#noosfero_profile-content #content .main-content #profile-data .modal.in .modal-dialog,
38 42 .action-profile_editor-edit #content .main-content #profile-data .modal.in .modal-dialog,
39 43 .modal.in .modal-dialog {
40 44 transform: translate(0px, 0px);
41 45 }
42 46  
  47 +#noosfero_profile-content #content .main-content #profile-data .modal.fade .modal-dialog,
43 48 .action-profile_editor-edit #content .main-content #profile-data .modal.fade .modal-dialog,
44 49 .modal.fade .modal-dialog {
45 50 transition: transform 0.3s ease-out 0s;
46 51 }
47 52  
  53 +#noosfero_profile-content #content .main-content #profile-data .modal-content,
48 54 .action-profile_editor-edit #content .main-content #profile-data .modal-content,
49 55 .modal-content {
50 56 box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.5);
51 57 }
52 58  
  59 +#noosfero_profile-content .modal-content,
53 60 .modal-content {
54 61 position: relative;
55 62 background-color: #FFF;
... ... @@ -60,6 +67,7 @@
60 67 box-shadow: 0px 3px 9px rgba(0, 0, 0, 0.5);
61 68 }
62 69  
  70 +#noosfero_profile-content #content .main-content #profile-data .modal-header,
63 71 .action-profile_editor-edit #content .main-content #profile-data .modal-header,
64 72 .modal-header {
65 73 min-height: 16.43px;
... ... @@ -67,11 +75,13 @@
67 75 border-bottom: 1px solid #E5E5E5;
68 76 }
69 77  
  78 +#noosfero_profile-content #content .main-content #profile-data .modal-header .close,
70 79 .action-profile_editor-edit #content .main-content #profile-data .modal-header .close,
71 80 .modal-header .close {
72 81 margin-top: -2px;
73 82 }
74 83  
  84 +#noosfero_profile-content #content .main-content #profile-data .modal-header button.close,
75 85 .action-profile_editor-edit #content .main-content #profile-data .modal-header button.close,
76 86 .modal-header button.close {
77 87 padding: 0px;
... ... @@ -80,6 +90,7 @@
80 90 border: 0px none;
81 91 }
82 92  
  93 +#noosfero_profile-content #content .main-content #profile-data .modal-header .close,
83 94 .action-profile_editor-edit #content .main-content #profile-data .modal-header .close,
84 95 .modal-header .close {
85 96 float: right;
... ... @@ -96,12 +107,14 @@
96 107 line-height: 1.42857 !important;
97 108 }
98 109  
  110 +#noosfero_profile-content #content .main-content #profile-data .modal-body,
99 111 .action-profile_editor-edit #content .main-content #profile-data .modal-body,
100 112 .modal-body {
101 113 position: relative;
102 114 padding: 15px;
103 115 }
104 116  
  117 +#noosfero_profile-content #content .main-content #profile-data .modal-footer,
105 118 .action-profile_editor-edit #content .main-content #profile-data .modal-footer,
106 119 .modal-footer {
107 120 padding: 15px;
... ... @@ -111,23 +124,31 @@
111 124  
112 125  
113 126 /* Bootstrap modal override */
  127 +#noosfero_profile-content #content .main-content #profile-data .modal-title,
114 128 .action-profile_editor-edit #content .main-content #profile-data .modal-title,
115 129 .modal-title {
116 130 font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
117 131 }
118 132  
  133 +#noosfero_profile-content #content .main-header h4,
119 134 .action-profile_editor-edit #content .main-header h4,
120 135 .modal-header h4 {
121 136 color: #333 !important;
122 137 font-size: 17px !important;
123 138 }
124 139  
  140 +#noosfero_profile-content #content .main-content #profile-data .modal-body,
125 141 .action-profile_editor-edit #content .main-content #profile-data .modal-body,
126 142 .modal-body {
127 143 overflow: hidden;
128 144 }
129 145  
130 146 /* Bootstrap modal form fields */
  147 +#noosfero_profile-content #content .main-content #profile-data .modal,
  148 +#noosfero_profile-content #content .main-content #profile-data .modal input,
  149 +#noosfero_profile-content #content .main-content #profile-data .modal select,
  150 +#noosfero_profile-content #content .main-content #profile-data .modal .formlabel,
  151 +#noosfero_profile-content #content .main-content #profile-data .modal .button.with-text,
131 152 .action-profile_editor-edit #content .main-content #profile-data .modal,
132 153 .action-profile_editor-edit #content .main-content #profile-data .modal input,
133 154 .action-profile_editor-edit #content .main-content #profile-data .modal select,
... ... @@ -142,21 +163,33 @@
142 163 font-style: normal;
143 164 }
144 165  
  166 +#noosfero_profile-content #content .main-content #profile-data .modal .button.with-text.icon-cancel {
  167 + color: #3E67B1;
  168 +}
  169 +
  170 +#noosfero_profile-content #content .main-content #profile-data .modal .button.with-text.icon-cancel:hover {
  171 + color: #fff;
  172 +}
  173 +
  174 +#noosfero_profile-content #content .main-content #profile-data .modal label,
145 175 .action-profile_editor-edit #content .main-content #profile-data .modal label,
146 176 .modal label {
147 177 margin-left: 4px;
148 178 }
149 179  
  180 +#noosfero_profile-content #content .main-content #profile-data .modal .sisp-fields label,
150 181 .action-profile_editor-edit #content .main-content #profile-data .modal .sisp-fields label,
151 182 .modal .sisp-fields label {
152 183 margin-left: 0px;
153 184 }
154 185  
  186 +#noosfero_profile-content #content .main-content #profile-data .modal h2,
155 187 .action-profile_editor-edit #content .main-content #profile-data .modal h2,
156 188 .modal h2 {
157 189 margin-top: 0px !important;
158 190 }
159 191  
  192 +#noosfero_profile-content #content .main-content #profile-data .modal .form-description,
160 193 .action-profile_editor-edit #content .main-content #profile-data .modal .form-description,
161 194 .modal .form-description {
162 195 border-bottom: 1px solid #E5E5E5;
... ... @@ -164,12 +197,15 @@
164 197 overflow: hidden;
165 198 }
166 199  
  200 +#noosfero_profile-content #content .main-content #profile-data .modal .formfieldline,
167 201 .action-profile_editor-edit #content .main-content #profile-data .modal .formfieldline,
168 202 .modal .formfieldline {
169 203 padding: 0px;
170 204 margin: 0px;
171 205 }
172 206  
  207 +#noosfero_profile-content #content .main-content #profile-data .modal input[type="text"],
  208 +#noosfero_profile-content #content .main-content #profile-data .modal select,
173 209 .action-profile_editor-edit #content .main-content #profile-data .modal input[type="text"],
174 210 .action-profile_editor-edit #content .main-content #profile-data .modal select,
175 211 .modal input[type="text"],
... ... @@ -180,12 +216,14 @@
180 216 background-color: #fff;
181 217 }
182 218  
  219 +#noosfero_profile-content #content .main-content form .modal input[type="radio"],
183 220 .action-profile_editor-edit #content .main-content form .modal input[type="radio"],
184 221 .modal input[type="radio"] {
185 222 vertical-align: middle;
186 223 margin: 0;
187 224 }
188 225  
  226 +#noosfero_profile-content #content .main-content #profile-data .modal .explanation,
189 227 .action-profile_editor-edit #content .main-content #profile-data .modal .explanation,
190 228 .modal .explanation {
191 229 color: #3F60C6;
... ... @@ -195,6 +233,8 @@
195 233 letter-spacing: 0.1px;
196 234 }
197 235  
  236 +#noosfero_profile-content #content .main-content #profile-data .modal .required-field,
  237 +#noosfero_profile-content #content .main-content #profile-data .modal .errorExplanation,
198 238 .action-profile_editor-edit #content .main-content #profile-data .modal .required-field,
199 239 .action-profile_editor-edit #content .main-content #profile-data .modal .errorExplanation,
200 240 .modal .required-field,
... ... @@ -204,6 +244,8 @@
204 244 margin-bottom: 20px;
205 245 }
206 246  
  247 +#noosfero_profile-content #content .main-content #profile-data .modal .required-field,
  248 +#noosfero_profile-content #content .main-content #profile-data .modal .errorExplanation:empty,
207 249 .action-profile_editor-edit #content .main-content #profile-data .modal .required-field,
208 250 .action-profile_editor-edit #content .main-content #profile-data .modal .errorExplanation:empty,
209 251 .modal .required-field,
... ... @@ -211,22 +253,26 @@
211 253 margin-bottom: 0px;
212 254 }
213 255  
  256 +#noosfero_profile-content #content .main-content #profile-data .modal .spb-row,
214 257 .action-profile_editor-edit #content .main-content #profile-data .modal .spb-row,
215 258 .modal .spb-row {
216 259 margin-top: 15px;
217 260 letter-spacing: 0.1px;
218 261 }
219 262  
  263 +#noosfero_profile-content #content .main-content #profile-data .no-margin-top,
220 264 .action-profile_editor-edit #content .main-content #profile-data .no-margin-top,
221 265 .no-margin-top {
222 266 margin-top: 0px !important;
223 267 }
224 268  
  269 +#noosfero_profile-content #content .main-content #profile-data .modal .modal-margin-right,
225 270 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-margin-right,
226 271 .modal .modal-margin-right {
227 272 margin-right: 4%;
228 273 }
229 274  
  275 +#noosfero_profile-content #content .main-content #profile-data .modal .modal-margin-left,
230 276 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-margin-left,
231 277 .modal .modal-margin-left {
232 278 margin-left: 4%;
... ... @@ -235,13 +281,17 @@
235 281 .action-profile_editor-edit #content .main-content #profile-data .modal #community_name,
236 282 .modal #community_name {
237 283 height: 16px;
238   - width: 200px;
  284 + width: 392px;
239 285 }
240 286  
  287 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_cnpj,
  288 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_corporate_name,
  289 +.action-profile_editor-edit #content .main-content #profile-data .modal #institutions_cnpj,
241 290 .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_corporate_name,
  291 +.modal #institutions_cnpj,
242 292 .modal #institutions_corporate_name {
243 293 height: 16px;
244   - width: 285px;
  294 + width: 533px;
245 295 }
246 296  
247 297 .action-profile_editor-edit #content .main-content #profile-data .modal #community_country,
... ... @@ -249,26 +299,53 @@
249 299 width: 220px;
250 300 }
251 301  
  302 +#noosfero_profile-content #content .main-content #profile-data .modal #community_state,
252 303 .action-profile_editor-edit #content .main-content #profile-data .modal #community_state,
253 304 .modal #community_state {
254 305 width: 80px;
255 306 }
256 307  
  308 +#noosfero_profile-content #content .main-content #profile-data .modal #community_city,
257 309 .action-profile_editor-edit #content .main-content #profile-data .modal #community_city,
258 310 .modal #community_city {
259 311 height: 16px;
260   - width: 190px;
  312 + width: 205px;
261 313 margin-top: 2px;
262 314 }
263 315  
264   -.action-profile_editor-edit #content .main-content #profile-data .modal #institutions_cnpj,
265 316 .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_acronym,
266   -.modal #institutions_cnpj,
267 317 .modal #institutions_acronym {
268 318 height: 16px;
269   - width: 530px;
  319 + width: 111px;
270 320 }
271 321  
  322 +#noosfero_profile-content #content .main-content #profile-data .modal #community_city,
  323 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_acronym,
  324 +#noosfero_profile-content #content .main-content #profile-data .modal #community_name,
  325 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_cnpj,
  326 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_corporate_name {
  327 + height: 38px;
  328 +}
  329 +
  330 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_acronym {
  331 + width: 133px;
  332 +}
  333 +
  334 +#noosfero_profile-content #content .main-content #profile-data .modal #community_name {
  335 + width: 410px;
  336 +}
  337 +
  338 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_cnpj,
  339 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_corporate_name {
  340 + width: 553px;
  341 +}
  342 +
  343 +#noosfero_profile-content #content .main-content #profile-data .modal #community_city {
  344 + width: 225px;
  345 +}
  346 +
  347 +#noosfero_profile-content #content .main-content #profile-data .modal a.button.with-text.icon-add,
  348 +#noosfero_profile-content #content .main-content #profile-data .modal a.button.with-text.icon-cancel,
272 349 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-add,
273 350 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-cancel,
274 351 .modal a.button.with-text.icon-add,
... ... @@ -278,17 +355,20 @@
278 355 font-size: 12px !important;
279 356 }
280 357  
  358 +#noosfero_profile-content #content .main-content #profile-data .modal a.button.with-text.icon-add,
281 359 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-add,
282 360 .modal a.button.with-text.icon-add {
283 361 background-color: #3E67B1 !important;
284 362 color: #fff !important;
285 363 }
286 364  
  365 +#noosfero_profile-content #content .main-content #profile-data .modal .public-institutions-fields,
287 366 .action-profile_editor-edit #content .main-content #profile-data .modal .public-institutions-fields,
288 367 .modal .public-institutions-fields {
289 368 display: none;
290 369 }
291 370  
  371 +#noosfero_profile-content #content .main-content #profile-data .modal .modal-form-actions,
292 372 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-form-actions,
293 373 .modal .modal-form-actions {
294 374 margin-top: 20px;
... ... @@ -318,3 +398,7 @@
318 398 color: #FFF !important;
319 399 text-transform: none !important;
320 400 }
  401 +
  402 +body .modal-backdrop.fade.in {
  403 + display: none;
  404 +}
... ...
  • 5eb59358fc7b3b7402ae353f8fb36293?s=40&d=identicon
    Link here  
    Macartur Sousa @macartur

    Added 1 new commit:

    • 86badacd - Fix create instutution form with colab profile
    Choose File ...   File name...
    Cancel
  • B4c7afc2cdffea95a8c2d0387acedc6b?s=40&d=identicon
    Link here  
    Paulo Meireles @paulormm

    mentioned in issue #424

    Choose File ...   File name...
    Cancel
  • 5eb59358fc7b3b7402ae353f8fb36293?s=40&d=identicon
    Link here  
    Macartur Sousa @macartur

    Added 2 new commits:

    • d2adbd4b - Fixed a noosfero design bug
    • 213b191b - Fixed cancel button to avoid use javascrit action
    Choose File ...   File name...
    Cancel
  • 79ebee40dd44c661fc4ad27b3656be68?s=40&d=identicon
    Link here  
    Álvaro Fernando Matos de Souza @alvarofernandoms

    Added 1 new commit:

    • b5d4b957 - Fix the institution edit form
    Choose File ...   File name...
    Cancel
    • C8b72d0556872a2aea21e8fed0a72001?s=40&d=identicon
    Show/hide discussion
    Melissa Wen started a discussion on commit 86badacd
    last updated by Álvaro Fernando Matos de Souza
    src/noosfero-spb/noosfero-spb-theme/css/modal.css
    19 19 overflow-y: auto;
    20 20 }
    21 21  
      22 +#noosfero_profile-content .fade,
    2
    • C8b72d0556872a2aea21e8fed0a72001?s=40&d=identicon
      Link here  
      Melissa Wen @melissawen

      essa classe: #noosfero_profile-content é uma classe do colab... deveria estar em alguma parte (não sei como está definido isso... do tema do colab), não do tema do noosfero.

      Choose File ...   File name...
      Cancel
    • 79ebee40dd44c661fc4ad27b3656be68?s=40&d=identicon
      Link here  
      Álvaro Fernando Matos de Souza @alvarofernandoms

      Essa classe só aparece em páginas do Colab que possuem interação com os campos de edição de perfil do noosfero. Por isso achei por bem adicionar nos arquivos do tema do noosfero mesmo pois eles devem buscar o mesmo estilo do nosso tema. Ela já está presente em outras regras. Acho que vai ser retrabalho redefini-la no tema do colab.

      Choose File ...   File name...
      Cancel
  • C8b72d0556872a2aea21e8fed0a72001?s=40&d=identicon
    Link here  
    Melissa Wen @melissawen

    @alvarofernandoms e @macartur, tem que ser 2 MRs cada um com seu contexto. Este deve conter apenas a adição com campo SIORG e um outro com a questão dos bugs de compatibilidade entre modal (add institution) e colab (pode ser herdado dessa branch + essas modificações)

    Choose File ...   File name...
    Cancel
  • 79ebee40dd44c661fc4ad27b3656be68?s=40&d=identicon
    Link here  
    Álvaro Fernando Matos de Souza @alvarofernandoms

    Status changed to closed

    Choose File ...   File name...
    Cancel