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

---
 plugins/af_psql_trgm/init.php   | 17 ++++++++---------
 plugins/af_readability/init.php |  6 +++---
 plugins/import_export/init.php  | 15 +++++++--------
 plugins/mail/init.php           | 15 +++++++--------
 plugins/mailto/init.php         |  6 +++---
 plugins/note/init.php           | 11 ++++-------
 plugins/share/init.php          | 10 +++++-----
 7 files changed, 37 insertions(+), 43 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 255c91a0f..f8e4db834 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -107,9 +107,9 @@ class Af_Psql_Trgm extends Plugin {
 
 		}
 
-		print "<div style='text-align : center'>";
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('trgmRelatedDlg').hide()\">".__('Close this window')."</button>";
-		print "</div>";
+		print "<footer class='text-center'>";
+		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('trgmRelatedDlg').hide()\">".__('Close this window')."</button>";
+		print "</footer>";
 
 
 	}
@@ -214,8 +214,8 @@ class Af_Psql_Trgm extends Plugin {
 	}
 
 	function hook_prefs_edit_feed($feed_id) {
-		print "<div class=\"dlgSec\">".__("Similarity (pg_trgm)")."</div>";
-		print "<div class=\"dlgSecCont\">";
+		print "<header>".__("Similarity (pg_trgm)")."</header>";
+		print "<section>";
 
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
 		if (!array($enabled_feeds)) $enabled_feeds = array();
@@ -225,13 +225,12 @@ class Af_Psql_Trgm extends Plugin {
 
 		print "<fieldset>";
 
-		print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"trgm_similarity_enabled\"
-			name=\"trgm_similarity_enabled\"
-			$checked> ".__('Mark similar articles as read')."</label>";
+		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='trgm_similarity_enabled'
+			name='trgm_similarity_enabled' $checked> ".__('Mark similar articles as read')."</label>";
 
 		print "</fieldset>";
 
-		print "</div>";
+		print "</section>";
 	}
 
 	function hook_prefs_save_feed($feed_id) {
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index c44ad89ef..694c3782e 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -104,8 +104,8 @@ class Af_Readability extends Plugin {
 	}
 
 	function hook_prefs_edit_feed($feed_id) {
-		print "<div class=\"dlgSec\">".__("Readability")."</div>";
-		print "<div class=\"dlgSecCont\">";
+		print "<header>".__("Readability")."</header>";
+		print "<section>";
 
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
 		if (!is_array($enabled_feeds)) $enabled_feeds = array();
@@ -121,7 +121,7 @@ class Af_Readability extends Plugin {
 
 		print "</fieldset>";
 
-		print "</div>";
+		print "</section>";
 	}
 
 	function hook_prefs_save_feed($feed_id) {
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index c49426f9f..9f2aa18c4 100755
--- a/plugins/import_export/init.php
+++ b/plugins/import_export/init.php
@@ -437,24 +437,23 @@ class Import_Export extends Plugin implements IHandler {
 
 		print "<p style='text-align : center' id='export_status_message'>You need to prepare exported data first by clicking the button below.</p>";
 
-		print "<div align='center'>";
-		print "<button dojoType=\"dijit.form.Button\"
+		print "<footer class='text-center'>";
+		print "<button dojoType='dijit.form.Button'
+			type='submit' class='alt-primary'
 			onclick=\"dijit.byId('dataExportDlg').prepare()\">".
 			__('Prepare data')."</button>";
 
-		print "<button dojoType=\"dijit.form.Button\"
+		print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('dataExportDlg').hide()\">".
 			__('Close this window')."</button>";
 
-		print "</div>";
-
-
+		print "</footer>";
 	}
 
 	function dataImport() {
 		header("Content-Type: text/html"); # required for iframe
 
-		print "<div style='text-align : center'>";
+		print "<footer class='text-center'>";
 
 		if ($_FILES['export_file']['error'] != 0) {
 			print_error(T_sprintf("Upload failed with error code %d (%s)",
@@ -486,7 +485,7 @@ class Import_Export extends Plugin implements IHandler {
 			}
 		}
 
-		print "<button dojoType=\"dijit.form.Button\"
+		print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('dataImportDlg').hide()\">".
 			__('Close this window')."</button>";
 
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 72d8a65c2..e85053566 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -162,22 +162,21 @@ class Mail extends Plugin {
 
 		print "</td><td>";
 
-		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
-				style=\"width : 30em;\"
-				name=\"subject\" value=\"$subject\" id=\"subject\">";
+		print "<input dojoType='dijit.form.ValidationTextBox' required='true'
+				style='width : 30em;' name='subject' value=\"$subject\" id='subject'>";
 
 		print "</td></tr>";
 
-		print "<tr><td colspan='2'><textarea dojoType=\"dijit.form.SimpleTextarea\"
+		print "<tr><td colspan='2'><textarea dojoType='dijit.form.SimpleTextarea'
 			style='height : 200px; font-size : 12px; width : 98%' rows=\"20\"
 			name='content'>$content</textarea>";
 
 		print "</td></tr></table>";
 
-		print "<div class='dlgButtons'>";
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
-		print "</div>";
+		print "<footer>";
+		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
+		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
+		print "</footer>";
 
 		//return;
 	}
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 26871ac2b..421d5fd59 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -81,9 +81,9 @@ class MailTo extends Plugin {
 
 		print "<p>";
 
-		print "<div style='text-align : center'>";
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Close this dialog')."</button>";
-		print "</div>";
+		print "<footer class='text-center'>";
+		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Close this dialog')."</button>";
+		print "</footer>";
 
 		//return;
 	}
diff --git a/plugins/note/init.php b/plugins/note/init.php
index a0abb7f19..3c2ca0075 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -42,21 +42,18 @@ class Note extends Plugin {
 			print_hidden("method", "setNote");
 			print_hidden("plugin", "note");
 
-			print "<table width='100%'><tr><td>";
-			print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
+			print "<textarea dojoType='dijit.form.SimpleTextarea'
 				style='font-size : 12px; width : 98%; height: 100px;'
-				placeHolder='body#ttrssMain { font-size : 14px; };'
 				name='note'>$note</textarea>";
-			print "</td></tr></table>";
 
 		}
 
-		print "<div class='dlgButtons'>";
+		print "<footer class='text-center'>";
 		print "<button dojoType=\"dijit.form.Button\"
 			onclick=\"dijit.byId('editNoteDlg').execute()\">".__('Save')."</button> ";
 		print "<button dojoType=\"dijit.form.Button\"
 			onclick=\"dijit.byId('editNoteDlg').hide()\">".__('Cancel')."</button>";
-		print "</div>";
+		print "</footer>";
 
 	}
 
@@ -78,4 +75,4 @@ class Note extends Plugin {
 		return 2;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugins/share/init.php b/plugins/share/init.php
index ba33838b3..d0b3dfc0b 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -100,16 +100,16 @@ class Share extends Plugin {
 				$sth->execute([$uuid, $param, $_SESSION['uid']]);
 			}
 
-			print "<div class='dlgSec'>" . __("You can share this article by the following unique URL:") . "</div>";
+			print "<header>" . __("You can share this article by the following unique URL:") . "</header>";
 
 			$url_path = get_self_url_prefix();
 			$url_path .= "/public.php?op=share&key=$uuid";
 
-			print "<div class='dlgSecCont'>
+			print "<section>
 				<div class='panel text-center'>
 				<a id='gen_article_url' href='$url_path' target='_blank' rel='noopener noreferrer'>$url_path</a>
 				</div>
-				</div>";
+				</section>";
 
 			/* if (!label_find_id(__('Shared'), $_SESSION["uid"]))
 				label_create(__('Shared'), $_SESSION["uid"]);
@@ -121,7 +121,7 @@ class Share extends Plugin {
 			print "Article not found.";
 		}
 
-		print "<div align='center'>";
+		print "<footer class='text-center'>";
 
 		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').unshare()\">".
 			__('Unshare article')."</button>";
@@ -132,7 +132,7 @@ class Share extends Plugin {
 		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').hide()\">".
 			__('Close this window')."</button>";
 
-		print "</div>";
+		print "</footer>";
 	}
 
 	function api_version() {
-- 
cgit v1.2.3