From 335147e572c8557751c0a035647a7ad729b43674 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 22 Feb 2019 10:48:56 +0300
Subject: dialogs: use semantic markup instead of dlgsec stuff continue
 unifying quoting style for html strings

---
 classes/pref/feeds.php   | 271 +++++++++++++++++++++--------------------------
 classes/pref/filters.php | 156 +++++++++++++--------------
 classes/pref/labels.php  |  50 ++++-----
 classes/pref/prefs.php   |  52 +++++----
 classes/pref/users.php   |  44 ++++----
 5 files changed, 265 insertions(+), 308 deletions(-)

(limited to 'classes/pref')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index a033bf04f..dd7c67e7e 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -531,16 +531,16 @@ class Pref_Feeds extends Handler_Protected {
 			print_hidden("op", "pref-feeds");
 			print_hidden("method", "editSave");
 
-			print "<div class=\"dlgSec\">".__("Feed")."</div>";
-			print "<div class=\"dlgSecCont\">";
+			print "<header>".__("Feed")."</header>";
+			print "<section>";
 
 			/* Title */
 
 			print "<fieldset>";
 
-			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed Title")."\"
-				style=\"font-size : 16px; width: 500px\" name=\"title\" value=\"$title\">";
+				style='font-size : 16px; width: 500px' name='title' value=\"$title\">";
 
 			print "</fieldset>";
 
@@ -551,10 +551,10 @@ class Pref_Feeds extends Handler_Protected {
 			print "<fieldset>";
 
 			print "<label>" . __('URL:') . "</label> ";
-			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
-				regExp='^(http|https)://.*' style=\"width : 300px\"
-				name=\"feed_url\" value=\"$feed_url\">";
+				regExp='^(http|https)://.*' style='width : 300px'
+				name='feed_url' value=\"$feed_url\">";
 
 			$last_error = $row["last_error"];
 
@@ -588,10 +588,10 @@ class Pref_Feeds extends Handler_Protected {
 			print "<fieldset>";
 
 			print "<label>" . __('Site URL:') . "</label> ";
-			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
-				regExp='^(http|https)://.*' style=\"width : 300px\"
-				name=\"site_url\" value=\"$site_url\">";
+				regExp='^(http|https)://.*' style='width : 300px'
+				name='site_url' value=\"$site_url\">";
 
 			print "</fieldset>";
 
@@ -609,10 +609,10 @@ class Pref_Feeds extends Handler_Protected {
 				print "</fieldset>";
 			}
 
-			print "</div>";
+			print "</section>";
 
-			print "<div class=\"dlgSec\">".__("Update")."</div>";
-			print "<div class=\"dlgSecCont\">";
+			print "<header>".__("Update")."</header>";
+			print "<section>";
 
 			/* Update Interval */
 
@@ -641,7 +641,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "</fieldset>";
 
-			print "</div>";
+			print "</section>";
 
 			$auth_login = htmlspecialchars($row["auth_login"]);
 			$auth_pass = htmlspecialchars($row["auth_pass"]);
@@ -650,44 +650,39 @@ class Pref_Feeds extends Handler_Protected {
 
 			$auth_style = $auth_enabled ? '' : 'display: none';
 			print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
-			print "<div class=\"dlgSec\">".__("Authentication")."</div>";
-			print "<div class=\"dlgSecCont\">";
+			print "<header>".__("Authentication")."</header>";
+			print "<section>";
 
 			print "<fieldset>";
 
-			print "<input dojoType=\"dijit.form.TextBox\" id=\"feedEditDlg_login\"
-				placeHolder=\"".__("Login")."\"
-				autocomplete=\"new-password\"
-				name=\"auth_login\" value=\"$auth_login\">";
+			print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
+				placeHolder='".__("Login")."'
+				autocomplete='new-password'
+				name='auth_login' value=\"$auth_login\">";
 
-			print "</fieldset>";
-			print "<fieldset>";
+			print "</fieldset><fieldset>";
 
-			print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
-				autocomplete=\"new-password\"
-				placeHolder=\"".__("Password")."\"
+			print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+				autocomplete='new-password'
+				placeHolder='".__("Password")."'
 				value=\"$auth_pass\">";
 
-			print "<div dojoType=\"dijit.Tooltip\" connectId=\"feedEditDlg_login\" position=\"below\">
+			print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
 				".__('<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')."
 				</div>";
 
 			print "</fieldset>";
 
-			print "</div></div>";
+			print "</section></div>";
 
 			$auth_checked = $auth_enabled ? 'checked' : '';
-			print "<div style=\"clear : both\">
-				<input type=\"checkbox\" $auth_checked name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedEditDlg_loginCheck\"
+			print "<label class='checkbox'>
+				<input type='checkbox' $auth_checked name='need_auth' dojoType='dijit.form.CheckBox' id='feedEditDlg_loginCheck'
 						onclick='displayIfChecked(this, \"feedEditDlg_loginContainer\")'>
-					<label for=\"feedEditDlg_loginCheck\">".
-				__('This feed requires authentication.')."</div>";
+					".__('This feed requires authentication.')."</label>";
 
 			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
 
-			//print "<div class=\"dlgSec\">".__("Options")."</div>";
-			print "<div class=\"dlgSecSimple\">";
-
 			$private = $row["private"];
 
 			if ($private) {
@@ -745,9 +740,8 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"hide_images\"
-				name=\"hide_images\"
-				$checked> ".__('Do not embed media')."</label>";
+			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
+				name='hide_images' $checked> ".__('Do not embed media')."</label>";
 
 			print "</fieldset>";
 
@@ -761,9 +755,8 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\"
-				name=\"cache_images\"
-				$checked> ". __('Cache media')."</label>";
+			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
+				name='cache_images' $checked> ". __('Cache media')."</label>";
 
 			print "</fieldset>";
 
@@ -777,42 +770,35 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"mark_unread_on_update\"
-				name=\"mark_unread_on_update\"
-				$checked> ".__('Mark updated articles as unread')."</label>";
+			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
+				name='mark_unread_on_update' $checked> ".__('Mark updated articles as unread')."</label>";
 
 			print "</fieldset>";
 
-			print "</div>";
-
 			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
 
 			/* Icon */
 
-			print "<div class=\"dlgSecSimple\">";
-
-			print "<img class=\"feedIcon\" src=\"".Feeds::getFeedIcon($feed_id)."\">";
+			print "<img class='feedIcon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
 
-			print "<iframe name=\"icon_upload_iframe\"
-				style=\"width: 400px; height: 100px; display: none;\"></iframe>";
+			print "<iframe name='icon_upload_iframe'
+				style='width: 400px; height: 100px; display: none;'></iframe>";
 
-			print "<form style='display : block' target=\"icon_upload_iframe\"
-			enctype=\"multipart/form-data\" method=\"POST\"
-			action=\"backend.php\">
-			<label class=\"dijitButton\">".__("Choose file...")."
-				<input style=\"display: none\" id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\">
+			print "<form style='display : block' target='icon_upload_iframe'
+			enctype='multipart/form-data' method='POST'
+			action='backend.php'>
+			<label class='dijitButton'>".__("Choose file...")."
+				<input style='display: none' id='icon_file' size='10' name='icon_file' type='file'>
 			</label>
-			<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
-			<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
-			<input type=\"hidden\" name=\"method\" value=\"uploadicon\">
-			<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.uploadFeedIcon();\"
-				type=\"submit\">".__('Replace')."</button>
-			<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
-				type=\"submit\">".__('Remove')."</button>
+			<input type='hidden' name='op' value='pref-feeds'>
+			<input type='hidden' name='feed_id' value=\"$feed_id\">
+			<input type='hidden' name='method' value=\"uploadicon\">
+			<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.uploadFeedIcon();\"
+				type='submit'>".__('Replace')."</button>
+			<button class='alt-danger' dojoType='dijit.form.Button' onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
+				type='submit'>".__('Remove')."</button>
 			</form>";
 
-			print "</div>";
-
 			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
 
 			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
@@ -822,16 +808,12 @@ class Pref_Feeds extends Handler_Protected {
 
 			$title = htmlspecialchars($title, ENT_QUOTES);
 
-			print "<div class='dlgButtons'>
-			<div style=\"float : left\">
-			<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
-				__('Unsubscribe')."</button>";
-
-			print "</div>";
-
-			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
-				<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
-				</div>";
+			print "<footer>
+				<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
+					__('Unsubscribe')."</button>
+				<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
+				<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
+				</footer>";
 		}
 	}
 
@@ -849,8 +831,8 @@ class Pref_Feeds extends Handler_Protected {
 		print_hidden("op", "pref-feeds");
 		print_hidden("method", "batchEditSave");
 
-		print "<div class=\"dlgSec\">".__("Feed")."</div>";
-		print "<div class=\"dlgSecCont\">";
+		print "<header>".__("Feed")."</header>";
+		print "<section>";
 
 		/* Category */
 
@@ -882,10 +864,10 @@ class Pref_Feeds extends Handler_Protected {
 			print "</fieldset>";
 		}
 
-		print "</div>";
+		print "</section>";
 
-		print "<div class=\"dlgSec\">".__("Update")."</div>";
-		print "<div class=\"dlgSecCont\">";
+		print "<header>".__("Update")."</header>";
+		print "<section>";
 
 		/* Update Interval */
 
@@ -916,93 +898,85 @@ class Pref_Feeds extends Handler_Protected {
 			print "</fieldset>";
 		}
 
-		print "</div>";
-		print "<div class=\"dlgSec\">".__("Authentication")."</div>";
-		print "<div class=\"dlgSecCont\">";
+		print "</section>";
+		print "<header>".__("Authentication")."</header>";
+		print "<section>";
 
 		print "<fieldset>";
 
-		print "<input dojoType=\"dijit.form.TextBox\"
-			placeHolder=\"".__("Login")."\" disabled=\"1\"
-			autocomplete=\"new-password\"
-			name=\"auth_login\" value=\"\">";
+		print "<input dojoType='dijit.form.TextBox'
+			placeHolder=\"".__("Login")."\" disabled='1'
+			autocomplete='new-password'
+			name='auth_login' value=''>";
 
 		$this->batch_edit_cbox("auth_login");
 
-		print "</fieldset>";
-		print "<fieldset>";
-
-		print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
-			autocomplete=\"new-password\"
-			placeHolder=\"".__("Password")."\" disabled=\"1\"
-			value=\"\">";
+		print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+			autocomplete='new-password'
+			placeHolder=\"".__("Password")."\" disabled='1'
+			value=''>";
 
 		$this->batch_edit_cbox("auth_pass");
 
 		print "</fieldset>";
 
-		print "</div>";
-		print "<div class=\"dlgSec\">".__("Options")."</div>";
-		print "<div class=\"dlgSecCont\">";
+		print "</section>";
+		print "<header>".__("Options")."</header>";
+		print "<section>";
 
 		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'><input disabled=\"1\" type=\"checkbox\" name=\"private\" id=\"private\"
-			dojoType=\"dijit.form.CheckBox\">&nbsp;".__('Hide from Popular feeds')."</label>";
+		print "<label class='checkbox'><input disabled='1' type='checkbox' name='private' id='private'
+			dojoType='dijit.form.CheckBox'>&nbsp;".__('Hide from Popular feeds')."</label>";
 
 		print "&nbsp;"; $this->batch_edit_cbox("private", "private_l");
 
 		print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled=\"1\" type=\"checkbox\" id=\"include_in_digest\"
-			name=\"include_in_digest\"
-			dojoType=\"dijit.form.CheckBox\">&nbsp;".__('Include in e-mail digest')."</label>";
+		print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest'
+			name='include_in_digest' dojoType='dijit.form.CheckBox'>&nbsp;".__('Include in e-mail digest')."</label>";
 
 		print "&nbsp;"; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l");
 
 		print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled=\"1\" type=\"checkbox\" id=\"always_display_enclosures\"
-			name=\"always_display_enclosures\"
-			dojoType=\"dijit.form.CheckBox\">&nbsp;".__('Always display image attachments')."</label>";
+		print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures'
+			name='always_display_enclosures' dojoType='dijit.form.CheckBox'>&nbsp;".__('Always display image attachments')."</label>";
 
 		print "&nbsp;"; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
 
 		print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled=\"1\" type=\"checkbox\" id=\"hide_images\"
-			name=\"hide_images\"
-			dojoType=\"dijit.form.CheckBox\">&nbsp;". __('Do not embed media')."</label>";
+		print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images'
+			name='hide_images' dojoType='dijit.form.CheckBox'>&nbsp;". __('Do not embed media')."</label>";
 
 		print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");
 
 		print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled=\"1\" type=\"checkbox\" id=\"cache_images\"
-			name=\"cache_images\"
-			dojoType=\"dijit.form.CheckBox\">&nbsp;".__('Cache media')."</label>";
+		print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images'
+			name='cache_images' dojoType='dijit.form.CheckBox'>&nbsp;".__('Cache media')."</label>";
 
 		print "&nbsp;"; $this->batch_edit_cbox("cache_images", "cache_images_l");
 
 		print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled=\"1\" type=\"checkbox\" id=\"mark_unread_on_update\"
-			name=\"mark_unread_on_update\"
-			dojoType=\"dijit.form.CheckBox\">&nbsp;".__('Mark updated articles as unread')."</label>";
+		print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update'
+			name='mark_unread_on_update' dojoType='dijit.form.CheckBox'>&nbsp;".__('Mark updated articles as unread')."</label>";
 
 		print "&nbsp;"; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
 
 		print "</fieldset>";
 
-		print "</div>";
+		print "</section>";
 
-		print "<div class='dlgButtons'>
-			<button dojoType=\"dijit.form.Button\" type='submit' class='alt-primary'
+		print "<footer>
+			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'
 				onclick=\"return dijit.byId('feedEditDlg').execute()\">".
 				__('Save')."</button>
-			<button dojoType=\"dijit.form.Button\"
+			<button dojoType='dijit.form.Button'
 			onclick=\"return dijit.byId('feedEditDlg').hide()\">".
 				__('Cancel')."</button>
-			</div>";
+			</footer>";
 
 		return;
 	}
@@ -1499,16 +1473,14 @@ class Pref_Feeds extends Handler_Protected {
 			ORDER BY last_article");
 		$sth->execute([$_SESSION['uid']]);
 
-		print "<p" .__("These feeds have not been updated with new content for 3 months (oldest first):") . "</p>";
-
-		print "<div dojoType=\"dijit.Toolbar\">";
-		print "<div dojoType=\"dijit.form.DropDownButton\">".
+		print "<div dojoType='dijit.Toolbar'>";
+		print "<div dojoType='dijit.form.DropDownButton'>".
 				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
-			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
+			dojoType='dijit.MenuItem'>".__('All')."</div>";
 		print "<div onclick=\"Tables.select('inactive-feeds-list', false)\"
-			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
+			dojoType='dijit.MenuItem'>".__('None')."</div>";
 		print "</div></div>";
 		print "</div>"; #toolbar
 
@@ -1524,16 +1496,16 @@ class Pref_Feeds extends Handler_Protected {
 			print "<tr data-row-id='$feed_id'>";
 
 			print "<td width='5%' align='center'><input
-				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
-				type=\"checkbox\"></td>";
+				onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox'
+				type='checkbox'></td>";
 			print "<td>";
 
-			print "<a class=\"visibleLink\" href=\"#\" ".
+			print "<a href='#' ".
 				"title=\"".__("Click to edit feed")."\" ".
 				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
 				htmlspecialchars($line["title"])."</a>";
 
-			print "</td><td class=\"insensitive\" align='right'>";
+			print "</td><td class='insensitive' align='right'>";
 			print make_local_datetime($line['last_article'], false);
 			print "</td>";
 			print "</tr>";
@@ -1544,16 +1516,12 @@ class Pref_Feeds extends Handler_Protected {
 		print "</table>";
 		print "</div>";
 
-		print "<div class='dlgButtons'>";
-		print "<div style='float : left'>";
-		print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
-			.__('Unsubscribe from selected feeds')."</button> ";
-		print "</div>";
-
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">".
-			__('Close this window')."</button>";
-
-		print "</div>";
+		print "<footer>
+			<button style='float : left' class=\"alt-danger\" dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
+			.__('Unsubscribe from selected feeds')."</button>
+			<button dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">"
+			.__('Close this window')."</button>
+			</footer>";
 
 	}
 
@@ -1607,16 +1575,14 @@ class Pref_Feeds extends Handler_Protected {
 		print "</table>";
 		print "</div>";
 
-		print "<div class='dlgButtons'>";
-		print "<div style='float : left'>";
-		print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+		print "<footer>";
+		print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
 			.__('Unsubscribe from selected feeds')."</button> ";
-		print "</div>";
 
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
 			__('Close this window')."</button>";
 
-		print "</div>";
+		print "</footer>";
 	}
 
 	private function remove_feed_category($id, $owner_uid) {
@@ -1710,9 +1676,8 @@ class Pref_Feeds extends Handler_Protected {
 		print_hidden("op", "pref-feeds");
 		print_hidden("method", "batchaddfeeds");
 
-		print "<div class='dlgSecHoriz'>".__("One valid feed per line (no detection is done)")."</div>";
-
-		print "<div class='dlgSecCont'>";
+		print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>";
+		print "<section>";
 
 		print "<textarea
 			style='font-size : 12px; width : 98%; height: 200px;'
@@ -1725,16 +1690,18 @@ class Pref_Feeds extends Handler_Protected {
 			print "</fieldset>";
 		}
 
+		print "</section>";
+
 		print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<div class='dlgSec'>" . __("Authentication") . "</div>";
-		print "<div class='dlgSecCont'>";
+		print "<header>" . __("Authentication") . "</header>";
+		print "<section>";
 
 		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
 			<input placeHolder=\"".__("Password")."\" dojoType=\"dijit.form.TextBox\" type='password'
 				autocomplete='new-password' name='pass''></div>";
 
-		print "</div>";
+		print "</section>";
 		print "</div>";
 
 		print "<fieldset class='narrow'>
@@ -1743,10 +1710,10 @@ class Pref_Feeds extends Handler_Protected {
 				__('Feeds require authentication.')."</label></div>";
 		print "</fieldset>";
 
-		print "<div class='dlgButtons'>
+		print "<footer>
 			<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"return dijit.byId('batchSubDlg').execute()\">".__('Subscribe')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button>
-			</div>";
+			</footer>";
 	}
 
 	function batchAddFeeds() {
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 99bb885cf..8414de9fe 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -170,10 +170,10 @@ class Pref_Filters extends Handler_Protected {
 		print "<ul class='panel panel-scrollable list list-unstyled' id='prefFilterTestResultList'>";
 		print "</ul>";
 
-		print "<div style='text-align : center'>";
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('filterTestDlg').hide()\">".
+		print "<footer class='text-center'>";
+		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('filterTestDlg').hide()\">".
 			__('Close this window')."</button>";
-		print "</div>";
+		print "</footer>";
 
 	}
 
@@ -346,15 +346,13 @@ class Pref_Filters extends Handler_Protected {
 			print_hidden("method", "editSave");
 			print_hidden("csrf_token", $_SESSION['csrf_token']);
 
-			print "<div class='dlgSec'>".__("Caption")."</div>";
-			print "<div class='dlgSecCont'>";
-
+			print "<header>".__("Caption")."</header>";
+			print "<section>";
 			print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"$title\">";
+			print "</section>";
 
-			print "</div>";
-
-			print "<div class='dlgSecHoriz'>".__("Match")."</div>";
-			print "<div class='dlgSecCont'>";
+			print "<header class='horizontal'>".__("Match")."</header>";
+			print "<section>";
 
 			print "<div dojoType=\"dijit.Toolbar\">";
 
@@ -410,11 +408,11 @@ class Pref_Filters extends Handler_Protected {
 
 			print "</ul>";
 
-			print "</div>";
+			print "</section>";
 
-			print "<div class='dlgSecHoriz'>".__("Apply actions")."</div>";
+			print "<header class='horizontal'>".__("Apply actions")."</header>";
 
-			print "<div class='dlgSecCont'>";
+			print "<section>";
 
 			print "<div dojoType=\"dijit.Toolbar\">";
 
@@ -456,10 +454,10 @@ class Pref_Filters extends Handler_Protected {
 
 			print "</ul>";
 
-			print "</div>";
+			print "</section>";
 
-			print "<div class='dlgSec'>".__("Options")."</div>";
-			print "<div class='dlgSecCont'>";
+			print "<header>".__("Options")."</header>";
+			print "<section>";
 
 			if ($enabled) {
 				$checked = "checked=\"1\"";
@@ -495,9 +493,9 @@ class Pref_Filters extends Handler_Protected {
 
 			print "</fieldset>";
 
-			print "</div>";
+			print "</section>";
 
-			print "<div class=\"dlgButtons\">";
+			print "<footer>";
 
 			print "<div style=\"float : left\">";
 			print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">".
@@ -513,7 +511,7 @@ class Pref_Filters extends Handler_Protected {
 			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".
 				__('Cancel')."</button>";
 
-			print "</div>";
+			print "</footer>";
 			print "</form>";
 
 		}
@@ -849,31 +847,30 @@ class Pref_Filters extends Handler_Protected {
 		print_hidden("method", "add");
 		print_hidden("csrf_token", $_SESSION['csrf_token']);
 
-		print "<div class='dlgSec'>".__("Caption")."</div>";
+		print "<header>".__("Caption")."</header>";
 
-		print "<div class='dlgSecCont'>";
-		print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"\">";
-		print "</div>";
+		print "<section>";
+		print "<input required='true' dojoType='dijit.form.ValidationTextBox' style='width : 20em;' name='title' value=''>";
+		print "</section>";
 
-		print "<div class='dlgSecHoriz'>".__("Match")."</div>";
+		print "<header class='horizontal'>".__("Match")."</header >";
+		print "<section>";
 
-		print "<div class='dlgSecCont'>";
-
-		print "<div dojoType=\"dijit.Toolbar\">";
+		print "<div dojoType='dijit.Toolbar'>";
 
-		print "<div dojoType=\"dijit.form.DropDownButton\">".
+		print "<div dojoType='dijit.form.DropDownButton'>".
 				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\"
-			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
+			dojoType='dijit.MenuItem'>".__('All')."</div>";
 		print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(false)\"
-			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
+			dojoType='dijit.MenuItem'>".__('None')."</div>";
 		print "</div></div>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').addRule()\">".
+		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterEditDlg').addRule()\">".
 			__('Add')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').deleteRule()\">".
+		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterEditDlg').deleteRule()\">".
 			__('Delete')."</button> ";
 
 		print "</div>";
@@ -882,74 +879,69 @@ class Pref_Filters extends Handler_Protected {
 #		print "<li>No rules</li>";
 		print "</ul>";
 
-		print "</div>";
-		print "</div>";
+		print "</section>";
 
-		print "<div class='dlgSecHoriz'>".__("Apply actions")."</div>";
+		print "<header class='horizontal'>".__("Apply actions")."</header>";
 
-		print "<div class='dlgSecCont'>";
+		print "<section>";
 
-		print "<div dojoType=\"dijit.Toolbar\">";
+		print "<div dojoType='dijit.Toolbar'>";
 
-		print "<div dojoType=\"dijit.form.DropDownButton\">".
+		print "<div dojoType='dijit.form.DropDownButton'>".
 				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\"
-			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
+			dojoType='dijit.MenuItem'>".__('All')."</div>";
 		print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(false)\"
-			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
+			dojoType='dijit.MenuItem'>".__('None')."</div>";
 		print "</div></div>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').addAction()\">".
+		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterEditDlg').addAction()\">".
 			__('Add')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').deleteAction()\">".
+		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterEditDlg').deleteAction()\">".
 			__('Delete')."</button> ";
 
 		print "</div>";
 
-
 		print "<ul id='filterDlg_Actions'>";
 #		print "<li>No actions</li>";
 		print "</ul>";
-		print "</div>";
 
-		print "<div class='dlgSec'>".__("Options")."</div>";
+		print "</section>";
 
-		print "<div class='dlgSecCont'>";
+		print "<header>".__("Options")."</header>";
+
+		print "<section>";
 		print "<fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
+		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' name='enabled' id='enabled' checked='1'>
 				".__('Enabled')."</label>";
 
 		print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"match_any_rule\" id=\"match_any_rule\">
+		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' name='match_any_rule' id='match_any_rule'>
 				".__('Match any rule')."</label>";
 
 		print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
+		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' name='inverse' id='inverse'>
 				".__('Inverse matching')."</label>";
 
 		print "</fieldset>";
 
-		print "</div>";
+		print "</section>";
 
-//		print "</div>";
+		print "<footer>";
 
-		print "<div class=\"dlgButtons\">";
-
-		print "<button dojoType=\"dijit.form.Button\" class=\"alt-info\" onclick=\"return dijit.byId('filterEditDlg').test()\">".
+		print "<button dojoType='dijit.form.Button' class='alt-info' onclick=\"return dijit.byId('filterEditDlg').test()\">".
 			__('Test')."</button> ";
-
-		print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
+		print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"return dijit.byId('filterEditDlg').execute()\">".
 			__('Create')."</button> ";
-
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".
+		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterEditDlg').hide()\">".
 			__('Cancel')."</button>";
 
-		print "</div>";
+		print "</footer>";
 
 	}
 
@@ -979,9 +971,9 @@ class Pref_Filters extends Handler_Protected {
 			$filter_types[$line["id"]] = __($line["description"]);
 		}
 
-		print "<div class=\"dlgSec\">".__("Match")."</div>";
+		print "<header>".__("Match")."</header>";
 
-		print "<div class=\"dlgSecCont\">";
+		print "<section>";
 
 		print "<input dojoType=\"dijit.form.ValidationTextBox\"
 			 required=\"true\" id=\"filterDlg_regExp\"
@@ -1015,9 +1007,9 @@ class Pref_Filters extends Handler_Protected {
 
 		print "</fieldset>";
 
-		print "</div>";
+		print "</section>";
 
-		print "<div class='dlgButtons'>";
+		print "<footer>";
 
 		print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ContentFilters\")'>
 			<i class='material-icons'>help</i> ".__("More info...")."</button>";
@@ -1028,7 +1020,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterNewRuleDlg').hide()\">".
 			__('Cancel')."</button>";
 
-		print "</div>";
+		print "</footer>";
 
 		print "</form>";
 	}
@@ -1046,12 +1038,12 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<form name='filter_new_action_form' id='filter_new_action_form' onsubmit='return false;'>";
 
-		print "<div class=\"dlgSec\">".__("Perform Action")."</div>";
+		print "<header>".__("Perform Action")."</header>";
 
-		print "<div class=\"dlgSecCont\">";
+		print "<section>";
 
-		print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
-			onchange=\"Filters.filterDlgCheckAction(this)\">";
+		print "<select name='action_id' dojoType='dijit.form.Select'
+			onchange='Filters.filterDlgCheckAction(this)'>";
 
 		$res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions
 			ORDER BY name");
@@ -1072,16 +1064,16 @@ class Pref_Filters extends Handler_Protected {
 		$label_param_hidden = ($action_id == 7) ?	"" : "display : none";
 		$plugin_param_hidden = ($action_id == 9) ?	"" : "display : none";
 
-		print "<span id=\"filterDlg_paramBox\" style=\"$param_box_hidden\">";
+		print "<span id='filterDlg_paramBox' style=\"$param_box_hidden\">";
 		print " ";
 		//print " " . __("with parameters:") . " ";
-		print "<input dojoType=\"dijit.form.TextBox\"
-			id=\"filterDlg_actionParam\" style=\"$param_hidden\"
-			name=\"action_param\" value=\"$action_param\">";
+		print "<input dojoType='dijit.form.TextBox'
+			id='filterDlg_actionParam' style=\"$param_hidden\"
+			name='action_param' value=\"$action_param\">";
 
 		print_label_select("action_param_label", $action_param,
-			"id=\"filterDlg_actionParamLabel\" style=\"$label_param_hidden\"
-			dojoType=\"dijit.form.Select\"");
+			"id='filterDlg_actionParamLabel' style=\"$label_param_hidden\"
+			dojoType='dijit.form.Select'");
 
 		$filter_actions = PluginHost::getInstance()->get_filter_actions();
 		$filter_action_hash = array();
@@ -1104,24 +1096,24 @@ class Pref_Filters extends Handler_Protected {
 		}
 
 		print_select_hash("filterDlg_actionParamPlugin", $action_param, $filter_action_hash,
-			"style=\"$plugin_param_hidden\" dojoType=\"dijit.form.Select\" $filter_plugin_disabled",
+			"style=\"$plugin_param_hidden\" dojoType='dijit.form.Select' $filter_plugin_disabled",
 			"action_param_plugin");
 
 		print "</span>";
 
 		print "&nbsp;"; // tiny layout hack
 
-		print "</div>";
+		print "</section>";
 
-		print "<div class=\"dlgButtons\">";
+		print "<footer>";
 
-		print "<button dojoType=\"dijit.form.Button\" class=\"alt-primary\" type=\"submit\" onclick=\"return dijit.byId('filterNewActionDlg').execute()\">".
+		print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"return dijit.byId('filterNewActionDlg').execute()\">".
 			($action ? __("Save action") : __('Add action'))."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterNewActionDlg').hide()\">".
+		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterNewActionDlg').hide()\">".
 			__('Cancel')."</button>";
 
-		print "</div>";
+		print "</footer>";
 
 		print "</form>";
 	}
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 28befe42b..5dadddab4 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -22,9 +22,9 @@ class Pref_Labels extends Handler_Protected {
 
 			print "<form onsubmit='return false;'>";
 
-			print "<div class=\"dlgSec\">".__("Caption")."</div>";
+			print "<header>".__("Caption")."</header>";
 
-			print "<div class=\"dlgSecCont\">";
+			print "<section>";
 
 			$fg_color = $line['fg_color'];
 			$bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5';
@@ -33,53 +33,47 @@ class Pref_Labels extends Handler_Protected {
 				id='labelEdit_caption' name='caption' dojoType='dijit.form.ValidationTextBox'
 				required='true' value=\"".htmlspecialchars($line['caption'])."\">";
 
-			print "</div>";
-			print "<div class=\"dlgSec\">" . __("Colors") . "</div>";
-			print "<div class=\"dlgSecCont\">";
+			print "</section>";
 
-			print "<table cellspacing=\"0\">";
-
-			print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:").
-				"</td></tr>";
+			print "<header>" . __("Colors") . "</header>";
+			print "<section>";
 
+			print "<table>";
+			print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:")."</th></tr>";
 			print "<tr><td style='padding-right : 10px'>";
 
-			print "<input dojoType=\"dijit.form.TextBox\"
-			style=\"display : none\" id=\"labelEdit_fgColor\"
-			name=\"fg_color\" value=\"$fg_color\">";
-			print "<input dojoType=\"dijit.form.TextBox\"
-			style=\"display : none\" id=\"labelEdit_bgColor\"
-			name=\"bg_color\" value=\"$bg_color\">";
+			print "<input dojoType='dijit.form.TextBox'
+				style='display : none' id='labelEdit_fgColor'
+				name='fg_color' value='$fg_color'>";
+			print "<input dojoType='dijit.form.TextBox'
+				style='display : none' id='labelEdit_bgColor'
+				name='bg_color' value='$bg_color'>";
 
-			print "<div dojoType=\"dijit.ColorPalette\">
-			<script type=\"dojo/method\" event=\"onChange\" args=\"fg_color\">
+			print "<div dojoType='dijit.ColorPalette'>
+			<script type='dojo/method' event='onChange' args='fg_color'>
 				dijit.byId('labelEdit_fgColor').attr('value', fg_color);
 				dijit.byId('labelEdit_caption').domNode.setStyle({color: fg_color});
 			</script>
 			</div>";
-			print "</div>";
 
 			print "</td><td>";
 
-			print "<div dojoType=\"dijit.ColorPalette\">
-			<script type=\"dojo/method\" event=\"onChange\" args=\"bg_color\">
+			print "<div dojoType='dijit.ColorPalette'>
+			<script type='dojo/method' event='onChange' args='bg_color'>
 				dijit.byId('labelEdit_bgColor').attr('value', bg_color);
 				dijit.byId('labelEdit_caption').domNode.setStyle({backgroundColor: bg_color});
 			</script>
 			</div>";
-			print "</div>";
 
 			print "</td></tr></table>";
-			print "</div>";
-
-#			print "</form>";
+			print "</section>";
 
-			print "<div class=\"dlgButtons\">";
-			print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
+			print "<footer>";
+			print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('labelEditDlg').execute()\">".
 				__('Save')."</button>";
-			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').hide()\">".
+			print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('labelEditDlg').hide()\">".
 				__('Cancel')."</button>";
-			print "</div>";
+			print "</footer>";
 
 			print "</form>";
 		}
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index fb1c1db06..acb36580d 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1039,35 +1039,34 @@ class Pref_Prefs extends Handler_Protected {
 		print_hidden("key", "USER_STYLESHEET");
 
 		print "<textarea class='panel user-css-editor' dojoType='dijit.form.SimpleTextarea'
-			style='font-size : 12px;'
-			name='value'>$value</textarea>";
+			style='font-size : 12px;' name='value'>$value</textarea>";
 
-		print "<div class='dlgButtons'>";
-		print "<button dojoType=\"dijit.form.Button\"
+		print "<footer>";
+		print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('cssEditDlg').execute()\">".__('Save')."</button> ";
-		print "<button dojoType=\"dijit.form.Button\"
+		print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('cssEditDlg').hide()\">".__('Cancel')."</button>";
-		print "</div>";
+		print "</footer>";
 
 	}
 
 	function editPrefProfiles() {
-		print "<div dojoType=\"dijit.Toolbar\">";
+		print "<div dojoType='dijit.Toolbar'>";
 
-		print "<div dojoType=\"dijit.form.DropDownButton\">".
+		print "<div dojoType='dijit.form.DropDownButton'>".
 				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
-			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
+			dojoType='dijit.MenuItem'>".__('All')."</div>";
 		print "<div onclick=\"Tables.select('pref-profiles-list', false)\"
-			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
+			dojoType='dijit.MenuItem'>".__('None')."</div>";
 		print "</div></div>";
 
-		print "<div style=\"float : right\">";
+		print "<div style='float : right'>";
 
-		print "<input name=\"newprofile\" dojoType=\"dijit.form.ValidationTextBox\"
-				required=\"1\">
-			<button dojoType=\"dijit.form.Button\"
+		print "<input name='newprofile' dojoType='dijit.form.ValidationTextBox'
+				required='1'>
+			<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('profileEditDlg').addProfile()\">".
 				__('Create profile')."</button></div>";
 
@@ -1113,10 +1112,10 @@ class Pref_Prefs extends Handler_Protected {
 				$is_active = "";
 			}
 
-			print "<td><span dojoType=\"dijit.InlineEditBox\"
-				width=\"300px\" autoSave=\"false\"
-				profile-id=\"$profile_id\">" . $edit_title .
-				"<script type=\"dojo/method\" event=\"onChange\" args=\"item\">
+			print "<td><span dojoType='dijit.InlineEditBox'
+				width='300px' autoSave='false'
+				profile-id='$profile_id'>" . $edit_title .
+				"<script type='dojo/method' event='onChange' args='item'>
 					var elem = this;
 					dojo.xhrPost({
 						url: 'backend.php',
@@ -1137,17 +1136,14 @@ class Pref_Prefs extends Handler_Protected {
 		print "</form>";
 		print "</div>";
 
-		print "<div class='dlgButtons'>
-			<div style='float : left'>
-			<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
+		print "<footer>
+			<button style='float : left' class='alt-danger' dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
 			__('Remove selected profiles')."</button>
-			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').activateProfile()\">".
+			<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"dijit.byId('profileEditDlg').activateProfile()\">".
 			__('Activate profile')."</button>
-			</div>";
-
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').hide()\">".
-			__('Close this window')."</button>";
-		print "</div>";
+			<button dojoType='dijit.form.Button' onclick=\"dijit.byId('profileEditDlg').hide()\">".
+			__('Cancel')."</button>";
+		print "</footer>";
 
 	}
 
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 86dd8aac1..8cc5bb9cc 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -44,26 +44,29 @@ class Pref_Users extends Handler_Protected {
 
 				$sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
 
-				print "<div class=\"dlgSec\">".__("User")."</div>";
-				print "<div class=\"dlgSecCont\">";
+				print "<header>".__("User")."</header>";
+				print "<section>";
 
 				if ($sel_disabled) {
 					print_hidden("login", "$login");
 				}
 
-				print "<input size=\"30\" style=\"font-size : 16px\"
-					dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				print "<fieldset>";
+				print "<label>" . __("Login:") . "</label>";
+				print "<input style='font-size : 16px'
+					dojoType='dijit.form.ValidationTextBox' required='1'
 					$sel_disabled
-					name=\"login\" value=\"$login\">";
+					name='login' value=\"$login\">";
+				print "</fieldset>";
 
-				print "</div>";
+				print "</section>";
 
-				print "<div class=\"dlgSec\">".__("Authentication")."</div>";
-				print "<div class=\"dlgSecCont\">";
+				print "<header>".__("Authentication")."</header>";
+				print "<section>";
 
 				print "<fieldset>";
 
-				print __('Access level: ') . " ";
+				print "<label>" . __('Access level: ') . "</label> ";
 
 				if (!$sel_disabled) {
 					print_select_hash("access_level", $access_level, $access_level_names,
@@ -77,20 +80,24 @@ class Pref_Users extends Handler_Protected {
 				print "</fieldset>";
 				print "<fieldset>";
 
-				print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" size=\"20\" placeholder=\"Change password\"
+				print "<label>" . __("New password:") . "</label> ";
+				print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
 					name=\"password\">";
 
 				print "</fieldset>";
 
-				print "</div>";
+				print "</section>";
 
-				print "<div class=\"dlgSec\">".__("Options")."</div>";
-				print "<div class=\"dlgSecCont\">";
+				print "<header>".__("Options")."</header>";
+				print "<section>";
 
-				print "<input dojoType=\"dijit.form.TextBox\" size=\"30\" name=\"email\" placeholder=\"E-mail\"
-				value=\"$email\">";
+				print "<fieldset>";
+				print "<label>" . __("E-mail:") . "</label> ";
+				print "<input dojoType='dijit.form.TextBox' size='30' name='email'
+					value=\"$email\">";
+				print "</fieldset>";
 
-				print "</div>";
+				print "</section>";
 
 				print "</table>";
 
@@ -103,11 +110,12 @@ class Pref_Users extends Handler_Protected {
 			print '</div>';
 			print '</div>';
 
-			print "<div class=\"dlgButtons\">
+			print "<footer>
 				<button dojoType=\"dijit.form.Button\" class=\"alt-primary\" type=\"submit\" onclick=\"dijit.byId('userEditDlg').execute()\">".
 				__('Save')."</button>
 				<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('userEditDlg').hide()\">".
-				__('Cancel')."</button></div>";
+				__('Cancel')."</button>
+				</footer>";
 
 			print "</form>";
 
-- 
cgit v1.2.3