Merge branch 'release/3.804.0'

VirtoCommerce · Apr 19, 2024 · 0ce48ed · 0ce48ed
2 parents 3a3fe11 + 01069ee
commit 0ce48ed
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.803.0</VersionPrefix>
+    <VersionPrefix>3.804.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.NotificationsModule.Web/Scripts/blades/notifications-journal.tpl.html b/src/VirtoCommerce.NotificationsModule.Web/Scripts/blades/notifications-journal.tpl.html
@@ -1,11 +1,10 @@
 <div class="blade-static">
     <div class="form-group">
         <div class="form-input __search">
-            <input placeholder="{{'platform.placeholders.search-keyword' | translate}}" ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" style="width: 85%" />
+            <input placeholder="{{'platform.placeholders.search-keyword' | translate}}" ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" />
             <button class="btn __other" style="position: relative;right: 45px;">
                 <i class="btn-ico fa fa-times-circle" title="Clear" ng-click="filter.keyword=null;filter.criteriaChanged()"></i>
             </button>
-            <p class="form-count">{{'platform.list.count' | translate}}: <span class="count">{{pageSettings.totalItems}}</span></p>
         </div>
     </div>
 </div>

diff --git a/src/VirtoCommerce.NotificationsModule.Web/Scripts/blades/notifications-list.tpl.html b/src/VirtoCommerce.NotificationsModule.Web/Scripts/blades/notifications-list.tpl.html
@@ -1,11 +1,10 @@
 <div class="blade-static">
     <div class="form-group">
         <div class="form-input __search">
-            <input placeholder="{{'platform.placeholders.search-keyword' | translate}}" ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" style="width: 85%" />
+            <input placeholder="{{'platform.placeholders.search-keyword' | translate}}" ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" />
             <button class="btn __other" style="position: relative;right: 45px;">
                 <i class="btn-ico fa fa-times-circle" title="Clear" ng-click="filter.keyword=null;filter.criteriaChanged()"></i>
             </button>
-            <p class="form-count">{{'platform.list.count' | translate}}: <span class="count">{{pageSettings.totalItems}}</span></p>
         </div>
     </div>
 </div>

diff --git a/src/VirtoCommerce.NotificationsModule.Web/Scripts/directives/itemSearch.tpl.html b/src/VirtoCommerce.NotificationsModule.Web/Scripts/directives/itemSearch.tpl.html
@@ -6,7 +6,7 @@
         </li>
     </ul>
     <div class="form-input" style="margin-left: 100px;">
-        <input ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" style="width: calc(100% - 80px);" placeholder="{{'platform.placeholders.search-keyword' | translate}}">
+        <input ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" placeholder="{{'platform.placeholders.search-keyword' | translate}}">
         <button class="btn __other" style="position: relative;right: 45px;" ng-click="filter.current=null;filter.change()">
             <i class="btn-ico fa fa-remove" title="Clear"></i>
         </button>

diff --git a/src/VirtoCommerce.NotificationsModule.Web/module.manifest b/src/VirtoCommerce.NotificationsModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Notifications</id>
-  <version>3.803.0</version>
+  <version>3.804.0</version>
   <version-tag />
   <platformVersion>3.800.0</platformVersion>
   <dependencies>