From 323103323b5ca370bd64e96b77b49f0b48bc05ed Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Apr 2011 14:25:02 +0400
Subject: implement instance adding and deleting

---
 modules/popup-dialog.php | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'modules/popup-dialog.php')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 2eb63af9d..906e89f4f 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -990,6 +990,59 @@
 				type=\"submit\">".
 				__('Close this window')."</button>";
 			print "</div>";
+		}
+
+		if ($id == "addInstance") {
+
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"op\" value=\"pref-instances\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"subop\" value=\"add\">";
+
+			print "<div class=\"dlgSec\">".__("Instance")."</div>";
+
+			print "<div class=\"dlgSecCont\">";
+
+			/* URL */
+
+			print __("URL:") . " ";
+
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				placeHolder=\"".__("Instance URL")."\"
+				regExp='^(http|https)://.*'
+				style=\"font-size : 16px; width: 20em\" name=\"access_url\">";
+
+			print "<hr/>";
+
+			$access_key = sha1(uniqid(rand(), true));
+
+			/* Access key */
+
+			print __("Access key:") . " ";
+
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				placeHolder=\"".__("Access key")."\"
+				style=\"width: 20em\" name=\"access_key\" id=\"instance_add_key\"
+				value=\"$access_key\">";
+
+			print "</div>";
+
+			print "<div class=\"dlgButtons\">
+				<div style='float : left'>
+					<button dojoType=\"dijit.form.Button\"
+						onclick=\"return dijit.byId('instanceAddDlg').regenKey()\">".
+						__('Generate new key')."</button>
+				</div>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceAddDlg').execute()\">".
+					__('Create link')."</button>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceAddDlg').hide()\"\">".
+					__('Cancel')."</button></div>";
+
+			return;
+
+
+
+
 		}
 
 		print "</dlg>";
-- 
cgit v1.2.3


From 258d48a04749d57fd3e91524ac9c5da51440e739 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Apr 2011 14:32:30 +0400
Subject: show partial access key in main instance editor, better key input
 checking

---
 modules/popup-dialog.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/popup-dialog.php')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 906e89f4f..f5a30a06e 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -1019,7 +1019,7 @@
 			print __("Access key:") . " ";
 
 			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
-				placeHolder=\"".__("Access key")."\"
+				placeHolder=\"".__("Access key")."\" regExp='\w{40}'
 				style=\"width: 20em\" name=\"access_key\" id=\"instance_add_key\"
 				value=\"$access_key\">";
 
-- 
cgit v1.2.3


From ae5f7bb11a7698a84c9352436c144286f7c81630 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Apr 2011 15:21:00 +0400
Subject: implement fetching and exporting of shared feeds

---
 modules/popup-dialog.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/popup-dialog.php')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index f5a30a06e..6cb60eef4 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -1023,6 +1023,8 @@
 				style=\"width: 20em\" name=\"access_key\" id=\"instance_add_key\"
 				value=\"$access_key\">";
 
+			print "<p class='insensitive'>" . __("Use one access key for both linked instances.");
+
 			print "</div>";
 
 			print "<div class=\"dlgButtons\">
-- 
cgit v1.2.3