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

Remove shop links from plugin details modal #22154

Merged
merged 10 commits into from
Apr 29, 2024
Merged

Remove shop links from plugin details modal #22154

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3ea9a0d
Remove shop links from plugin details modal
mneudert Apr 22, 2024
209d816
Tweak whitespace usage
mneudert Apr 26, 2024
00e237c
Add silver lining to metadata
mneudert Apr 26, 2024
715ad8e
Extend silver lining to content
mneudert Apr 26, 2024
5bf9cf3
Prevent metadata overflow when words are long and don't have natural …
michalkleiner Apr 29, 2024
b0224a9
Display vertical break only when there's a CTA button or a special of…
michalkleiner Apr 29, 2024
6e02b6f
Show right-aligned images in plugin content readme at 48% width to av…
michalkleiner Apr 29, 2024
9cc0963
Completely remove whitespace above old plugin details metadata
mneudert Apr 29, 2024
77edd6e
Override inconsistent marketplace "*-div-readme" styling
mneudert Apr 29, 2024
06c75e0
Update expected screenshots
mneudert Apr 29, 2024
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
1 change: 0 additions & 1 deletion plugins/Marketplace/Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ public function pluginDetails()
$view->activeTab = $activeTab;
$view->isAutoUpdatePossible = SettingsPiwik::isAutoUpdatePossible();
$view->isAutoUpdateEnabled = SettingsPiwik::isAutoUpdateEnabled();
$view->numUsers = $this->environment->getNumUsers();

return $view->render();
}
Expand Down
31 changes: 30 additions & 1 deletion plugins/Marketplace/stylesheets/plugin-details.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,25 @@
}

#pluginDetailsTabs {
border-right: 1px solid silver;
margin-top: 25px;
}

// some plugins receive inline style from the marketplace
// override them for consistency
mneudert marked this conversation as resolved.
Show resolved Hide resolved
.main-div-readme {
display: flex;
}

.left-div-readme {
width: 50%;
}

.right-div-readme {
flex-grow: initial;
width: 48%;
}

.contentDetails p {
margin: 0 0 10px;
}
Expand All @@ -54,6 +70,17 @@
padding-right: 25px;
}

.metadata {
padding-left: 0.75rem;

// -1px to force overlapping border overlapping with content
margin-left: calc(~"0.75rem - 1px");
border-left: 1px solid silver;

// prevent text overflow
word-break: break-word;
}

.variationPicker {
margin-top: 0;
margin-bottom: 15px;
Expand All @@ -69,6 +96,7 @@
.download,
.install {
padding: 11px 19px;
margin-bottom: 20px;
font-size: 17.5px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
Expand Down Expand Up @@ -318,7 +346,8 @@
}

.right-div-readme {
flex-grow: 1; width: 50%;
flex-grow: 1;
width: 50%;
}

.plugin-metadata-part2 {
Expand Down
62 changes: 8 additions & 54 deletions plugins/Marketplace/templates/plugin-details.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,42 +110,12 @@
<div class="metadata">
<div class="actionButton">
{% if not plugin.isDownloadable or not isSuperUser %}
{% if hasSomeAdminAccess and plugin.hasExceededLicense is defined and plugin.hasExceededLicense and plugin.consumer %}
{% if plugin.consumer.loginUrl is defined and plugin.consumer.loginUrl %}
<a class="install update"
target="_blank"
rel="noreferrer noopener"
href="{{ plugin.consumer.loginUrl|default('')|e('html_attr') }}"
>{{ 'Marketplace_UpgradeSubscription'|translate }}</a>
{% endif %}

{% elseif not plugin.isDownloadable and plugin.isPaid and plugin.shop is defined and plugin.shop %}

{% if plugin.shop.variations|length %}

<h4 style="color:#5bb75b;font-weight: bold;font-size: 1.2em;">{{ 'Marketplace_TryFreeTrialTitle'|translate }}</h4>
<div class="input-field variationPicker">
<select title="{{ 'Marketplace_ShownPriceIsExclTax'|translate|e('html_attr') }} {{ 'Marketplace_CurrentNumPiwikUsers'|translate(numUsers)|e('html_attr') }}">
{% for variation in plugin.shop.variations %}
<option value="{{ variation.addToCartUrl }}"
title="{{ 'Marketplace_PriceExclTax'|translate(variation.price, variation.currency)|e('html_attr') }} {{ 'Marketplace_CurrentNumPiwikUsers'|translate(numUsers)|e('html_attr') }}"
{% if variation.recommended is defined and variation.recommended %}selected{% endif %}
>{{ variation.name }} - {{ variation.prettyPrice }} / {{ variation.period }}</option>
{% endfor %}
</select>
</div>

<a class="install update addToCartLink" target="_blank"
title="{{ 'Marketplace_ClickToCompletePurchase'|translate|e('html_attr') }}"
rel="noreferrer noopener"
href="{{ plugin.shop.url|default('')|e('html_attr') }}"
>{{ 'Marketplace_AddToCart'|translate }}</a>
{% else %}
<a class="install update" target="_blank"
rel="noreferrer noopener"
href="{% if plugin.shop is defined and plugin.shop and plugin.shop.url %}{{ plugin.shop.url|e('html_attr') }}{% else %}{{ plugin.homepage|e('html_attr') }}{% endif %}"
>{{ 'General_MoreDetails'|translate }}</a>
{% endif %}
{% if hasSomeAdminAccess and plugin.hasExceededLicense is defined and plugin.hasExceededLicense and plugin.consumer and plugin.consumer.loginUrl is defined and plugin.consumer.loginUrl %}
<a class="install update"
target="_blank"
rel="noreferrer noopener"
href="{{ plugin.consumer.loginUrl|default('')|e('html_attr') }}"
>{{ 'Marketplace_UpgradeSubscription'|translate }}</a>
{% endif %}
{% elseif isSuperUser %}
{% if not isAutoUpdatePossible %}
Expand All @@ -155,31 +125,15 @@
<a class="install update"
href="{{ linkTo({'module': 'Marketplace', 'action':'updatePlugin', 'pluginName': plugin.name, 'nonce': updateNonce}) }}"
>{{ 'CoreUpdater_UpdateTitle'|translate }}</a>
{% elseif plugin.isInstalled %}
<br />
<br />
<br />
<br />
{% elseif 0 < plugin.missingRequirements|length %}
<br />
<br />
<br />
<br />
{% else %}
{% elseif not plugin.isInstalled and 0 == plugin.missingRequirements|length %}
<a href="{{ linkTo({'module': 'Marketplace', 'action': 'installPlugin', 'pluginName': plugin.name, 'nonce': installNonce}) }}"
class="install">{{ 'Marketplace_ActionInstall'|translate }}</a>
{% endif %}
{% else %}
<br />
<br />
<br />
<br />
{% endif %}
</div>

{% if plugin.specialOffer is defined and plugin.specialOffer %}<p style="color: green;"><br />{{ plugin.specialOffer }}</p>{% endif %}
{% if plugin.specialOffer is defined and plugin.specialOffer %}<p style="color: green;">{{ plugin.specialOffer }}<br /><br /></p>{% endif %}

<p><br /></p>
<dl>
{% if not isBundle %}
<dt>{{ 'CorePluginsAdmin_Version'|translate }}</dt>
Expand Down
Loading