Download as
Browse Code »

Commit ca2910bc42715496aa6849ed17bbca16181b14ea

Authored by Álvaro Fernando Matos de Souza
1 parent 1e1361d1

Fix the institution edit form

Showing 2 changed files with 50 additions and 21 deletions   Show diff stats
src/noosfero-spb/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb
  Diff comments   View file @ca2910b
... ... @@ -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">
... ...
src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css
  Diff comments   View file @ca2910b
... ... @@ -346,9 +346,14 @@
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 {
... ... @@ -356,16 +361,20 @@
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  
363   -.action-gov_user_plugin_myprofile-edit_institution #institutions_cnpj,
364 368 .action-gov_user_plugin-create_institution_admin #institutions_cnpj,
365 369 .action-gov_user_plugin-create_institution_admin #institutions_corporate_name {
366 370 width: 508px;
367 371 }
368 372  
  373 +.action-gov_user_plugin_myprofile-edit_institution #institutions_cnpj {
  374 + width: 537px;
  375 + color: black;
  376 +}
  377 +
369 378 .action-gov_user_plugin_myprofile-edit_institution #community_country {
370 379 width: 232px;
371 380 color: black;
... ... @@ -385,7 +394,7 @@
385 394 }
386 395  
387 396 .action-gov_user_plugin_myprofile-edit_institution #community_city {
388   - width: 165px;
  397 + width: 171px;
389 398 color: black;
390 399 }
391 400  
... ... @@ -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;
... ... @@ -697,6 +719,7 @@
697 719 #noosfero_profile-content #content .main-content #profile-data #institutions_siorg_code,
698 720 .action-profile_editor-edit #content .main-content #profile-data #institutions_siorg_code,
699 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,
700 723 .action-organization_ratings_plugin_profile-new_rating #content .main-content #institutions_siorg_code {
701 724 width: 189px;
702 725 }
... ...