← All changes | src/View/GroupSelectionForm.php +30 -45 trunk → 2.3.15 View file →

		@@ -12,9 +12,9 @@
12	12	* @version SVN: $id$
13	13	* @link http://wordpress.org/extend/plugins/user-access-manager/
14	14	*/
15	15
16		-use UserAccessManager\Controller\Backend\ObjectMembership\ObjectController;
	16	+use UserAccessManager\Controller\Backend\ObjectController;
17	17	use UserAccessManager\Object\ObjectHandler;
18	18	use UserAccessManager\UserGroup\AssignmentInformation;
19	19	use UserAccessManager\UserGroup\DynamicUserGroup;
20	20	use UserAccessManager\UserGroup\UserGroup;
		@@ -73,16 +73,11 @@
73	73	name="<?php echo $groupsFormName; ?>[<?php echo $userGroup->getId(); ?>][id]"/>
74	74	<label for="<?php echo $groupsFormName; ?>-<?php echo $userGroup->getId(); ?>" class="selectit"
75	75	style="display:inline;">
76	76	<?php echo htmlentities($userGroup->getName()) . ($isLockedRecursive === true ? ' [LR]' : ''); ?>
	77	+ <span class="uam_group_info_link">(<?php echo TXT_UAM_INFO; ?>)</span>
	78	+ <?php include 'GroupInfo.php'; ?>
77	79	</label>
78		- <span class="uam_flyout">
79		- <button type="button"
80		- class="uam_group_info_link uam_flyout_toggle button-link"
81		- aria-expanded="false"
82		- aria-haspopup="true"><?php echo TXT_UAM_INFO; ?></button>
83		- <?php include 'GroupInfo.php'; ?>
84		- </span>
85	80	<?php
86	81	$dateText = TXT_UAM_GROUP_ASSIGNMENT_TIME;
87	82
88	83	if ($fromDate !== null) {
		@@ -96,41 +91,39 @@
96	91
97	92	if ($isLockedRecursive === false) {
98	93	$formPrefix = $groupsFormName . '-' . $userGroup->getId();
99	94	?>
100		- <span class="uam_flyout">
101		- <button type="button"
102		- class="uam_group_date uam_flyout_toggle button-link"
103		- aria-expanded="false"
104		- aria-haspopup="true"
105		- data-empty-label="<?php echo htmlentities(TXT_UAM_GROUP_ASSIGNMENT_TIME); ?>"
106		- aria-controls="<?php echo $formPrefix; ?>-date-form"><?php echo $dateText; ?></button>
107		- <div class="uam_group_date_form uam_flyout_panel" id="<?php echo $formPrefix; ?>-date-form">
	95	+ <span class="uam_group_date"><?php echo $dateText; ?></span>
	96	+ <div class="uam_group_date_form">
108	97	<div>
109		- <label class="uam_date_label" for="<?php echo $formPrefix; ?>-fromDate">
	98	+ <label class="uam_date_label" for="<?php echo $formPrefix; ?>-fromDate-date">
110	99	<?php echo TXT_UAM_GROUP_FROM_DATE; ?>
111	100	</label>
112		- <input type="datetime-local"
113		- id="<?php echo $formPrefix; ?>-fromDate"
114		- name="<?php echo "{$groupsFormName}[{$userGroup->getId()}][fromDate]"; ?>"
115		- value="<?php echo $dateUtil->formatDateForDatetimeInput($fromDate); ?>"/>
	101	+ <input type="date"
	102	+ id="<?php echo $formPrefix ?>-fromDate-date"
	103	+ name="<?php echo "{$groupsFormName}[{$userGroup->getId()}][fromDate][date]"; ?>"
	104	+ value="<?php echo $dateUtil->formatDateForDateInput($fromDate); ?>"/>
	105	+ <label for="<?php echo $formPrefix; ?>-fromDate-time">@</label>
	106	+ <input type="time"
	107	+ id="<?php echo $formPrefix; ?>-fromDate-time"
	108	+ name="<?php echo "{$groupsFormName}[{$userGroup->getId()}][fromDate][time]"; ?>"
	109	+ value="<?php echo $dateUtil->formatDateForTimeInput($fromDate); ?>"/>
116	110	</div>
117	111	<div>
118		- <label class="uam_date_label" for="<?php echo $formPrefix; ?>-toDate">
	112	+ <label class="uam_date_label" for="<?php echo $formPrefix; ?>-toDate-date">
119	113	<?php echo TXT_UAM_GROUP_TO_DATE; ?>
120	114	</label>
121		- <input type="datetime-local"
122		- id="<?php echo $formPrefix; ?>-toDate"
123		- name="<?php echo "{$groupsFormName}[{$userGroup->getId()}][toDate]"; ?>"
124		- value="<?php echo $dateUtil->formatDateForDatetimeInput($toDate); ?>"/>
	115	+ <input type="date"
	116	+ id="<?php echo $formPrefix ?>-toDate-date"
	117	+ name="<?php echo "{$groupsFormName}[{$userGroup->getId()}][toDate][date]"; ?>"
	118	+ value="<?php echo $dateUtil->formatDateForDateInput($toDate); ?>"/>
	119	+ <label for="<?php echo $formPrefix; ?>-toDate-time">@</label>
	120	+ <input type="time"
	121	+ id="<?php echo $formPrefix; ?>-toDate-time"
	122	+ name="<?php echo "{$groupsFormName}[{$userGroup->getId()}][toDate][time]"; ?>"
	123	+ value="<?php echo $dateUtil->formatDateForTimeInput($toDate); ?>"/>
125	124	</div>
126		- <p class="uam_group_date_actions">
127		- <button type="button" class="uam_clear_dates button-link button-link-delete">
128		- <?php echo TXT_UAM_GROUP_REMOVE_ASSIGNMENT_TIME; ?>
129		- </button>
130		- </p>
131	125	</div>
132		- </span>
133	126	<?php
134	127	}
135	128	?>
136	129	</li>
		@@ -143,22 +136,14 @@
143	136	ObjectHandler::GENERAL_USER_OBJECT_TYPE
144	137	&& $controller->checkUserAccess() === true
145	138	) {
146	139	?>
147		- <div class="uam_dynamic_groups">
148		- <label for="uam_dynamic_groups"><?php echo TXT_UAM_ADD_DYNAMIC_GROUP; ?></label>
	140	+ <p>
	141	+ <span><label for="uam_dynamic_groups"><?php echo TXT_UAM_ADD_DYNAMIC_GROUP; ?></label></span>
149	142	<input id="uam_dynamic_groups"
150		- type="text"
	143	+ class="form-input-tip ui-autocomplete-input"
151	144	autocomplete="off"
152	145	value=""
153		- placeholder="<?php echo htmlentities(TXT_UAM_ADD_DYNAMIC_GROUP_PLACEHOLDER); ?>"
154		- aria-describedby="uam_dynamic_groups_description"
155		- data-date-label="<?php echo htmlentities(TXT_UAM_GROUP_ASSIGNMENT_TIME); ?>"
156		- data-from-label="<?php echo htmlentities(TXT_UAM_GROUP_FROM_DATE); ?>"
157		- data-to-label="<?php echo htmlentities(TXT_UAM_GROUP_TO_DATE); ?>"
158		- data-clear-label="<?php echo htmlentities(TXT_UAM_GROUP_REMOVE_ASSIGNMENT_TIME); ?>">
159		- <p class="description" id="uam_dynamic_groups_description">
160		- <?php echo TXT_UAM_ADD_DYNAMIC_GROUP_DESCRIPTION; ?>
161		- </p>
162		- </div>
	146	+ role="combobox">
	147	+ </p>
163	148	<?php
164	149	}