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

Jump to bottom

Add a 'manage' dropdown for uninstalled extensions. #5831

Merged
merged 1 commit into from
Sep 28, 2016
Merged

Add a 'manage' dropdown for uninstalled extensions. #5831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions app/src/js/modules/extend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,20 @@

// Manage dropdown
var manage = '';
if (ext.status === 'installed' && ext.type !== "composer-plugin") {
manage = conf.manage_dropdown.subst({
var parameters = {
'%NAME%': ext.name,
'%VERSION%': ext.version,
'%BASEURL%': bolt.data('extend.baseurl'),
'%MARKETPLACE_URL%': 'https://extensions.bolt.cm/view/' + ext.name,
'%REPOSITORY_URL%': ext.repositoryLink
});
};

if (ext.status === 'installed' && ext.type !== 'composer-plugin') {
manage = conf.manage_dropdown_installed.subst(parameters);
} else {
manage = conf.manage_dropdown_uninstalled.subst(parameters);
}

var invalid = ' — [INVALID] ';
var disabled = ' — [DISABLED] ';
var constraint = '<i class="fa fa-cog fa-fw"></i>';
Expand Down
80 changes: 60 additions & 20 deletions app/view/twig/extend/_package.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
{% endset %}

{#
# Contains the version and uninstall buttons
# Contains the version and uninstall buttons for INSTALLED extensions
#}
{% set package_manage_dropdown %}
{% set package_manage_dropdown_installed %}
<div class="btn-group pull-right">
<button type="button" class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-flag"></i> {{ __('page.extend.button.manage') }}
Expand Down Expand Up @@ -85,6 +85,45 @@
</div>
{% endset %}

{#
# Contains the version and uninstall buttons for UNINSTALLED extensions
#}
{% set package_manage_dropdown_uninstalled %}
<div class="btn-group pull-right">
<button type="button" class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-flag"></i> {{ __('page.extend.button.manage') }}
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>

<ul class="dropdown-menu" role="menu">
<li>
<a href="#" data-request="package-available" data-available="%NAME%" data-toggle="modal" data-target="#installModal">
<i class='fa fa-list fa-fw'></i> {{ __('page.extend.button.link-versions') }}
</a>
</li>
<li>
<a href="%MARKETPLACE_URL%" target="_blank">
<i class="fa fa-cart-plus fa-fw"></i> {{ __('page.extend.button.link-marketplace') }}
</a>
</li>
<li>
<a href="%REPOSITORY_URL%" target="_blank">
<i class="fa fa-file-code-o fa-fw"></i> {{ __('page.extend.button.link-repository') }}
</a>
</li>
<li class="divider"></li>
<li>
<a data-request="uninstall-package" class="clickspinner" href="%BASEURL%uninstall?package=%NAME%">
<i class="fa fa-trash-o fa-fw"></i> {{ __('page.extend.button.link-uninstall') }}
</a>
</li>
</ul>
</div>
{% endset %}



{#
# Contains the README
#}
Expand Down Expand Up @@ -150,21 +189,22 @@
</div>
{% endset %}

{{ data('extend.packages.empty', package_empty|trim) }}
{{ data('extend.packages.item', package_item|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.description', package_description|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.versions', package_versions|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.author', package_author|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.authors', package_authors|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.keyword', package_keyword|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.keywords', package_keywords|trim|preg_replace('/>\\s+</', '><')) }}

{{ data('extend.packages.manage_dropdown', package_manage_dropdown|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.left_buttons', package_left_buttons|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.theme_button', package_theme_button|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.config_button', package_config_button|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.readme_button', package_readme_button|trim|preg_replace('/>\\s+</', '><')) }}

{{ data('extend.packages.install_new', package_install_new|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.install_update', package_install_update|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.error', package_error|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.empty', package_empty|trim) }}
{{ data('extend.packages.item', package_item|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.description', package_description|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.versions', package_versions|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.author', package_author|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.authors', package_authors|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.keyword', package_keyword|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.keywords', package_keywords|trim|preg_replace('/>\\s+</', '><')) }}

{{ data('extend.packages.manage_dropdown_installed', package_manage_dropdown_installed|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.manage_dropdown_uninstalled', package_manage_dropdown_uninstalled|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.left_buttons', package_left_buttons|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.theme_button', package_theme_button|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.config_button', package_config_button|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.readme_button', package_readme_button|trim|preg_replace('/>\\s+</', '><')) }}

{{ data('extend.packages.install_new', package_install_new|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.install_update', package_install_update|trim|preg_replace('/>\\s+</', '><')) }}
{{ data('extend.packages.error', package_error|trim|preg_replace('/>\\s+</', '><')) }}