Merge branch '25_2' into issue-1702_25_2

Author: sjbur

apps/demos/Demos/Scheduler/Adaptability/Angular/app/app.component.html

@@ -9,12 +9,13 @@
   [startDayHour]="9"
   [height]="590"
 >
-  <dxi-resource
+  <dxi-scheduler-resource
     fieldExpr="priorityId"
     label="Priority"
     [dataSource]="priorities"
+    icon="tags"
   >
-  </dxi-resource>
+  </dxi-scheduler-resource>
 </dx-scheduler>
 <dx-speed-dial-action
   #speedDialAction

apps/demos/Demos/Scheduler/Adaptability/React/App.tsx

@@ -33,6 +33,7 @@ const App = () => {
           dataSource={priorities}
           fieldExpr="priorityId"
           label="Priority"
+          icon="tags"
         />
       </Scheduler>
       <SpeedDialAction

apps/demos/Demos/Scheduler/Adaptability/ReactJs/App.js

@@ -29,6 +29,7 @@ const App = () => {
           dataSource={priorities}
           fieldExpr="priorityId"
           label="Priority"
+          icon="tags"
         />
       </Scheduler>
       <SpeedDialAction

apps/demos/Demos/Scheduler/Adaptability/Vue/App.vue

@@ -16,6 +16,7 @@
         :data-source="priorities"
         field-expr="priorityId"
         label="Priority"
+        icon="tags"
       />
     </DxScheduler>
     <DxSpeedDialAction

apps/demos/Demos/Scheduler/Adaptability/jQuery/index.js

@@ -12,6 +12,7 @@ $(() => {
       fieldExpr: 'priorityId',
       dataSource: priorities,
       label: 'Priority',
+      icon: 'tags',
     }],
   }).dxScheduler('instance');
 

apps/demos/Demos/Scheduler/Agenda/Angular/app/app.component.html

@@ -7,18 +7,20 @@
   [startDayHour]="9"
   [height]="600"
 >
-  <dxi-resource
+  <dxi-scheduler-resource
     fieldExpr="assigneeId"
     label="Assignee"
     [allowMultiple]="true"
     [dataSource]="assignees"
     [useColorAsDefault]="true"
+    icon="user"
   >
-  </dxi-resource>
-  <dxi-resource
+  </dxi-scheduler-resource>
+  <dxi-scheduler-resource
     fieldExpr="priorityId"
     label="Priority"
     [dataSource]="priorities"
+    icon="tags"
   >
-  </dxi-resource>
+  </dxi-scheduler-resource>
 </dx-scheduler>

apps/demos/Demos/Scheduler/Agenda/React/App.tsx

@@ -25,11 +25,13 @@ const App = () => (
       fieldExpr="assigneeId"
       label="Assignee"
       useColorAsDefault={true}
+      icon="user"
     />
     <Resource
       dataSource={priorities}
       fieldExpr="priorityId"
       label="Priority"
+      icon="tags"
     />
   </Scheduler>
 );

apps/demos/Demos/Scheduler/Agenda/ReactJs/App.js

@@ -25,11 +25,13 @@ const App = () => (
       fieldExpr="assigneeId"
       label="Assignee"
       useColorAsDefault={true}
+      icon="user"
     />
     <Resource
       dataSource={priorities}
       fieldExpr="priorityId"
       label="Priority"
+      icon="tags"
     />
   </Scheduler>
 );

apps/demos/Demos/Scheduler/Agenda/Vue/App.vue

@@ -14,11 +14,13 @@
       :allow-multiple="true"
       field-expr="assigneeId"
       label="Assignee"
+      icon="user"
     />
     <DxResource
       :data-source="priorities"
       field-expr="priorityId"
       label="Priority"
+      icon="tags"
     />
   </DxScheduler>
 </template>

apps/demos/Demos/Scheduler/Agenda/jQuery/index.js

@@ -16,10 +16,12 @@ $(() => {
         dataSource: assignees,
         label: 'Assignee',
         useColorAsDefault: true,
+        icon: 'user',
       }, {
         fieldExpr: 'priorityId',
         dataSource: priorities,
         label: 'Priority',
+        icon: 'tags',
       }],
     height: 600,
   });