Download as
Browse Code »

Commit da3f1073b4edb36ddfd7563f83346d5cc15bd5a1

Authored by Daniela Feitosa
1 parent ff489c4b
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 10 <th><%= _('Display on creation?') %></th>
11 11 </tr>
12 12  
13   - <tr style="border-bottom:solid 2px #000">
  13 + <tr class='manage-fields-batch-actions'>
14 14 <td>
15 15 <%= _("Check/Uncheck All")%>
16 16 </td>
... ...
app/views/features/_manage_enterprise_fields.rhtml
  Diff comments   View file @da3f107
... ... @@ -10,7 +10,7 @@
10 10 <th><%= _('Display on registration?') %></th>
11 11 </tr>
12 12  
13   - <tr style="border-bottom:solid 2px #000">
  13 + <tr class='manage-fields-batch-actions'>
14 14 <td>
15 15 <%= _("Check/Uncheck All")%>
16 16 </td>
... ...
app/views/features/_manage_person_fields.rhtml
  Diff comments   View file @da3f107
... ... @@ -10,7 +10,7 @@
10 10 <th><%= _('Display on signup?') %></th>
11 11 </tr>
12 12  
13   - <tr style="border-bottom:solid 2px #000">
  13 + <tr class='manage-fields-batch-actions'>
14 14 <td>
15 15 <%= _("Check/Uncheck All")%>
16 16 </td>
... ...
features/manage_fields.feature
  Diff comments   View file @da3f107
... ... @@ -12,7 +12,6 @@ Feature: check all manage fields
12 12 And the following community
13 13 | identifier | name |
14 14 | mycommunity | My Community |
15   - And "Maria Silva" is admin of "My Community"
16 15 And I am logged in as admin
17 16 And I go to /admin/features/manage_fields
18 17  
... ... @@ -20,22 +19,24 @@ Feature: check all manage fields
20 19 Scenario: check all active person fields
21 20 Given I check "person_active"
22 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 24 Then I should see "Custom area of study"
26 25  
27 26 @selenium
28 27 Scenario: check all active enterprise fields
29 28 Given I check "enterprise_active"
30 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 32 Then I should see "Historic and current context"
33 33  
34 34 @selenium
35 35 Scenario: check all active community fields
36 36 Given I check "community_active"
37 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 40 Then I should see "Economic activity"
40 41  
41 42 @selenium
... ... @@ -54,7 +55,8 @@ Feature: check all manage fields
54 55 And I press "save_community_fields"
55 56 And I uncheck "community_active"
56 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 60 Then I should not see "Economic activity"
59 61  
60 62 @selenium
... ... @@ -63,5 +65,6 @@ Feature: check all manage fields
63 65 And I press "save_enterprise_fields"
64 66 And I uncheck "enterprise_active"
65 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 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 6488 font-size: 13px;
6489 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 +}
... ...