add soapbox settings

6 files changed, 46 insertions, 14 deletions

diff --git a/mod/connections.php b/mod/connections.php
index f16c13bab..8e002d870 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -379,6 +379,7 @@ function connections_content(&$a) {
 			'$me'             => t('My Settings'),
 			'$perms'          => $perms,
 			'$forum'          => t('Forum Members'),
+			'$soapbox'        => t('Soapbox'),
 			'$full'           => t('Full Sharing'),
 			'$cautious'       => t('Cautious Sharing'),
 			'$follow'         => t('Follow Only'),
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index f35d3292d..6f22f8476 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -8,6 +8,19 @@ $db_user = '$dbuser';
 $db_pass = '$dbpass';
 $db_data = '$dbdata';
 
+/*
+ * Notice: Many of the following settings will be available in the admin panel 
+ * after a successful site install. Once they are set in the admin panel, they
+ * are stored in the DB - and the DB setting will over-ride any corresponding
+ * setting in this file
+ *
+ * The command-line tool util/config is able to query and set the DB items 
+ * directly if for some reason the admin panel is not available and a system
+ * setting requires modification. 
+ *
+ */ 
+
+
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
 // It can be changed later and only applies to timestamps for anonymous viewers.
 
@@ -16,7 +29,7 @@ $default_timezone = '$timezone';
 // What is your site name?
 
 $a->config['system']['baseurl'] = '$siteurl';
-$a->config['system']['sitename'] = "My Friend Network";
+$a->config['system']['sitename'] = "Red Matrix";
 $a->config['system']['location_hash'] = '$site_id';
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
@@ -54,6 +67,3 @@ $a->config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 $a->config['system']['theme'] = 'redbasic';
 
-// By default allow pseudonyms
-
-$a->config['system']['no_regfullname'] = true;
diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl
index 3af80374f..b4b7b5ed0 100644
--- a/view/en/smarty3/htconfig.tpl
+++ b/view/en/smarty3/htconfig.tpl
@@ -13,6 +13,19 @@ $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 
+/*
+ * Notice: Many of the following settings will be available in the admin panel 
+ * after a successful site install. Once they are set in the admin panel, they
+ * are stored in the DB - and the DB setting will over-ride any corresponding
+ * setting in this file
+ *
+ * The command-line tool util/config is able to query and set the DB items 
+ * directly if for some reason the admin panel is not available and a system
+ * setting requires modification. 
+ *
+ */ 
+
+
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
 // It can be changed later and only applies to timestamps for anonymous viewers.
 
@@ -21,7 +34,7 @@ $default_timezone = '{{$timezone}}';
 // What is your site name?
 
 $a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "My Friend Network";
+$a->config['system']['sitename'] = "Red Matrix";
 $a->config['system']['location_hash'] = '{{$site_id}}';
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
@@ -59,6 +72,3 @@ $a->config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 $a->config['system']['theme'] = 'redbasic';
 
-// By default allow pseudonyms
-
-$a->config['system']['no_regfullname'] = true;
diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index 8f35c19cc..9d4a03340 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -61,6 +61,15 @@ function connectForum() {
 	$('#me_id_perms_tag_deliver').attr('checked','checked');
 }
 
+function connectSoapBox() {
+	$('#me_id_perms_view_stream').attr('checked','checked');
+	$('#me_id_perms_view_profile').attr('checked','checked');
+	$('#me_id_perms_view_photos').attr('checked','checked');
+	$('#me_id_perms_view_contacts').attr('checked','checked');
+	$('#me_id_perms_view_storage').attr('checked','checked');
+	$('#me_id_perms_view_pages').attr('checked','checked');
+}
+
 
 function connectFollowOnly() {
 	$('#me_id_perms_send_stream').attr('checked','checked');
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index ba1baf9ee..7f20f3398 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -46,11 +46,12 @@ $slide
 <b>$quick</b>
 <ul>
 {{ if $self }}
-<li><a href="#" onclick="connectForum(); $('#abook-edit-form').submit();">$forum</a></li>
+<li><span class="fakelink" onclick="connectForum(); $('#abook-edit-form').submit();">$forum</span></li>
+<li><span class="fakelink" onclick="connectSoapBox(); $('#abook-edit-form').submit();">$soapbox</span></li>
 {{ endif }}
 <li><span class="fakelink" onclick="connectFullShare(); $('#abook-edit-form').submit();">$full</span></li>
-<li><a href="#" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">$cautious</a></li>
-<li><a href="#" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">$follow</a></li>
+<li><span class="fakelink" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">$cautious</span></li>
+<li><span class="fakelink" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">$follow</span></li>
 </ul>
 
 <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">$advanced</div>
diff --git a/view/tpl/smarty3/abook_edit.tpl b/view/tpl/smarty3/abook_edit.tpl
index a27b556f2..9f6556842 100644
--- a/view/tpl/smarty3/abook_edit.tpl
+++ b/view/tpl/smarty3/abook_edit.tpl
@@ -51,11 +51,12 @@
 <b>{{$quick}}</b>
 <ul>
 {{if $self}}
-<li><a href="#" onclick="connectForum(); $('#abook-edit-form').submit();">{{$forum}}</a></li>
+<li><span class="fakelink" onclick="connectForum(); $('#abook-edit-form').submit();">{{$forum}}</span></li>
+<li><span class="fakelink" onclick="connectSoapBox(); $('#abook-edit-form').submit();">{{$soapbox}}</span></li>
 {{/if}}
 <li><span class="fakelink" onclick="connectFullShare(); $('#abook-edit-form').submit();">{{$full}}</span></li>
-<li><a href="#" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">{{$cautious}}</a></li>
-<li><a href="#" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">{{$follow}}</a></li>
+<li><span class="fakelink" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">{{$cautious}}</span></li>
+<li><span class="fakelink" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">{{$follow}}</span></li>
 </ul>
 
 <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>