Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UX for Plugins Activate/Deactivate buttons #849

Merged
merged 2 commits into from
Oct 16, 2018
Merged

Fix UX for Plugins Activate/Deactivate buttons #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc0a60
Fix UX for Plugins -> Activate/Deactivate buttons
westonganger Oct 16, 2018
e15869c
fix specs
westonganger Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/views/camaleon_cms/admin/plugins/_plugins_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
<td><%= plugin["version"] %></td>
<td><%= t("camaleon_cms.admin.plugins.status_#{status}") %></td>
<td>
<%= link_to raw("<i class='fa fa-#{status ? "check-square" : "square"}'></i>"), {action: :toggle, id: plugin["key"], status: status }, class: "btn btn-default btn-xs", title: "#{status ? t('camaleon_cms.admin.button.disable_plugin') : t('camaleon_cms.admin.button.activate_plugin') }", data: { confirm: "#{"#{status ? t('camaleon_cms.admin.button.disable_plugin') : t('camaleon_cms.admin.button.activate_plugin') }"}?" } %>
<% msg = "#{status ? t('camaleon_cms.admin.button.disable_plugin') : t('camaleon_cms.admin.button.activate_plugin') }" %>
<%= link_to msg, {action: :toggle, id: plugin["key"], status: status }, class: "btn btn-#{status ? 'danger' : 'primary'} btn-xs", data: { confirm: msg } %>
<%= link_to("<i class='fa fa-arrow-circle-o-up'></i>".html_safe, cama_admin_plugin_upgrade_path(plugin["key"]), class: "btn btn-info btn-xs", title: "#{t("camaleon_cms.admin.plugins.upgrade_to")} #{plugin["version"]}") if status && current_site.get_plugin(plugin["key"]).old_version? %>
</td>
</tr>
Expand All @@ -39,4 +40,4 @@
</table>
<%= content_tag("div", raw(t('camaleon_cms.admin.message.data_found_list')), class: "alert alert-warning") if plugins.empty? %>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions spec/features/admin/plugins_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@

# uninstall plugin
within '#tab_plugins_active' do
all(".btn-default")[0].click
all(".btn-danger")[0].click
end
confirm_dialog
expect(page).to have_css('.alert-success')

# install plugin
page.execute_script('$("#table-plugins-list .nav-tabs li").eq(1).find("a").click()')
within '#tab_plugins_disabled' do
all(".btn-default")[0].click
all(".btn-primary")[0].click
end
confirm_dialog
expect(page).to have_css('.alert-success')
end
end
end