← All changes | src/View/AdminSetup.php +25 -23 2.3.17 → trunk View file →

		@@ -13,13 +13,13 @@
13	13	* @link http://wordpress.org/extend/plugins/user-access-manager/
14	14	*/
15	15
16	16	/**
17		- * @var UserAccessManager\Controller\Backend\SetupController $controller
	17	+ * @var UserAccessManager\Controller\Backend\Administration\SetupController $controller
18	18	*/
19	19	if ($controller->hasUpdateMessage()) {
20	20	?>
21		- <div class="updated">
	21	+ <div class="notice notice-success">
22	22	<p><strong><?php echo $controller->getUpdateMessage(); ?></strong></p>
23	23	</div>
24	24	<?php
25	25	}
		@@ -24,9 +24,9 @@
24	24	<?php
25	25	}
26	26	?>
27	27	<div class="wrap">
28		- <h2><?php echo TXT_UAM_SETUP; ?></h2>
	28	+ <h1 class="wp-heading-inline"><?php echo TXT_UAM_SETUP; ?></h1>
29	29	<div class="uam_sidebar">
30	30	<?php include 'InfoBox.php'; ?>
31	31	</div>
32	32	<div class="uam_main">
		@@ -37,9 +37,9 @@
37	37	<tbody>
38	38	<tr valign="top">
39	39	<th scope="row"><?php echo TXT_UAM_UPDATE_UAM_DB; ?></th>
40	40	<td>
41		- <form method="post" action="<?php echo $controller->getRequestUrl(); ?>">
	41	+ <form class="uam_setup_form" method="post" action="<?php echo $controller->getRequestUrl(); ?>">
42	42	<?php $controller->createNonceField('uamSetupUpdate'); ?>
43	43	<input type="hidden" value="update_database" name="uam_action"/>
44	44	<?php
45	45	if ($controller->showNetworkUpdate() === true) {
		@@ -66,11 +66,11 @@
66	66	checked="checked"
67	67	name="uam_backup_db" value="1">
68	68	<label for="uam_backup_db"><?php echo TXT_UAM_UPDATE_BACKUP; ?></label>
69	69	</p>
70		- <p style="color: red; font-size: 12px; font-weight: bold;">
71		- <?php echo TXT_UAM_UPDATE_UAM_DB_DESCRIPTION; ?>
72		- </p>
	70	+ <div class="notice notice-warning inline">
	71	+ <p><?php echo TXT_UAM_UPDATE_UAM_DB_DESCRIPTION; ?></p>
	72	+ </div>
73	73	</form>
74	74	</td>
75	75	</tr>
76	76	</tbody>
		@@ -78,8 +78,10 @@
78	78	<?php
79	79	}
80	80
81	81	$isDatabaseBroken = $controller->isDatabaseBroken();
	82	+ $databaseNoticeType = ($isDatabaseBroken === true) ? 'error' : 'success';
	83	+ $databaseNoticeText = ($isDatabaseBroken === true) ? TXT_UAM_DATABASE_BROKEN : TXT_UAM_DATABASE_OK;
82	84	?>
83	85	<table class="form-table">
84	86	<tbody>
85	87	<tr valign="top">
		@@ -84,21 +86,21 @@
84	86	<tbody>
85	87	<tr valign="top">
86	88	<th scope="row"><?php echo TXT_UAM_REPAIR_DATABASE; ?></th>
87	89	<td>
88		- <p>
89		- <?php echo ($isDatabaseBroken === true) ? TXT_UAM_DATABASE_BROKEN : TXT_UAM_DATABASE_OK; ?>
90		- </p>
	90	+ <div class="notice notice-<?php echo $databaseNoticeType; ?> inline">
	91	+ <p><?php echo $databaseNoticeText; ?></p>
	92	+ </div>
91	93	<?php
92	94	if ($isDatabaseBroken === true) {
93	95	?>
94		- <form method="post" action="<?php echo $controller->getRequestUrl(); ?>">
	96	+ <form class="uam_setup_form" method="post" action="<?php echo $controller->getRequestUrl(); ?>">
95	97	<?php $controller->createNonceField('uamSetupRepair'); ?>
96	98	<input type="hidden" value="repair_database" name="uam_action"/>
97	99	<input type="submit" class="button"
98	100	name="uam_repair_db_submit"
99	101	value="<?php echo TXT_UAM_REPAIR_DATABASE_REPAIR_NOW; ?>"/>
100		- <p style="font-size: 12px;">
	102	+ <p class="description">
101	103	<?php echo TXT_UAM_REPAIR_DATABASE_DESCRIPTION; ?>
102	104	</p>
103	105	</form>
104	106	<?php
		@@ -117,9 +119,9 @@
117	119	<tbody>
118	120	<tr valign="top">
119	121	<th scope="row"><?php echo TXT_UAM_REVERT_DATABASE; ?></th>
120	122	<td>
121		- <form method="post" action="<?php echo $controller->getRequestUrl(); ?>">
	123	+ <form class="uam_setup_form" method="post" action="<?php echo $controller->getRequestUrl(); ?>">
122	124	<?php $controller->createNonceField('uamSetupRevert'); ?>
123	125	<input type="hidden" value="revert_database" name="uam_action"/>
124	126	<?php
125	127	foreach ($backups as $backup) {
		@@ -134,9 +136,9 @@
134	136	?>
135	137	&nbsp;<input type="submit" class="button"
136	138	name="uam_revert_db_submit"
137	139	value="<?php echo TXT_UAM_REVERT_DATABASE_REVERT_NOW; ?>"/>
138		- <p style="font-size: 12px;">
	140	+ <p class="description">
139	141	<?php echo TXT_UAM_REVERT_DATABASE_DESCRIPTION; ?>
140	142	</p>
141	143	</form>
142	144	</td>
		@@ -147,9 +149,9 @@
147	149	<tbody>
148	150	<tr valign="top">
149	151	<th scope="row"><?php echo TXT_UAM_DELETE_DATABASE_BACKUP; ?></th>
150	152	<td>
151		- <form method="post" action="<?php echo $controller->getRequestUrl(); ?>">
	153	+ <form class="uam_setup_form" method="post" action="<?php echo $controller->getRequestUrl(); ?>">
152	154	<?php $controller->createNonceField('uamSetupDeleteBackup'); ?>
153	155	<input type="hidden" value="delete_database_backup" name="uam_action"/>
154	156	<?php
155	157	foreach ($backups as $backup) {
		@@ -164,9 +166,9 @@
164	166	?>
165	167	&nbsp;<input type="submit" class="button"
166	168	name="uam_delete_db_backup_submit"
167	169	value="<?php echo TXT_UAM_DELETE_DATABASE_BACKUP_DELETE_NOW; ?>"/>
168		- <p style="font-size: 12px;">
	170	+ <p class="description">
169	171	<?php echo TXT_UAM_DELETE_DATABASE_BACKUP_DESCRIPTION; ?>
170	172	</p>
171	173	</form>
172	174	</td>
		@@ -175,18 +177,18 @@
175	177	</table>
176	178	<?php
177	179	}
178	180	?>
179		- <h2 style="color:red;"><?php echo TXT_UAM_SETUP_DANGER_ZONE; ?></h2>
	181	+ <h2 class="uam_danger_zone"><?php echo TXT_UAM_SETUP_DANGER_ZONE; ?></h2>
180	182	<table class="form-table">
181	183	<tbody>
182	184	<tr valign="top">
183	185	<th scope="row"><label for="uam_reset_confirm"><?php echo TXT_UAM_RESET_UAM; ?></label></th>
184	186	<td>
185		- <form method="post" action="<?php echo $controller->getRequestUrl(); ?>">
	187	+ <form class="uam_setup_form" method="post" action="<?php echo $controller->getRequestUrl(); ?>">
186	188	<?php $controller->createNonceField('uamSetupReset'); ?>
187	189	<input type="hidden" value="reset_uam" name="uam_action"/>
188		- <input id="uam_reset_confirm" class="uam_reset_confirm" name="uam_reset"/>
	190	+ <input id="uam_reset_confirm" type="text" class="uam_reset_confirm" name="uam_reset"/>
189	191	<input id="uam_reset_submit"
190	192	disabled="disabled"
191	193	type="submit"
192	194	class="button"
		@@ -193,14 +195,14 @@
193	195	name="uam_reset_submit"
194	196	value="<?php echo TXT_UAM_RESET; ?>"
195	197	/>
196	198	<br/>
197		- <p style="font-size: 12px; font-weight: bold;">
	199	+ <p class="description">
198	200	<?php echo TXT_UAM_RESET_UAM_DESCRIPTION; ?>
199	201	</p>
200		- <p style="color: red; font-size: 12px; font-weight: bold;">
201		- <?php echo TXT_UAM_RESET_UAM_DESC_WARNING; ?>
202		- </p>
	202	+ <div class="notice notice-error inline">
	203	+ <p><?php echo TXT_UAM_RESET_UAM_DESC_WARNING; ?></p>
	204	+ </div>
203	205	</form>
204	206	</td>
205	207	</tr>
206	208	</tbody>