Download as
Browse Code »

Commit da3f1073b4edb36ddfd7563f83346d5cc15bd5a1

Authored by Daniela Feitosa
1 parent ff489c4b
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Removed inline style from table 

Also changed selenium tests to use defined steps

(ActionItem2962)
Showing 5 changed files with 26 additions and 11 deletions   Show diff stats
app/views/features/_manage_community_fields.rhtml
  Diff comments   View file @da3f107
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <th><%= _('Display on creation?') %></th> 10 <th><%= _('Display on creation?') %></th>
11 </tr> 11 </tr>
12 12
13 - <tr style="border-bottom:solid 2px #000"> 13 + <tr class='manage-fields-batch-actions'>
14 <td> 14 <td>
15 <%= _("Check/Uncheck All")%> 15 <%= _("Check/Uncheck All")%>
16 </td> 16 </td>
app/views/features/_manage_enterprise_fields.rhtml
  Diff comments   View file @da3f107
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <th><%= _('Display on registration?') %></th> 10 <th><%= _('Display on registration?') %></th>
11 </tr> 11 </tr>
12 12
13 - <tr style="border-bottom:solid 2px #000"> 13 + <tr class='manage-fields-batch-actions'>
14 <td> 14 <td>
15 <%= _("Check/Uncheck All")%> 15 <%= _("Check/Uncheck All")%>
16 </td> 16 </td>
app/views/features/_manage_person_fields.rhtml
  Diff comments   View file @da3f107
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <th><%= _('Display on signup?') %></th> 10 <th><%= _('Display on signup?') %></th>
11 </tr> 11 </tr>
12 12
13 - <tr style="border-bottom:solid 2px #000"> 13 + <tr class='manage-fields-batch-actions'>
14 <td> 14 <td>
15 <%= _("Check/Uncheck All")%> 15 <%= _("Check/Uncheck All")%>
16 </td> 16 </td>
features/manage_fields.feature
  Diff comments   View file @da3f107
@@ -12,7 +12,6 @@ Feature: check all manage fields @@ -12,7 +12,6 @@ Feature: check all manage fields
12 And the following community 12 And the following community
13 | identifier | name | 13 | identifier | name |
14 | mycommunity | My Community | 14 | mycommunity | My Community |
15 - And "Maria Silva" is admin of "My Community"  
16 And I am logged in as admin 15 And I am logged in as admin
17 And I go to /admin/features/manage_fields 16 And I go to /admin/features/manage_fields
18 17
@@ -20,22 +19,24 @@ Feature: check all manage fields @@ -20,22 +19,24 @@ Feature: check all manage fields
20 Scenario: check all active person fields 19 Scenario: check all active person fields
21 Given I check "person_active" 20 Given I check "person_active"
22 And I press "save_person_fields" 21 And I press "save_person_fields"
23 - And I follow "Control panel"  
24 - When I follow "Edit Profile" 22 + When I go to admin_user's control panel
  23 + And I follow "Edit Profile"
25 Then I should see "Custom area of study" 24 Then I should see "Custom area of study"
26 25
27 @selenium 26 @selenium
28 Scenario: check all active enterprise fields 27 Scenario: check all active enterprise fields
29 Given I check "enterprise_active" 28 Given I check "enterprise_active"
30 And I press "save_enterprise_fields" 29 And I press "save_enterprise_fields"
31 - When I go to /myprofile/paper-street/profile_editor/edit 30 + When I go to paper-street's control panel
  31 + And I follow "Enterprise Info and settings"
32 Then I should see "Historic and current context" 32 Then I should see "Historic and current context"
33 33
34 @selenium 34 @selenium
35 Scenario: check all active community fields 35 Scenario: check all active community fields
36 Given I check "community_active" 36 Given I check "community_active"
37 And I press "save_community_fields" 37 And I press "save_community_fields"
38 - When I go to /myprofile/mycommunity/profile_editor/edit 38 + When I go to mycommunity's control panel
  39 + And I follow "Community Info and settings"
39 Then I should see "Economic activity" 40 Then I should see "Economic activity"
40 41
41 @selenium 42 @selenium
@@ -54,7 +55,8 @@ Feature: check all manage fields @@ -54,7 +55,8 @@ Feature: check all manage fields
54 And I press "save_community_fields" 55 And I press "save_community_fields"
55 And I uncheck "community_active" 56 And I uncheck "community_active"
56 And I press "save_community_fields" 57 And I press "save_community_fields"
57 - When I go to /myprofile/mycommunity/profile_editor/edit 58 + When I go to mycommunity's control panel
  59 + And I follow "Community Info and settings"
58 Then I should not see "Economic activity" 60 Then I should not see "Economic activity"
59 61
60 @selenium 62 @selenium
@@ -63,5 +65,6 @@ Feature: check all manage fields @@ -63,5 +65,6 @@ Feature: check all manage fields
63 And I press "save_enterprise_fields" 65 And I press "save_enterprise_fields"
64 And I uncheck "enterprise_active" 66 And I uncheck "enterprise_active"
65 And I press "save_enterprise_fields" 67 And I press "save_enterprise_fields"
66 - When I go to /myprofile/paper-street/profile_editor/edit  
67 - Then I should not see "Historic and current context"  
68 \ No newline at end of file 68 \ No newline at end of file
  69 + When I go to paper-street's control panel
  70 + And I follow "Enterprise Info and settings"
  71 + Then I should not see "Historic and current context"
public/stylesheets/application.css
  Diff comments   View file @da3f107
@@ -6488,3 +6488,15 @@ ul.article-versions li { @@ -6488,3 +6488,15 @@ ul.article-versions li {
6488 font-size: 13px; 6488 font-size: 13px;
6489 padding: 3px 0px; 6489 padding: 3px 0px;
6490 } 6490 }
  6491 +
  6492 +/* * * Admin manage fields * * */
  6493 +
  6494 +.controller-features .manage-fields-batch-actions,
  6495 +.controller-features .manage-fields-batch-actions:hover {
  6496 + border-bottom:solid 2px #000;
  6497 + background-color: #EEE;
  6498 +}
  6499 +
  6500 +.controller-features .manage-fields-batch-actions td {
  6501 + font-style: italic;
  6502 +}