Commit c019b4074abff7c5febe0852a9fab2d19e2ffc4f

Authored by Macartur Sousa
1 parent bd921519
Exists in master and in 1 other branch mezuro_spb

Fix create instutution form with colab profile

Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
src/noosfero-spb/gov_user/public/views/create-institution.js
@@ -76,11 +76,11 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;] @@ -76,11 +76,11 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
76 add_selected_institution_to_list(institution_id, institution_name); 76 add_selected_institution_to_list(institution_id, institution_name);
77 77
78 $(".remove-institution").click(remove_institution); 78 $(".remove-institution").click(remove_institution);
79 - //$('#institution_dialog').dialog('close');  
80 $('#institution_modal').modal('toggle'); 79 $('#institution_modal').modal('toggle');
81 } 80 }
82 81
83 82
  83 +
84 function success_ajax_response(response) { 84 function success_ajax_response(response) {
85 close_loading(); 85 close_loading();
86 86
@@ -107,6 +107,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;] @@ -107,6 +107,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
107 update_user_institutions_list(); 107 update_user_institutions_list();
108 } else { 108 } else {
109 var errors = create_error_list(response); 109 var errors = create_error_list(response);
  110 +
110 $("#create_institution_errors").switchClass("hide-field", "show-field").html("<h2>"+response.message+"</h2>"+errors); 111 $("#create_institution_errors").switchClass("hide-field", "show-field").html("<h2>"+response.message+"</h2>"+errors);
111 112
112 show_errors_in_each_field(response.errors); 113 show_errors_in_each_field(response.errors);
@@ -117,8 +118,8 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;] @@ -117,8 +118,8 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
117 var errors = "<ul>"; 118 var errors = "<ul>";
118 var field_name; 119 var field_name;
119 120
120 - for(var error in response.errors) {  
121 - errors += "<li>"+response.errors[error]+"</li>"; 121 + for(var i =0;i<response.errors.length;i++) {
  122 + errors += "<li>"+response.errors[i]+"</li>";
122 } 123 }
123 124
124 errors += "</ul>"; 125 errors += "</ul>";
src/noosfero-spb/noosfero-spb-theme/css/modal.css
@@ -19,15 +19,18 @@ @@ -19,15 +19,18 @@
19 overflow-y: auto; 19 overflow-y: auto;
20 } 20 }
21 21
  22 +#noosfero_profile-content .fade,
22 .fade { 23 .fade {
23 opacity: 0; 24 opacity: 0;
24 transition: opacity 0.15s linear 0s; 25 transition: opacity 0.15s linear 0s;
25 } 26 }
26 27
  28 +#noosfero_profile-content .fade.in,
27 .fade.in { 29 .fade.in {
28 opacity: 1; 30 opacity: 1;
29 } 31 }
30 32
  33 +#noosfero_profile-content #content .main-content #profile-data .modal-dialog,
31 .action-profile_editor-edit #content .main-content #profile-data .modal-dialog, 34 .action-profile_editor-edit #content .main-content #profile-data .modal-dialog,
32 .modal-dialog { 35 .modal-dialog {
33 width: 590px; 36 width: 590px;
@@ -35,7 +38,7 @@ @@ -35,7 +38,7 @@
35 position: relative; 38 position: relative;
36 } 39 }
37 40
38 -#noosfero_profile-content #content .main-content #profile-data .modal-dialog{ 41 +#noosfero_profile-content #content .main-content #profile-data .modal-dialog {
39 position: static; 42 position: static;
40 } 43 }
41 44
@@ -44,16 +47,19 @@ @@ -44,16 +47,19 @@
44 transform: translate(0px, 0px); 47 transform: translate(0px, 0px);
45 } 48 }
46 49
  50 +#noosfero_profile-content #content .main-content #profile-data .modal.fade .modal-dialog,
47 .action-profile_editor-edit #content .main-content #profile-data .modal.fade .modal-dialog, 51 .action-profile_editor-edit #content .main-content #profile-data .modal.fade .modal-dialog,
48 .modal.fade .modal-dialog { 52 .modal.fade .modal-dialog {
49 transition: transform 0.3s ease-out 0s; 53 transition: transform 0.3s ease-out 0s;
50 } 54 }
51 55
  56 +#noosfero_profile-content #content .main-content #profile-data .modal-content,
52 .action-profile_editor-edit #content .main-content #profile-data .modal-content, 57 .action-profile_editor-edit #content .main-content #profile-data .modal-content,
53 .modal-content { 58 .modal-content {
54 box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.5); 59 box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.5);
55 } 60 }
56 61
  62 +#noosfero_profile-content .modal-content,
57 .modal-content { 63 .modal-content {
58 position: relative; 64 position: relative;
59 background-color: #FFF; 65 background-color: #FFF;
@@ -64,6 +70,7 @@ @@ -64,6 +70,7 @@
64 box-shadow: 0px 3px 9px rgba(0, 0, 0, 0.5); 70 box-shadow: 0px 3px 9px rgba(0, 0, 0, 0.5);
65 } 71 }
66 72
  73 +#noosfero_profile-content #content .main-content #profile-data .modal-header,
67 .action-profile_editor-edit #content .main-content #profile-data .modal-header, 74 .action-profile_editor-edit #content .main-content #profile-data .modal-header,
68 .modal-header { 75 .modal-header {
69 min-height: 16.43px; 76 min-height: 16.43px;
@@ -71,11 +78,13 @@ @@ -71,11 +78,13 @@
71 border-bottom: 1px solid #E5E5E5; 78 border-bottom: 1px solid #E5E5E5;
72 } 79 }
73 80
  81 +#noosfero_profile-content #content .main-content #profile-data .modal-header .close,
74 .action-profile_editor-edit #content .main-content #profile-data .modal-header .close, 82 .action-profile_editor-edit #content .main-content #profile-data .modal-header .close,
75 .modal-header .close { 83 .modal-header .close {
76 margin-top: -2px; 84 margin-top: -2px;
77 } 85 }
78 86
  87 +#noosfero_profile-content #content .main-content #profile-data .modal-header button.close,
79 .action-profile_editor-edit #content .main-content #profile-data .modal-header button.close, 88 .action-profile_editor-edit #content .main-content #profile-data .modal-header button.close,
80 .modal-header button.close { 89 .modal-header button.close {
81 padding: 0px; 90 padding: 0px;
@@ -84,6 +93,7 @@ @@ -84,6 +93,7 @@
84 border: 0px none; 93 border: 0px none;
85 } 94 }
86 95
  96 +#noosfero_profile-content #content .main-content #profile-data .modal-header .close,
87 .action-profile_editor-edit #content .main-content #profile-data .modal-header .close, 97 .action-profile_editor-edit #content .main-content #profile-data .modal-header .close,
88 .modal-header .close { 98 .modal-header .close {
89 float: right; 99 float: right;
@@ -100,12 +110,14 @@ @@ -100,12 +110,14 @@
100 line-height: 1.42857 !important; 110 line-height: 1.42857 !important;
101 } 111 }
102 112
  113 +#noosfero_profile-content #content .main-content #profile-data .modal-body,
103 .action-profile_editor-edit #content .main-content #profile-data .modal-body, 114 .action-profile_editor-edit #content .main-content #profile-data .modal-body,
104 .modal-body { 115 .modal-body {
105 position: relative; 116 position: relative;
106 padding: 15px; 117 padding: 15px;
107 } 118 }
108 119
  120 +#noosfero_profile-content #content .main-content #profile-data .modal-footer,
109 .action-profile_editor-edit #content .main-content #profile-data .modal-footer, 121 .action-profile_editor-edit #content .main-content #profile-data .modal-footer,
110 .modal-footer { 122 .modal-footer {
111 padding: 15px; 123 padding: 15px;
@@ -115,23 +127,31 @@ @@ -115,23 +127,31 @@
115 127
116 128
117 /* Bootstrap modal override */ 129 /* Bootstrap modal override */
  130 +#noosfero_profile-content #content .main-content #profile-data .modal-title,
118 .action-profile_editor-edit #content .main-content #profile-data .modal-title, 131 .action-profile_editor-edit #content .main-content #profile-data .modal-title,
119 .modal-title { 132 .modal-title {
120 font-family: 'open_sansregular', Arial, Helvetica, sans-serif; 133 font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
121 } 134 }
122 135
  136 +#noosfero_profile-content #content .main-header h4,
123 .action-profile_editor-edit #content .main-header h4, 137 .action-profile_editor-edit #content .main-header h4,
124 .modal-header h4 { 138 .modal-header h4 {
125 color: #333 !important; 139 color: #333 !important;
126 font-size: 17px !important; 140 font-size: 17px !important;
127 } 141 }
128 142
  143 +#noosfero_profile-content #content .main-content #profile-data .modal-body,
129 .action-profile_editor-edit #content .main-content #profile-data .modal-body, 144 .action-profile_editor-edit #content .main-content #profile-data .modal-body,
130 .modal-body { 145 .modal-body {
131 overflow: hidden; 146 overflow: hidden;
132 } 147 }
133 148
134 /* Bootstrap modal form fields */ 149 /* Bootstrap modal form fields */
  150 +#noosfero_profile-content #content .main-content #profile-data .modal,
  151 +#noosfero_profile-content #content .main-content #profile-data .modal input,
  152 +#noosfero_profile-content #content .main-content #profile-data .modal select,
  153 +#noosfero_profile-content #content .main-content #profile-data .modal .formlabel,
  154 +#noosfero_profile-content #content .main-content #profile-data .modal .button.with-text,
135 .action-profile_editor-edit #content .main-content #profile-data .modal, 155 .action-profile_editor-edit #content .main-content #profile-data .modal,
136 .action-profile_editor-edit #content .main-content #profile-data .modal input, 156 .action-profile_editor-edit #content .main-content #profile-data .modal input,
137 .action-profile_editor-edit #content .main-content #profile-data .modal select, 157 .action-profile_editor-edit #content .main-content #profile-data .modal select,
@@ -146,21 +166,33 @@ @@ -146,21 +166,33 @@
146 font-style: normal; 166 font-style: normal;
147 } 167 }
148 168
  169 +#noosfero_profile-content #content .main-content #profile-data .modal .button.with-text.icon-cancel {
  170 + color: #3E67B1;
  171 +}
  172 +
  173 +#noosfero_profile-content #content .main-content #profile-data .modal .button.with-text.icon-cancel:hover {
  174 + color: #fff;
  175 +}
  176 +
  177 +#noosfero_profile-content #content .main-content #profile-data .modal label,
149 .action-profile_editor-edit #content .main-content #profile-data .modal label, 178 .action-profile_editor-edit #content .main-content #profile-data .modal label,
150 .modal label { 179 .modal label {
151 margin-left: 4px; 180 margin-left: 4px;
152 } 181 }
153 182
  183 +#noosfero_profile-content #content .main-content #profile-data .modal .sisp-fields label,
154 .action-profile_editor-edit #content .main-content #profile-data .modal .sisp-fields label, 184 .action-profile_editor-edit #content .main-content #profile-data .modal .sisp-fields label,
155 .modal .sisp-fields label { 185 .modal .sisp-fields label {
156 margin-left: 0px; 186 margin-left: 0px;
157 } 187 }
158 188
  189 +#noosfero_profile-content #content .main-content #profile-data .modal h2,
159 .action-profile_editor-edit #content .main-content #profile-data .modal h2, 190 .action-profile_editor-edit #content .main-content #profile-data .modal h2,
160 .modal h2 { 191 .modal h2 {
161 margin-top: 0px !important; 192 margin-top: 0px !important;
162 } 193 }
163 194
  195 +#noosfero_profile-content #content .main-content #profile-data .modal .form-description,
164 .action-profile_editor-edit #content .main-content #profile-data .modal .form-description, 196 .action-profile_editor-edit #content .main-content #profile-data .modal .form-description,
165 .modal .form-description { 197 .modal .form-description {
166 border-bottom: 1px solid #E5E5E5; 198 border-bottom: 1px solid #E5E5E5;
@@ -168,12 +200,15 @@ @@ -168,12 +200,15 @@
168 overflow: hidden; 200 overflow: hidden;
169 } 201 }
170 202
  203 +#noosfero_profile-content #content .main-content #profile-data .modal .formfieldline,
171 .action-profile_editor-edit #content .main-content #profile-data .modal .formfieldline, 204 .action-profile_editor-edit #content .main-content #profile-data .modal .formfieldline,
172 .modal .formfieldline { 205 .modal .formfieldline {
173 padding: 0px; 206 padding: 0px;
174 margin: 0px; 207 margin: 0px;
175 } 208 }
176 209
  210 +#noosfero_profile-content #content .main-content #profile-data .modal input[type="text"],
  211 +#noosfero_profile-content #content .main-content #profile-data .modal select,
177 .action-profile_editor-edit #content .main-content #profile-data .modal input[type="text"], 212 .action-profile_editor-edit #content .main-content #profile-data .modal input[type="text"],
178 .action-profile_editor-edit #content .main-content #profile-data .modal select, 213 .action-profile_editor-edit #content .main-content #profile-data .modal select,
179 .modal input[type="text"], 214 .modal input[type="text"],
@@ -184,12 +219,14 @@ @@ -184,12 +219,14 @@
184 background-color: #fff; 219 background-color: #fff;
185 } 220 }
186 221
  222 +#noosfero_profile-content #content .main-content form .modal input[type="radio"],
187 .action-profile_editor-edit #content .main-content form .modal input[type="radio"], 223 .action-profile_editor-edit #content .main-content form .modal input[type="radio"],
188 .modal input[type="radio"] { 224 .modal input[type="radio"] {
189 vertical-align: middle; 225 vertical-align: middle;
190 margin: 0; 226 margin: 0;
191 } 227 }
192 228
  229 +#noosfero_profile-content #content .main-content #profile-data .modal .explanation,
193 .action-profile_editor-edit #content .main-content #profile-data .modal .explanation, 230 .action-profile_editor-edit #content .main-content #profile-data .modal .explanation,
194 .modal .explanation { 231 .modal .explanation {
195 color: #3F60C6; 232 color: #3F60C6;
@@ -199,6 +236,8 @@ @@ -199,6 +236,8 @@
199 letter-spacing: 0.1px; 236 letter-spacing: 0.1px;
200 } 237 }
201 238
  239 +#noosfero_profile-content #content .main-content #profile-data .modal .required-field,
  240 +#noosfero_profile-content #content .main-content #profile-data .modal .errorExplanation,
202 .action-profile_editor-edit #content .main-content #profile-data .modal .required-field, 241 .action-profile_editor-edit #content .main-content #profile-data .modal .required-field,
203 .action-profile_editor-edit #content .main-content #profile-data .modal .errorExplanation, 242 .action-profile_editor-edit #content .main-content #profile-data .modal .errorExplanation,
204 .modal .required-field, 243 .modal .required-field,
@@ -208,6 +247,8 @@ @@ -208,6 +247,8 @@
208 margin-bottom: 20px; 247 margin-bottom: 20px;
209 } 248 }
210 249
  250 +#noosfero_profile-content #content .main-content #profile-data .modal .required-field,
  251 +#noosfero_profile-content #content .main-content #profile-data .modal .errorExplanation:empty,
211 .action-profile_editor-edit #content .main-content #profile-data .modal .required-field, 252 .action-profile_editor-edit #content .main-content #profile-data .modal .required-field,
212 .action-profile_editor-edit #content .main-content #profile-data .modal .errorExplanation:empty, 253 .action-profile_editor-edit #content .main-content #profile-data .modal .errorExplanation:empty,
213 .modal .required-field, 254 .modal .required-field,
@@ -215,22 +256,26 @@ @@ -215,22 +256,26 @@
215 margin-bottom: 0px; 256 margin-bottom: 0px;
216 } 257 }
217 258
  259 +#noosfero_profile-content #content .main-content #profile-data .modal .spb-row,
218 .action-profile_editor-edit #content .main-content #profile-data .modal .spb-row, 260 .action-profile_editor-edit #content .main-content #profile-data .modal .spb-row,
219 .modal .spb-row { 261 .modal .spb-row {
220 margin-top: 15px; 262 margin-top: 15px;
221 letter-spacing: 0.1px; 263 letter-spacing: 0.1px;
222 } 264 }
223 265
  266 +#noosfero_profile-content #content .main-content #profile-data .no-margin-top,
224 .action-profile_editor-edit #content .main-content #profile-data .no-margin-top, 267 .action-profile_editor-edit #content .main-content #profile-data .no-margin-top,
225 .no-margin-top { 268 .no-margin-top {
226 margin-top: 0px !important; 269 margin-top: 0px !important;
227 } 270 }
228 271
  272 +#noosfero_profile-content #content .main-content #profile-data .modal .modal-margin-right,
229 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-margin-right, 273 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-margin-right,
230 .modal .modal-margin-right { 274 .modal .modal-margin-right {
231 margin-right: 4%; 275 margin-right: 4%;
232 } 276 }
233 277
  278 +#noosfero_profile-content #content .main-content #profile-data .modal .modal-margin-left,
234 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-margin-left, 279 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-margin-left,
235 .modal .modal-margin-left { 280 .modal .modal-margin-left {
236 margin-left: 4%; 281 margin-left: 4%;
@@ -242,6 +287,8 @@ @@ -242,6 +287,8 @@
242 width: 392px; 287 width: 392px;
243 } 288 }
244 289
  290 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_cnpj,
  291 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_corporate_name,
245 .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_cnpj, 292 .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_cnpj,
246 .modal #institutions_cnpj{ 293 .modal #institutions_cnpj{
247 height: 16px; 294 height: 16px;
@@ -258,11 +305,13 @@ @@ -258,11 +305,13 @@
258 width: 220px; 305 width: 220px;
259 } 306 }
260 307
  308 +#noosfero_profile-content #content .main-content #profile-data .modal #community_state,
261 .action-profile_editor-edit #content .main-content #profile-data .modal #community_state, 309 .action-profile_editor-edit #content .main-content #profile-data .modal #community_state,
262 .modal #community_state { 310 .modal #community_state {
263 width: 90px; 311 width: 90px;
264 } 312 }
265 313
  314 +#noosfero_profile-content #content .main-content #profile-data .modal #community_city,
266 .action-profile_editor-edit #content .main-content #profile-data .modal #community_city, 315 .action-profile_editor-edit #content .main-content #profile-data .modal #community_city,
267 .modal #community_city { 316 .modal #community_city {
268 height: 16px; 317 height: 16px;
@@ -276,6 +325,33 @@ @@ -276,6 +325,33 @@
276 width: 111px; 325 width: 111px;
277 } 326 }
278 327
  328 +#noosfero_profile-content #content .main-content #profile-data .modal #community_city,
  329 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_acronym,
  330 +#noosfero_profile-content #content .main-content #profile-data .modal #community_name,
  331 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_cnpj,
  332 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_corporate_name {
  333 + height: 38px;
  334 +}
  335 +
  336 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_acronym {
  337 + width: 133px;
  338 +}
  339 +
  340 +#noosfero_profile-content #content .main-content #profile-data .modal #community_name {
  341 + width: 410px;
  342 +}
  343 +
  344 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_cnpj,
  345 +#noosfero_profile-content #content .main-content #profile-data .modal #institutions_corporate_name {
  346 + width: 553px;
  347 +}
  348 +
  349 +#noosfero_profile-content #content .main-content #profile-data .modal #community_city {
  350 + width: 225px;
  351 +}
  352 +
  353 +#noosfero_profile-content #content .main-content #profile-data .modal a.button.with-text.icon-add,
  354 +#noosfero_profile-content #content .main-content #profile-data .modal a.button.with-text.icon-cancel,
279 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-add, 355 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-add,
280 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-cancel, 356 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-cancel,
281 .modal a.button.with-text.icon-add, 357 .modal a.button.with-text.icon-add,
@@ -285,17 +361,20 @@ @@ -285,17 +361,20 @@
285 font-size: 12px !important; 361 font-size: 12px !important;
286 } 362 }
287 363
  364 +#noosfero_profile-content #content .main-content #profile-data .modal a.button.with-text.icon-add,
288 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-add, 365 .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-add,
289 .modal a.button.with-text.icon-add { 366 .modal a.button.with-text.icon-add {
290 background-color: #3E67B1 !important; 367 background-color: #3E67B1 !important;
291 color: #fff !important; 368 color: #fff !important;
292 } 369 }
293 370
  371 +#noosfero_profile-content #content .main-content #profile-data .modal .public-institutions-fields,
294 .action-profile_editor-edit #content .main-content #profile-data .modal .public-institutions-fields, 372 .action-profile_editor-edit #content .main-content #profile-data .modal .public-institutions-fields,
295 .modal .public-institutions-fields { 373 .modal .public-institutions-fields {
296 display: none; 374 display: none;
297 } 375 }
298 376
  377 +#noosfero_profile-content #content .main-content #profile-data .modal .modal-form-actions,
299 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-form-actions, 378 .action-profile_editor-edit #content .main-content #profile-data .modal .modal-form-actions,
300 .modal .modal-form-actions { 379 .modal .modal-form-actions {
301 margin-top: 20px; 380 margin-top: 20px;
@@ -325,3 +404,7 @@ @@ -325,3 +404,7 @@
325 color: #FFF !important; 404 color: #FFF !important;
326 text-transform: none !important; 405 text-transform: none !important;
327 } 406 }
  407 +
  408 +body .modal-backdrop.fade.in {
  409 + display: none;
  410 +}