Merge 8b99153 into 67ec519

.distignore

@@ -1,29 +1,35 @@
 # A set of files and directories you probably don't want in your WordPress.org distribution
 
 # Files
+/*.sql
+/*.tar.gz
+/*.zip
 /.DS_Store
 /.coveralls.yml
 /.distignore
 /.editorconfig
+/.eslintrc.json
 /.gitignore
 /.phpcs.cache
+/.phpunit.result.cache
+/.postcss.config.js
 /CHANGELOG.md
+/Makefile
 /README.md
+/Thumbs.db
 /composer.json
 /composer.lock
-/Makefile
+/package.json
 /phpcs.xml
 /phpunit.xml
-/Thumbs.db
-/*.sql
-/*.tar.gz
-/*.zip
+/webpack.config.js
+/yarn.lock
 
 # Directories
 /.git
 /.github
 /.idea
 /.make
-/assets
-/src
+/.wordpress-org
+/src/js
 /tests

.github/workflows/ci.yml

@@ -36,11 +36,11 @@ jobs:
 
       - name: Run PHPUnit tests
         if: ${{ matrix.php-version != '7.4' }}
-        run: vendor/bin/phpunit --configuration tests/phpunit/phpunit.xml
+        run: vendor/bin/phpunit
 
       - name: Run PHPUnit tests with coverage
         if: ${{ matrix.php-version == '7.4' }}
-        run: vendor/bin/phpunit --configuration tests/phpunit/phpunit.xml --coverage-clover coverage.xml
+        run: vendor/bin/phpunit --coverage-clover coverage.xml
 
       - name: Run Coveralls for PHPUnit tests
         if: ${{ matrix.php-version == '7.4' }}
@@ -55,8 +55,6 @@ jobs:
           COVERALLS_RUN_LOCALLY: true
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         run: |
-          cd src
           yarn
           yarn run build:dev
           yarn run coveralls
-          cd ..

.gitignore

@@ -1,6 +1,6 @@
-build/
+assets/js/tables/
+assets/js/converter/
 coverage/
-dist/
 node_modules/
 tests/**/*.cache
 vendor/
@@ -13,6 +13,7 @@ vendor/
 .DS_Store
 .idea/
 .phpcs.cache
+.phpunit.result.cache
 Thumbs.db
 coverage.*
 wp-cli.local.yml

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.0.0 (18.03.2021)
+* Introduce tabs on options page
+* Add options to select post types and statuses for background conversion
+* Make colors compatible to WP official palette
+* Fix bug with Polylang when locale is not equal to language slug
+
 ## 4.6.4 (03.03.2021)
 * Tested up to WordPress 5.7
 

Makefile

@@ -49,11 +49,11 @@ composer-install-prod:
 
 yarn-install:
 	$(info Installing Yarn dependencies)
-	@cd src; yarn; yarn run build:dev; cd ..
+	@yarn; yarn run build:dev
 
 yarn-install-prod:
 	$(info Installing Yarn dependencies)
-	@cd src; yarn; yarn run build:prod; cd ..
+	@yarn; yarn run build:prod
 
 
 # Scope

assets/css/converter.css

@@ -0,0 +1,74 @@
+#ctl-confirm-popup {
+	display: none;
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	background: rgba(241,241,241,0.8);
+	z-index: 9999;
+}
+
+#ctl-confirm-content {
+	display: block;
+	position: fixed;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	background: #fff;
+	padding: 20px;
+}
+
+.helper {
+	position: relative;
+	float: left;
+	left: -1.7em;
+	top: 0.4em;
+}
+
+.helper-content {
+	position: absolute;
+	display: none;
+	line-height: 1.5em;
+	top: 50%;
+	left: 50%;
+	transform: translate(calc(-50% + 5px), 26px);
+	color: #fff;
+	font-size: .8em;
+	width: 150px;
+	background: #333;
+	text-align: center;
+	border-radius: 3px;
+	padding: .618em 1em;
+	box-shadow: 0 1px 3px rgba(0, 0, 0, .2);
+}
+
+.helper::after {
+	font-family: Dashicons;
+	font-size: 1.3em;
+	speak: none;
+	font-weight: 400;
+	text-transform: none;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	text-indent: 0;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	text-align: center;
+	content: "";
+	cursor: help;
+	font-variant: normal;
+	margin: 0;
+}
+
+.helper:hover .helper-content {
+	display: block;
+}
+
+#ctl-convert-button {
+	color: #d63638;
+	border-color: #d63638;
+}

assets/css/settings-base.css

@@ -0,0 +1,25 @@
+.ctl-settings-tabs {
+	line-height: 4.5em;
+	background: #fff;
+	margin: 10px -20px 0 -20px;
+	padding: 0 20px;
+}
+
+.ctl-settings-tab {
+	display: inline-block;
+	font-size: 1.1em;
+	text-decoration: none;
+	margin-right: 30px;
+	color: #646970;
+	border-bottom: 2px solid transparent;
+}
+
+.ctl-settings-tab:hover {
+	color: #666;
+	border-color: #646970;
+	border-bottom: 2px solid;
+}
+
+.ctl-settings-tab.active {
+	border-bottom: 2px solid #4f94d4;
+}

css/cyr-to-lat-admin.css → assets/css/tables.css

@@ -27,6 +27,7 @@
 	max-height: 34px;
 	height: 14px;
 	line-height: 14px;
+	margin-top: 15px;
 }
 
 #ctl-options .nav-tab-wrapper {
@@ -49,7 +50,7 @@ body.js #ctl-options .ctl-table {
 	clear: both;
 	width: 100%;
 	box-sizing: border-box;
-	border: 1px solid #ccc;
+	border: 1px solid #c3c4c7;
 }
 
 #ctl-options .submit, #ctl-convert-existing-slugs {
@@ -64,12 +65,16 @@ body.js #ctl-options .ctl-table {
 }
 
 #ctl-options .nav-tab-active {
-	background: #fff;
-	border-bottom: 1px solid #ccc;
+	background: #4f94d4;
+	color: #fff;
+	border-color: #2271b1;
 }
 
-.nav-tab-current {
-	box-shadow: 0 0 5px 5px #fff;
+#ctl-options .nav-tab-current.nav-tab-active {
+	/*box-shadow: 0 0 5px 5px #2271b1;*/
+	background: #2271b1;
+	color: #fff;
+	border-color: #0a4b78;
 }
 
 .ctl-table.active {
@@ -134,27 +139,7 @@ body.js #ctl-options .ctl-table {
 
 #appreciation {
 	clear: both;
-}
-
-#ctl-confirm-popup {
-	display: none;
-	position: fixed;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	background: rgba(241,241,241,0.8);
-	z-index: 9999;
-}
-
-#ctl-confirm-content {
-	display: block;
-	position: fixed;
-	left: 50%;
-	top: 50%;
-	transform: translate(-50%, -50%);
-	background: #fff;
-	padding: 20px;
+	padding-top: 10px;
 }
 
 @media screen and (max-width: 767px) {