diff --git a/libresapi/src/api/PeersHandler.cpp b/libresapi/src/api/PeersHandler.cpp index 0acdd2535..9b123a85a 100644 --- a/libresapi/src/api/PeersHandler.cpp +++ b/libresapi/src/api/PeersHandler.cpp @@ -100,6 +100,12 @@ void PeersHandler::handleWildcard(Request &req, Response &resp) req.mPath.pop(); if(str != "") { + if(str == "self" && !req.mPath.empty() && req.mPath.top() == "certificate") + { + resp.mDataStream << makeKeyValue("cert_string", mRsPeers->GetRetroshareInvite(false)); + resp.setOk(); + return; + } // assume the path element is a peer id // sometimes it is a peer id for location info // another time it is a pgp id diff --git a/libresapi/src/webfiles/green-black.css b/libresapi/src/webfiles/green-black.css index 9058e10c3..5b24a5ea3 100644 --- a/libresapi/src/webfiles/green-black.css +++ b/libresapi/src/webfiles/green-black.css @@ -8,6 +8,20 @@ body { font-size: 1.1em; } +#overlay{ + z-index: 10; + position: fixed; + top:0; + left:0; + width: 100%; + height: 100%; + background-color: rgba(0,0,0,0.8); +} + +.paddingbox{ + padding:2mm; +} + .nav{ list-style-type: none; padding: 0em; diff --git a/libresapi/src/webfiles/gui.jsx b/libresapi/src/webfiles/gui.jsx index c63eea42f..ecccc55c1 100644 --- a/libresapi/src/webfiles/gui.jsx +++ b/libresapi/src/webfiles/gui.jsx @@ -245,7 +245,6 @@ var Peers2 = React.createClass({ }, }); - var Peers3 = React.createClass({ mixins: [AutoUpdateMixin, SignalSlotMixin], getPath: function(){return "peers";}, @@ -320,6 +319,21 @@ var Peers3 = React.createClass({ }, }); +var OwnCert = React.createClass({ + mixins: [AutoUpdateMixin, SignalSlotMixin], + getPath: function(){return "peers/self/certificate";}, + getInitialState: function(){ + return {data: {cert_string: ""}}; + }, + render: function(){ + // use 
 tag for correct new line behavior!
+		return (
+		
+			{this.state.data.cert_string}
+		
);
+	},
+});
+
 var AddPeerWidget = React.createClass({
 	getInitialState: function(){
 		return {page: "start"};
@@ -344,6 +358,8 @@ var AddPeerWidget = React.createClass({
 		if(this.state.page === "start")
 			return(
 				

+					
Your own key, give it to your friends

+					
 					
paste your friends key below

 			        

 			        Retroshare webinterface
;
 		return (
 			

+				{/*
test
*/}
 				
 				
 				{menubutton}
diff --git a/libresapi/src/webfiles/index.html b/libresapi/src/webfiles/index.html
index 5c831b7a4..d2d80cee1 100644
--- a/libresapi/src/webfiles/index.html
+++ b/libresapi/src/webfiles/index.html
@@ -18,8 +18,8 @@
 
 
 	
loading lots of stuff...

-	

+	
 
 
diff --git a/libresapi/src/webui/green-black.css b/libresapi/src/webui/green-black.css
index 9058e10c3..5b24a5ea3 100644
--- a/libresapi/src/webui/green-black.css
+++ b/libresapi/src/webui/green-black.css
@@ -8,6 +8,20 @@ body {
 	font-size: 1.1em;
 }
 
+#overlay{
+	z-index: 10;
+	position: fixed;
+	top:0;
+	left:0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0,0,0,0.8);
+}
+
+.paddingbox{
+	padding:2mm;
+}
+
 .nav{
 	list-style-type: none;
 	padding: 0em;
diff --git a/libresapi/src/webui/gui.jsx b/libresapi/src/webui/gui.jsx
index c63eea42f..ecccc55c1 100644
--- a/libresapi/src/webui/gui.jsx
+++ b/libresapi/src/webui/gui.jsx
@@ -245,7 +245,6 @@ var Peers2 = React.createClass({
 	},
 });
 
-
 var Peers3 = React.createClass({
 	mixins: [AutoUpdateMixin, SignalSlotMixin],
 	getPath: function(){return "peers";},
@@ -320,6 +319,21 @@ var Peers3 = React.createClass({
 	},
 });
 
+var OwnCert = React.createClass({
+	mixins: [AutoUpdateMixin, SignalSlotMixin],
+	getPath: function(){return "peers/self/certificate";},
+	getInitialState: function(){
+		return {data: {cert_string: ""}};
+	},
+	render: function(){
+		// use 
 tag for correct new line behavior!
+		return (
+		
+			{this.state.data.cert_string}
+		
);
+	},
+});
+
 var AddPeerWidget = React.createClass({
 	getInitialState: function(){
 		return {page: "start"};
@@ -344,6 +358,8 @@ var AddPeerWidget = React.createClass({
 		if(this.state.page === "start")
 			return(
 				

+					
Your own key, give it to your friends

+					
 					
paste your friends key below

 			        

 			        Retroshare webinterface
;
 		return (
 			

+				{/*
test
*/}
 				
 				
 				{menubutton}
diff --git a/libresapi/src/webui/index.html b/libresapi/src/webui/index.html
index 5c831b7a4..d2d80cee1 100644
--- a/libresapi/src/webui/index.html
+++ b/libresapi/src/webui/index.html
@@ -18,8 +18,8 @@
 
 
 	
loading lots of stuff...

-	

+