Merge pull request #956 from annando/master

New database system that uses PDO if present/Test script for doing database upgrades.

view/en/smarty3/register_adminadd_eml.tpl

@@ -0,0 +1,32 @@
+Dear {{$username}},
+	the administrator of {{$sitename}} has set up an account for you.
+
+The login details are as follows:
+
+
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+Password:	{{$password}}
+
+You may change your password from your account "Settings" page after logging 
+in.
+
+Please take a few moments to review the other account settings on that page.
+
+You may also wish to add some basic information to your default profile 
+(on the "Profiles" page) so that other people can easily find you.
+
+We recommend setting your full name, adding a profile photo,
+adding some profile "keywords" (very useful in making new friends) - and 
+perhaps what country you live in; if you do not wish to be more specific
+than that.
+
+We fully respect your right to privacy, and none of these items are necessary. 
+If you are new and do not know anybody here, they may help
+you to make some new and interesting friends.  
+
+
+Thank you and welcome to {{$sitename}}.
+
+Sincerely,
+	{{$sitename}} Administrator

view/global.css

@@ -62,3 +62,42 @@ span.connector {
 .type-link img + br, .type-video img + br{
   display: none;
 }
+
+/* Shared Messages */
+.shared_header {
+  height: 32px;
+  color: #999;
+  border-top: 1px solid #D2D2D2;
+  padding-top: 5px;
+  margin-top: 5px;
+}
+
+.shared_header a {
+  color: black;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+
+.shared_header a:hover {
+  color: #36c;
+}
+
+.shared_header img {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  float: left;
+}
+
+.shared_header span {
+  margin-left: 9px;
+}
+
+blockquote.shared_content {
+  margin-left: 32px;
+  color: #000;
+  border: none;
+}

view/templates/pagetypes.tpl

@@ -3,8 +3,10 @@
  *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
+<h4>{{$user}}</h4>
 	{{include file="field_radio.tpl" field=$page_normal}}
-	{{include file="field_radio.tpl" field=$page_community}}
-	{{include file="field_radio.tpl" field=$page_prvgroup}}
 	{{include file="field_radio.tpl" field=$page_soapbox}}
 	{{include file="field_radio.tpl" field=$page_freelove}}
+<h4>{{$community}}</h4>
+	{{include file="field_radio.tpl" field=$page_community}}
+	{{include file="field_radio.tpl" field=$page_prvgroup}}

view/templates/theme_settings.tpl

@@ -0,0 +1 @@
+{{* Dummy file to avoid errors when installing themes *}}

view/theme/vier/style.css

@@ -233,44 +233,6 @@ div.pager {
   float: left;
 }
 
-.shared_header {
-  height: 32px;
-  color: #999;
-  border-top: 1px solid #D2D2D2;
-  padding-top: 5px;
-  margin-top: 5px;
-}
-
-.shared_header a {
-  color: black;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
-}
-
-.shared_header a:hover {
-  color: #36c;
-}
-
-.shared_header img {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  float: left;
-}
-
-.shared_header span {
-  margin-left: 9px;
-}
-
-blockquote.shared_content {
-  margin-left: 32px;
-  color: #000;
-  border: none;
-}
-
 #contact-edit-drop-link-end {
   /* clear: both; */
 }
@@ -953,7 +915,7 @@ aside #profiles-menu {
 }
 
 aside #search-text, aside #side-follow-url, aside #side-peoplefind-url {
-  width: 150px;
+  width: 140px;
   height: 17px;
   padding-left: 10px;
   /*border-top-left-radius: 15px;