default publish to directory, but offer registration privacy setting.

generalise publish option template - so once translated we can merge them all.
Update strings.

4 files changed, 57 insertions, 5 deletions

diff --git a/view/profile_publish.tpl b/view/profile_publish.tpl
new file mode 100644
index 000000000..8fd0bc913
--- /dev/null
+++ b/view/profile_publish.tpl
@@ -0,0 +1,16 @@
+<p id="profile-publish-desc-$instance">
+$pubdesc
+</p>
+
+		<div id="profile-publish-yes-wrapper-$instance">
+		<label id="profile-publish-yes-label-$instance" for="profile-publish-yes-$instance">$str_yes</label>
+		<input type="radio" name="profile_publish_$instance" id="profile-publish-yes-$instance" $yes_selected value="1" />
+
+		<div id="profile-publish-break-$instance" ></div>	
+		</div>
+		<div id="profile-publish-no-wrapper-$instance">
+		<label id="profile-publish-no-label-$instance" for="profile-publish-no-$instance">$str_no</label>
+		<input type="radio" name="profile_publish_$instance" id="profile-publish-no-$instance" $no_selected value="0"  />
+
+		<div id="profile-publish-end-$instance"></div>
+		</div>
diff --git a/view/register.tpl b/view/register.tpl
index ed528bb33..3f57994ed 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -37,7 +37,7 @@
 	</div>
 	<div id="register-nickname-end" ></div>
 
-
+	$publish
 
 	<div id="register-submit-wrapper">
 		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 008cce059..916f191e1 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -275,8 +275,7 @@ div.wall-item-content-wrapper.shiny {
 }
 
 #register-submit-button {
-	margin-top: 50px;
-	margin-left: 350px;
+	margin-top: 10px;
 }
 
 #label-login-name, #label-login-password, #login-extra-filler {
@@ -678,6 +677,25 @@ input#dfrn-url {
 	margin-left: 20px;
 }
 
+#profile-publish-yes-reg,
+#profile-publish-no-reg {
+	float: left;
+	margin-bottom: 10px;
+}
+
+#profile-publish-yes-label-reg,
+#profile-publish-no-label-reg {
+	margin-left: 350px;
+	float: left;
+	width: 50px;
+}
+
+#profile-publish-break-reg,
+#profile-publish-end-reg {
+	clear: both;
+}
+
+
 #profile-edit-pdesc-desc,
 #profile-edit-keywords-desc {
 	float: left;
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index d34c81a45..e4ebeda7e 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -410,8 +410,7 @@ nav {
 }
 
 #register-submit-button {
-	margin-top: 50px;
-	margin-left: 350px;
+	margin-top: 10px;
 }
 
 #label-login-name, #label-login-password, #login-extra-filler {
@@ -812,6 +811,25 @@ input#dfrn-url {
 	margin-left: 20px;
 }
 
+#profile-publish-yes-reg,
+#profile-publish-no-reg {
+       float: left;
+       margin-bottom: 10px;
+}
+
+#profile-publish-yes-label-reg,
+#profile-publish-no-label-reg {
+       margin-left: 350px;
+       float: left;
+       width: 50px;
+}
+
+#profile-publish-break-reg,
+#profile-publish-end-reg {
+       clear: both;
+}
+
+
 
 #profile-edit-homepage {
 	float: left;