Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2020-06-08 02:46:56 +0300
committerGitHub <noreply@github.com>2020-06-08 02:46:56 +0300
commitd0aaab95f1ef6d8b748b0e8d54f811a366864249 (patch)
tree86820438b4b56c764912316ebe8152362aa3e2dd /plugins/CorePluginsAdmin
parentd10c4e89dc5d1081a3755497c45d366b470eeec7 (diff)
Switch from bower to npm and update JS libraries (#14082)
* Starting to replace bower with npm: use updated jquery-ui from npm. * Use jquery from npm./ * Use angular from npm. * Add more angular libraries. * Use chroma-js from npm. * Remove html5shiv, does not appear to be used. * Use iframe resizer library from npm. * Add jquery-mousewheel * Add jquery.dotdotdot from npm. * Get jquery.scrollto from npm. * Get jscrollpane from npm. * Get materialize-css from npm. * Get mousetrap from npm. * Remove ngDialog, as it is no longer used. * Install qrcode.js from npm. * Get sprintf-js from npm. * Get visibillityjs from npm. * Remove bower.json. * Getting parts of matomo to work w/ new versions of libraries installed by npm. * Ignore node_modules subfolders in node_modules since we only use npm for frontend dependencies + fix a test. * Fix button padding. * Fix series picker checkboxes. * Fix karma conf. * Fix CSS in right place. * Fixing more css/less issues. * More test fixes. * Limit selection style fix. * Fix more tests + materializecss issues. * Fix a couple more tests. * Fix annotation styling. * remove error * add ng-dialog files * try to fix some tests * Fix several UI tests. * fixing more build issues * Fix several more tests and issues. * fixing more tests * split ui tests into 3 groups * fix several more issues and tests * Fix some console warnings on chrome. * Updating more test files. * fix some tests * yet more fixes * couple more fixes * another form fix * Fix some tests. * update screenshot * update more expected files * Fix two more form issues. * test commit (travis is not fetching submodules for some reason...) * remove scripts removed in merge * three travis builds * split UIIntegrationTest into multiple suites * lets try this again * updae several expected screenshots * fix some more tests * fix plugin details material select and tabs initiaialization * update screenshots + css fix * re-initialize materialize tabs since we load jquery-ui afterwards for datepicker which unsets materialize tabs * update more screenshots and fix couple more issues * update more screenshots + tweak to test * more fixes and screenshot updates * fix some issues and update more screenshots * update submodules * more fixes + more updated screenshots * more css fixes and test fixes * couple fixes & updated screenshots * update screenshots * fix random failure * Map old bower_component files to new ones in AssetManager. * Remove node_modules from PR and ignore node_modules in .gitignore and remove libs/jquery (adding new required libs). * Update .travis.yml. * update screenshots * fixing some more issues * fix copy pasta * update screenshots * fix more modal issues * Update css & screenshots. * correct close modal calls * fixing more issues * data-target instead of data-activates * fix more tests * trigger build that works? * fix more tests * update submodule * debugging travis * more debugging * try to fix test * fix modal no button click in test * update more screenshots * couple more test fixes * some more fixes and updated screenshots * update screenshots * apply some review feedback * Fix modal centering and initial top position. * apply some more pr feedback * another pr fix * update submodule * remove style * fix color of checkbox mark * Fix centering the popover Note: centering the popover relative to body doesn't work poperly anymore, maybe because of the fixed position of the widget overlay. Using the ui-widget-overlay to position the dialog centered seems to work * ignore line endings check for node modules * updates expected UI files * submodule updates * use minified file of jquery.browser.js * updates expected test files * ensure to hide parent tooltips when row action tooltips are shown * tweak less for datatable navigation * style is only useful for dashboard * update some screenshots * update submodules Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/CorePluginsAdmin')
-rw-r--r--plugins/CorePluginsAdmin/CorePluginsAdmin.php2
-rw-r--r--plugins/CorePluginsAdmin/angularjs/field/field.directive.js2
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html20
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html17
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html5
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html4
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html16
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html4
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-number.html2
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html24
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-select.html18
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html2
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-text.html24
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html2
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html16
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js12
-rw-r--r--plugins/CorePluginsAdmin/templates/macros.twig12
-rw-r--r--plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png4
-rw-r--r--plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png4
-rw-r--r--plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png4
20 files changed, 101 insertions, 93 deletions
diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
index 79485e0a39..4b9cb4ba19 100644
--- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php
+++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
@@ -64,7 +64,7 @@ class CorePluginsAdmin extends Plugin
public function getJsFiles(&$jsFiles)
{
- $jsFiles[] = "libs/bower_components/jQuery.dotdotdot/src/js/jquery.dotdotdot.min.js";
+ $jsFiles[] = "node_modules/jquery.dotdotdot/src/jquery.dotdotdot.min.js";
$jsFiles[] = "plugins/CoreHome/javascripts/popover.js";
}
diff --git a/plugins/CorePluginsAdmin/angularjs/field/field.directive.js b/plugins/CorePluginsAdmin/angularjs/field/field.directive.js
index 831dfe7906..28b5e98835 100644
--- a/plugins/CorePluginsAdmin/angularjs/field/field.directive.js
+++ b/plugins/CorePluginsAdmin/angularjs/field/field.directive.js
@@ -49,6 +49,7 @@
inlineHelp: '@',
disabled: '=',
uiControlAttributes: '=',
+ uiControlOptions: '=',
autocomplete: '@',
condition: '@',
varType: '@',
@@ -117,6 +118,7 @@
field.title = $scope.title;
field.uiControlAttributes = $scope.uiControlAttributes || {};
field.fullWidth = !!$scope.fullWidth;
+ field.uiControlOptions = $scope.uiControlOptions || {};
if (field.type === 'array' && angular.isString(field.value) && field.value) {
field.value = JSON.parse(field.value);
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html
index f50d98b507..eff2f55bad 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html
@@ -2,15 +2,17 @@
<label class="fieldRadioTitle" ng-show="formField.title">{{ formField.title }}</label>
<p ng-repeat="checkboxModel in formField.availableOptions"
class="checkbox">
- <input ng-model="formField.checkboxkeys[$index.toString()]"
- value="{{ checkboxModel.key }}"
- ng-change="formField.updateCheckboxArrayValue()"
- piwik-attributes="{{formField.uiControlAttributes}}"
- type="checkbox"
- id="{{ formField.name + checkboxModel.key }}"
- name="{{ checkboxModel.name }}">
+ <label>
+ <input ng-model="formField.checkboxkeys[$index.toString()]"
+ value="{{ checkboxModel.key }}"
+ ng-change="formField.updateCheckboxArrayValue()"
+ piwik-attributes="{{formField.uiControlAttributes}}"
+ type="checkbox"
+ id="{{ formField.name + checkboxModel.key }}"
+ name="{{ checkboxModel.name }}">
+ <span>{{ checkboxModel.value }}</span>
- <label for="{{ formField.name + checkboxModel.key }}">{{ checkboxModel.value }}
- <span class="form-description" ng-show="checkboxModel.description">{{ checkboxModel.description }}</span></label>
+ <span class="form-description" ng-show="checkboxModel.description">{{ checkboxModel.description }}</span>
+ </label>
</p>
</div> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html
index cc016afd67..9ea7d9904d 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html
@@ -1,10 +1,13 @@
<div class="checkbox">
- <input ng-model="formField.value"
- piwik-attributes="{{formField.uiControlAttributes}}"
- ng-value="1"
- type="checkbox"
- id="{{ formField.name }}"
- name="{{ formField.name }}">
+ <label>
+ <input ng-model="formField.value"
+ piwik-attributes="{{formField.uiControlAttributes}}"
+ ng-value="1"
+ ng-checked="!!formField.value"
+ type="checkbox"
+ id="{{ formField.name }}"
+ name="{{ formField.name }}">
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
+ <span ng-bind-html="formField.title"></span>
+ </label>
</div> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html
index 2854e8b134..d9f07888a5 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html
@@ -1,6 +1,7 @@
<div class="expandableSelector" piwik-focus-anywhere-but-here="formField.showSelect = false">
- <div ng-click="formField.showSelect = !formField.showSelect" class="select-wrapper"
- ><span class="caret">▼</span><input type="text" class="select-dropdown"
+ <div ng-click="formField.showSelect = !formField.showSelect" class="select-wrapper">
+ <svg class="caret" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M7 10l5 5 5-5z"></path><path d="M0 0h24v24H0z" fill="none"></path></svg>
+ <input type="text" class="select-dropdown"
readonly="true" value="{{ formField.title }}">
</div>
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html
index ba0b58ad10..8c0f0cf99b 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html
@@ -1,8 +1,8 @@
<div>
+ <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
<div matomo-field-array
- name="{{ formField.name }}"
+ name="formField.name"
ng-model="formField.value"
field="formField.uiControlAttributes.field">
</div>
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
</div> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html
index 72a0379f28..4f3a173b73 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html
@@ -1,9 +1,7 @@
-<div>
- <select multiple
- name="{{ formField.name }}"
- ng-model="formField.value"
- ng-options="t.key as t.value group by t.group for t in formField.availableOptions"
- piwik-attributes="{{formField.uiControlAttributes}}">
- </select>
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
-</div> \ No newline at end of file
+<select multiple
+ name="{{ formField.name }}"
+ ng-model="formField.value"
+ ng-options="t.key as t.value group by t.group for t in formField.availableOptions"
+ piwik-attributes="{{formField.uiControlAttributes}}">
+</select>
+<label for="{{ formField.name }}" ng-bind-html="formField.title"></label> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html
index ad99e5ffba..479fe43e8d 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html
@@ -1,11 +1,11 @@
<div>
+ <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
<div matomo-multi-pair-field
- name="{{ formField.name }}"
+ name="formField.name"
ng-model="formField.value"
field1="formField.uiControlAttributes.field1"
field2="formField.uiControlAttributes.field2"
field3="formField.uiControlAttributes.field3"
field4="formField.uiControlAttributes.field4">
</div>
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
</div> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html
index 35b837ba89..0b78edf002 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html
@@ -1,4 +1,5 @@
<div>
+ <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
<input
class="control_{{ formField.uiControl }}"
type="{{ formField.uiControl }}"
@@ -9,5 +10,4 @@
ng-value="formField.value"
piwik-attributes="{{formField.uiControlAttributes}}"
>
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
</div> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html
index 1363f4192a..13f93090a6 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html
@@ -3,15 +3,19 @@
<p ng-repeat="radioModel in formField.availableOptions"
class="radio">
- <input ng-model="formField.value"
- ng-value="radioModel.key"
- type="radio"
- id="{{ formField.name + radioModel.key }}"
- name="{{ formField.name }}"
- ng-disabled="radioModel.disabled || formField.disabled"
- piwik-attributes="{{formField.uiControlAttributes}}"
- >
- <label for="{{ formField.name + radioModel.key }}">{{ radioModel.value }}
- <span class="form-description" ng-show="radioModel.description">{{ radioModel.description }}</span></label>
+ <label>
+ <input ng-model="formField.value"
+ ng-value="radioModel.key"
+ type="radio"
+ id="{{ formField.name + radioModel.key }}"
+ name="{{ formField.name }}"
+ ng-disabled="radioModel.disabled || formField.disabled"
+ piwik-attributes="{{formField.uiControlAttributes}}"
+ >
+
+ <span>{{ radioModel.value }}
+ <span class="form-description" ng-show="radioModel.description">{{ radioModel.description }}</span>
+ </span>
+ </label>
</p>
</div> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html
index 36bedbdc25..41a9a34cfb 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html
@@ -1,10 +1,8 @@
-<div>
- <select name="{{ formField.name }}"
- ng-model="formField.value"
- ng-options="t.key as t.value group by t.group disable when t.disabled for t in formField.availableOptions"
- piwik-attributes="{{formField.uiControlAttributes}}"
- ng-click="onShowSelect()"
- >
- </select>
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
-</div>
+<select name="{{ formField.name }}"
+ ng-model="formField.value"
+ ng-options="t.key as t.value group by t.group disable when t.disabled for t in formField.availableOptions"
+ piwik-attributes="{{formField.uiControlAttributes}}"
+ ng-click="onShowSelect()"
+>
+</select>
+<label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html
index 1ce85a2fc6..2a127da5cf 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html
@@ -1,4 +1,5 @@
<div>
+ <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
<input class="control_{{ formField.uiControl }}"
type="{{ formField.uiControl }}"
name="{{ formField.name }}"
@@ -6,5 +7,4 @@
ng-model="formField.value"
piwik-attributes="{{formField.uiControlAttributes}}"
>
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
</div> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-text.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-text.html
index abb5e70b5f..34076620d7 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-text.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-text.html
@@ -1,13 +1,11 @@
-<div>
- <input
- class="control_{{ formField.uiControl }}"
- type="{{ formField.uiControl }}"
- id="{{ formField.name }}"
- name="{{ formField.name }}"
- ng-model="formField.value"
- ng-value="formField.value"
- ng-trim="false"
- piwik-attributes="{{formField.uiControlAttributes}}"
- >
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
-</div> \ No newline at end of file
+<input
+ class="control_{{ formField.uiControl }}"
+ type="{{ formField.uiControl }}"
+ id="{{ formField.name }}"
+ name="{{ formField.name }}"
+ ng-model="formField.value"
+ ng-value="formField.value"
+ ng-trim="false"
+ piwik-attributes="{{formField.uiControlAttributes}}"
+>
+<label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html
index 85b1df3564..f65c49cc26 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html
@@ -1,9 +1,9 @@
<div>
+ <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
<textarea name="{{ formField.name }}"
ng-list="&#10;" ng-trim="false"
piwik-attributes="{{formField.uiControlAttributes}}"
ng-model="formField.value"
class="materialize-textarea"
></textarea>
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
</div> \ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html
index a52d05cb72..97d0b27482 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html
@@ -1,9 +1,7 @@
-<div>
- <textarea name="{{ formField.name }}"
- piwik-attributes="{{formField.uiControlAttributes}}"
- id="{{ formField.name }}"
- ng-model="formField.value"
- class="materialize-textarea"
- ></textarea>
- <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
-</div> \ No newline at end of file
+<textarea name="{{ formField.name }}"
+ piwik-attributes="{{formField.uiControlAttributes}}"
+ id="{{ formField.name }}"
+ ng-model="formField.value"
+ class="materialize-textarea"
+></textarea>
+<label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
index baaef33793..53d2fdb5c1 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
@@ -16,8 +16,8 @@
function piwikFormField(piwik, $timeout){
- function initMaterialSelect($select, placeholder) {
- $select.material_select();
+ function initMaterialSelect($select, placeholder, uiControlOptions) {
+ $select.material_select(uiControlOptions || {});
// to prevent overlapping selects, when a select is opened, we set the z-index to a high value on focus & remove z-index for all others
// NOTE: we can't remove it directly blur since the blur causes the select to overlap, aborting the select click. (a timeout is used
@@ -97,12 +97,12 @@
if (isSelectControl(field)) {
var $select = element.find('select');
- initMaterialSelect($select, field.uiControlAttributes.placeholder);
+ initMaterialSelect($select, field.uiControlAttributes.placeholder, field.uiControlOptions);
scope.$watch('formField.value', function (val, oldVal) {
if (val !== oldVal) {
$timeout(function () {
- initMaterialSelect($select, field.uiControlAttributes.placeholder);
+ initMaterialSelect($select, field.uiControlAttributes.placeholder, field.uiControlOptions);
});
}
});
@@ -110,7 +110,7 @@
scope.$watch('formField.uiControlAttributes.disabled', function (val, oldVal) {
if (val !== oldVal) {
$timeout(function () {
- initMaterialSelect($select, field.uiControlAttributes.placeholder);
+ initMaterialSelect($select, field.uiControlAttributes.placeholder, field.uiControlOptions);
});
}
});
@@ -427,7 +427,7 @@
if (isSelectControl(scope.formField)) {
$timeout(function () {
- initMaterialSelect(element.find('select'), field.uiControlAttributes.placeholder);
+ initMaterialSelect(element.find('select'), field.uiControlAttributes.placeholder, field.uiControlOptions);
});
}
}
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index eb126d5c2a..a0f5b823f0 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -10,8 +10,10 @@
<tr>
<th>
<span class="checkbox-container">
- <input type="checkbox" id="select-plugin-all"/>
- <label for="select-plugin-all"></label>
+ <label>
+ <input type="checkbox" id="select-plugin-all"/>
+ <span></span>
+ </label>
</span>
</th>
<th>{{ 'General_Plugin'|translate }}</th>
@@ -26,8 +28,10 @@
<tr {% if plugin.isActivated|default(false) %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %}>
<td class="select-cell">
<span class="checkbox-container">
- <input type="checkbox" id="select-plugin-{{ plugin.name|e('html_attr') }}" {% if plugin.isDownloadable is defined and not plugin.isDownloadable %}disabled="disabled"{% endif %} />
- <label for="select-plugin-{{ plugin.name|e('html_attr') }}"></label>
+ <label>
+ <input type="checkbox" id="select-plugin-{{ plugin.name|e('html_attr') }}" {% if plugin.isDownloadable is defined and not plugin.isDownloadable %}disabled="disabled"{% endif %} />
+ <span></span>
+ </label>
</span>
</td>
<td class="name">
diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png
index 32e832f0bc..17f24b05a9 100644
--- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png
+++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:568588e5e4da2a51a85748f5495f5be71ff712add0d124ee40e3e542d6365ed5
-size 147755
+oid sha256:1af12916176d3d4ec44a97b0448317886648dd6976f876349c4c57cd758562f0
+size 147407
diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png
index 09fb6d4139..4098ece3a8 100644
--- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png
+++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:198c480032c825f2d452e850e1336c39eccf7177fa24d8a527e345459ac64155
-size 201819
+oid sha256:dc917144d507a45516c885dc33574d49a894512951cb5dc95a9265bdb7edd0b2
+size 200995
diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png
index e3ce69944e..3ac8e7f412 100644
--- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png
+++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1bbaa38c298e5238c2b53a4f5734e71f995630cd1549c5743c213ca3b5f55e92
-size 193535
+oid sha256:c3161a60454e12c1d9af3f76ab42f31a0978b320fb537e7bb7831376a03289cc
+size 193314