Skip to content

Commit 655d251

Browse files
author
Leonix
committed
Webasyst Framework v.2.3.4
* Fixed displaying of plugin listings in various apps when user interface mode 2.0 is selected. * Fixed icons in Settings app’s menu.
1 parent 2a07dac commit 655d251

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

wa-apps/installer/lib/classes/installerItemsAction.class.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ public function execute()
4141
$this->store_path = $this->buildStorePath($params);
4242

4343
// Set ui version from current app
44-
waRequest::setParam('force_ui_version', wa()->whichUI($slug));
44+
// For system plugins get UI from request param with 1.3 as default
45+
$ui = (strpos($slug, 'wa-plugins/') === 0) ? waRequest::get('ui', '1.3', waRequest::TYPE_STRING_TRIM) : wa()->whichUI($slug);
46+
waRequest::setParam('force_ui_version', $ui);
4547
}
4648

4749
public function display($clear_assign = true)

wa-apps/installer/lib/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
'description' => 'Install new apps from the Webasyst Store',
55
'icon' => 'img/installer.svg',
66
'mobile' => false,
7-
'version' => '2.3.3',
8-
'critical' => '2.3.3',
7+
'version' => '2.3.4',
8+
'critical' => '2.3.4',
99
'system' => true,
1010
'vendor' => 'webasyst',
1111
'csrf' => true,

wa-content/css/wa-settings/legacy/settings.css

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -349,54 +349,54 @@ table.zebra tr.selected .s-single-line:after {
349349
background-position: center;
350350
}
351351
.icon16.ws.general {
352-
background-image: url("../../img/wa-settings/ws-general.svg");
352+
background-image: url("../../../img/wa-settings/ws-general.svg");
353353
}
354354
.icon16.ws.email {
355-
background-image: url("../../img/wa-settings/ws-email.svg");
355+
background-image: url("../../../img/wa-settings/ws-email.svg");
356356
}
357357
.icon16.ws.maps {
358-
background-image: url("../../img/wa-settings/ws-map.svg");
358+
background-image: url("../../../img/wa-settings/ws-map.svg");
359359
}
360360
.icon16.ws.captcha {
361-
background-image: url("../../img/wa-settings/ws-lock.svg");
361+
background-image: url("../../../img/wa-settings/ws-lock.svg");
362362
}
363363
.icon16.ws.sms {
364-
background-image: url("../../img/wa-settings/ws-sms.svg");
364+
background-image: url("../../../img/wa-settings/ws-sms.svg");
365365
}
366366
.icon16.ws.auth {
367-
background-image: url("../../img/wa-settings/ws-key.svg");
367+
background-image: url("../../../img/wa-settings/ws-key.svg");
368368
}
369369
.icon16.ws.email-template,
370370
.icon16.ws.sms-template {
371-
background-image: url("../../img/wa-settings/ws-template.svg");
371+
background-image: url("../../../img/wa-settings/ws-template.svg");
372372
}
373373
.icon16.ws.db {
374-
background-image: url("../../img/wa-settings/ws-db.svg");
374+
background-image: url("../../../img/wa-settings/ws-db.svg");
375375
}
376376
.s-error-message-wrapper {
377377
color: #f00;
378378
margin-top: 6px;
379379
}
380380
.icon16.ws.field {
381-
background-image: url("../../img/wa-settings/ws-fields.svg");
381+
background-image: url("../../../img/wa-settings/ws-fields.svg");
382382
background-size: contain;
383383
background-position: center;
384384
}
385385
.icon16.ws.regions {
386-
background-image: url("../../img/wa-settings/ws-regions.svg");
386+
background-image: url("../../../img/wa-settings/ws-regions.svg");
387387
background-size: contain;
388388
background-position: center;
389389
}
390390
.icon16.ws.push {
391-
background-image: url("../../img/wa-settings/ws-push.svg");
391+
background-image: url("../../../img/wa-settings/ws-push.svg");
392392
background-size: contain;
393393
background-position: center;
394394
}
395395
.icon16.ws.waid {
396-
background-image: url("../../img/wa-settings/ws-waid.svg");
396+
background-image: url("../../../img/wa-settings/ws-waid.svg");
397397
}
398398
.icon16.ws.waid-green {
399-
background-image: url("../../img/wa-settings/ws-waid-green.svg");
399+
background-image: url("../../../img/wa-settings/ws-waid-green.svg");
400400
}
401401
.s-email-settings-page .s-settings-items .s-item:hover > .s-remove {
402402
opacity: 0.6;

wa-content/css/wa/wa-2.0.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ input.state-caution, textarea.state-caution, select.state-caution, .wa-select.st
757757

758758
#wa-account { flex: 0 0 auto; display: flex; z-index: 1001; position: relative; transition: 0.2s; background: var(--background-color); }
759759
#wa-account .wa-header-logo { max-height: 4rem; max-width: 4rem; min-height: 4rem; min-width: 4rem; }
760-
#wa-account.wa-sidebar-logo .wa-header-logo { max-width: 100%; min-width: 100%; max-height: 100%; box-shadow: 0 5px 13px 0 rgba(0, 0, 0, 0.13), 0 10px 25px 0 rgba(40, 40, 80, 0.1); border-radius: 0.25rem; }
760+
#wa-account.wa-sidebar-logo .wa-header-logo { max-width: 100%; min-width: 100%; max-height: 100%; object-fit: cover; box-shadow: 0 5px 13px 0 rgba(0, 0, 0, 0.13), 0 10px 25px 0 rgba(40, 40, 80, 0.1); border-radius: 0.25rem; }
761761
#wa-account a { flex: 1; padding: 0; color: #fff; display: flex; min-width: 4rem; max-width: 8rem; height: 4rem; width: 100%; }
762762
#wa-account.wa-sidebar-logo a { width: calc(13rem - 2em); height: calc(13rem - 2em); max-width: calc(13rem - 2em); min-width: calc(13rem - 2em); }
763763
#wa-account a h3 { flex: 1; align-self: center; width:64px; text-align: center; font-size: 1.25rem; color: #fff; margin-top: 0; transition: all 300ms; min-width: 4rem; text-transform: uppercase; box-sizing: border-box; }

wa-system/webasyst/lib/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
return array(
44
'name' => 'Webasyst',
55
'prefix' => 'webasyst',
6-
'version' => '2.3.3',
7-
'critical' => '2.3.3',
6+
'version' => '2.3.4',
7+
'critical' => '2.3.4',
88
'vendor' => 'webasyst',
99
'csrf' => true,
1010
'header_items' => array(

0 commit comments

Comments
 (0)