Merge pull request #45 from annando/master

New HTML to BBCode converter, changes to BBCode, nginx support, ...

8 files changed, 481 insertions, 9 deletions

diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl
index f6e0adf4c..908d0df40 100755
--- a/view/de/friend_complete_eml.tpl
+++ b/view/de/friend_complete_eml.tpl
@@ -1,5 +1,5 @@
 
-Lieber $username,
+Liebe/r $username,
 
 großartige Neuigkeiten... '$fn' von '$dfrn_url' hat deine Kontaktaufnahme auf
 '$sitename' bestätigt.
diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl
index 46ffc8781..ff9b8a379 100755
--- a/view/de/intro_complete_eml.tpl
+++ b/view/de/intro_complete_eml.tpl
@@ -1,5 +1,5 @@
 
-Lieber $username,
+Liebe/r $username,
 
 '$fn' von '$dfrn_url' hat deine Kontaktanfrage auf '$sitename' bestätigt.
 
diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl
index 91b9b4c50..4c06d0c8d 100755
--- a/view/de/lostpass_eml.tpl
+++ b/view/de/lostpass_eml.tpl
@@ -1,5 +1,5 @@
 
-Lieber $username,
+Liebe/r $username,
 wir haben gerade eine Anfrage erhalten dein Passwort auf $sitename zu ändern.
 Um diese Anfrage zu bestätigen folge bitte dem Bestätigungslink oder kopiere
 ihn in die Adresszeile deines Browsers.
diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl
index 894fd4e88..d5e8d9048 100755
--- a/view/de/passchanged_eml.tpl
+++ b/view/de/passchanged_eml.tpl
@@ -1,5 +1,5 @@
 
-Lieber $username,
+Liebe/r $username,
 dein Passwort wurde wie gewünscht geändert. Bitte hebe diese Informationen
 für deine Unterlagen auf (oder ändere das Passwort augenblicklich in etwas
 das du dir merken kannst).
diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl
index ab7fed18c..d27c3c743 100755
--- a/view/de/register_open_eml.tpl
+++ b/view/de/register_open_eml.tpl
@@ -1,5 +1,5 @@
 
-Lieber $username,
+Liebe/r $username,
 danke für die Registrierung bei $sitename. Dein neuer Account wurde angelegt.
 Die Anmeldedetails sind die Folgenden.
 
diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl
index 15b83f64f..55fa98e96 100755
--- a/view/de/request_notify_eml.tpl
+++ b/view/de/request_notify_eml.tpl
@@ -1,5 +1,5 @@
 
-Lieber $myname,
+Liebe/r $myname,
 
 du hast gerade eine Kontaktanfrage von '$requestor' auf $sitename erhalten.
 
diff --git a/view/theme/vier/calendar.png b/view/theme/vier/calendar.png
new file mode 100755
index 000000000..705a75b8a
--- /dev/null
+++ b/view/theme/vier/calendar.png
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 96233c1da..89dd98146 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -122,6 +122,17 @@
 .next           { background-position: -110px -60px;}
 .tagged     { background-position: -130px -60px;}
 
+.attachtype {
+        display: block; width: 20px; height: 23px;
+        background-image: url('../../../images/content-types.png');
+}
+
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
 .icon.drop, .icon.drophide {
  float: left;
 }
@@ -200,9 +211,9 @@
 .icon.s16.delete {
   background-image: url("../../../images/icons/16/delete.png");
 }
-.icon.s16.edit {
+/*.icon.s16.edit {
   background-image: url("../../../images/icons/16/edit.png");
-}
+}*/
 .icon.s16.star {
   background-image: url("../../../images/icons/16/star.png");
 }
@@ -913,7 +924,7 @@ section {
 }
 .wall-item-container .wall-item-actions-tools {
   float: right;
-  width: 60px;
+  width: 80px;
 }
 .wall-item-container .wall-item-actions-tools a {
   float: right;
@@ -1028,7 +1039,13 @@ section {
 /* contacts menu */
 .contact-photo-wrapper {
   position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
 }
+
 .contact-photo {
   width: 48px;
   height: 48px;
@@ -1390,9 +1407,34 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
 #profile-edit-links li {
+  float: left;
   list-style: none;
+  margin-left: 10px;
 }
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
 /* oauth */
 .oauthapp {
   height: auto;
@@ -1449,3 +1491,433 @@ footer {
   height: 100px;
   display: table-row;
 }
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+}
+
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 42px;
+        height: 42px;
+        padding-right: 2px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#prvmail-wrapper, .mail-conv-detail, .mail-list-detail {
+        position: relative;
+        width: 500px;
+        padding: 50px;
+        margin: 20px auto;
+        background-color: #fff;
+        -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+        -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+        box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+
+#prvmail-wrapper:before, #prvmail-wrapper:after, .mail-conv-detail:before, .mail-conv-detail:after, .mail-list-detail:before, .mail-list-detail:after {
+        position: absolute;
+        width: 40%;
+        height: 10px;
+        content: ' ';
+        left: 12px;
+        bottom: 12px;
+        background: transparent;
+        -webkit-transform: skew(-5deg) rotate(-5deg);
+        -moz-transform: skew(-5deg) rotate(-5deg);
+        -ms-transform: skew(-5deg) rotate(-5deg);
+        -o-transform: skew(-5deg) rotate(-5deg);
+        transform: skew(-5deg) rotate(-5deg);
+        -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+        -moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+        box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+        z-index: -1;
+}
+
+#prvmail-wrapper:after, .mail-conv-detail:after, .mail-list-detail:after {
+        left: auto;
+        right: 12px;
+        -webkit-transform: skew(5deg) rotate(5deg);
+        -moz-transform: skew(5deg) rotate(5deg);
+        -ms-transform: skew(5deg) rotate(5deg);
+        -o-transform: skew(5deg) rotate(5deg);
+        transform: skew(5deg) rotate(5deg);
+}
+
+.prvmail-text {
+        width: 100%;
+}
+
+.mail-list-outside-wrapper {
+        margin-top: 20px;
+}
+
+.mail-list-sender {
+        float: left;
+        padding: 5px;
+        background-color: #efefef;
+        border: 2px dotted #eeeeee;
+        -moz-box-shadow: 3px 3px 4px #959494;
+        -webkit-box-shadow: 3px 3px 4px #959494;
+        box-shadow: 3px 3px 4px #959494;
+}
+
+.mail-list-detail {
+        margin-left: 100px;
+        width: 300px;
+        min-height: 70px;
+        padding: 20px;
+        padding-top:10px;
+        border: 1px solid #dddddd;
+        }
+        
+.mail-list-sender-name {
+        font-size: 1.1em;
+        display: inline;
+        font-variant:small-caps;
+}
+
+.mail-list-date {
+        float: right;
+        clear: block;
+        display: inline;
+        font-size: 0.9em;
+        padding-left: 10px;
+        font-stretch:ultra-condensed;
+        font-variant:small-caps;
+}
+
+.mail-list-subject {
+        clear: block;
+        font-size: 1.2em;
+        padding-top: 20px;
+        padding-right: 50px;
+}
+
+.mail-list-subject a {
+        color: #626262;
+}
+
+.mail-list-delete-wrapper { float: right;}
+.mail-list-outside-wrapper-end {
+        clear: both;
+}
+
+.mail-conv-outside-wrapper {
+        margin-bottom: 10px;
+}
+
+.mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
+.mail-conv-sender-photo {
+        width: 64px;
+        height: 64px;
+}
+
+.mail-conv-sender-name { float: left; font-variant:small-caps; font-style: bold; }
+.mail-conv-date { float: right; font-variant:small-caps; }
+.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
+.mail-conv-body {
+        clear: both;
+}
+
+.mail-conv-detail {
+        width: 500px;
+        padding: 30px;
+        padding-bottom: 10px;
+        margin-left: 20px;
+        margin-bottom: 0px;
+        vertical-align: middle;
+        margin: auto;
+        border: 1px solid #dddddd;
+}
+.mail-conv-break { display: none; border: none;}
+.mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; }
+
+/* ========== */
+/* = Events = */
+/* ========== */
+ 
+.clear { clear: both; }
+.eventcal {
+	float: left;
+	font-size: 20px;
+	padding: 20px;
+}
+
+.vevent {
+	position: relative;
+	width: 400px;
+	padding: 20px;
+	padding-top: 10px;
+	margin: 0 0px;
+	margin-bottom: 10px;
+	background-color: #fff;
+	-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+	-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+	box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+
+.vevent:before, .vevent:after {
+	position: absolute;
+	width: 40%;
+	height: 10px;
+	content: ' ';
+	left: 12px;
+	bottom: 12px;
+	background: transparent;
+	-webkit-transform: skew(-5deg) rotate(-5deg);
+	-moz-transform: skew(-5deg) rotate(-5deg);
+	-ms-transform: skew(-5deg) rotate(-5deg);
+	-o-transform: skew(-5deg) rotate(-5deg);
+	transform: skew(-5deg) rotate(-5deg);
+	-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+	box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
+	z-index: -1;
+}
+
+.vevent:after {
+	left: auto;
+	right: 12px;
+	-webkit-transform: skew(5deg) rotate(5deg);
+	-moz-transform: skew(5deg) rotate(5deg);
+	-ms-transform: skew(5deg) rotate(5deg);
+	-o-transform: skew(5deg) rotate(5deg);
+	transform: skew(5deg) rotate(5deg);
+}
+
+.vevent .event-description {
+	margin-left: 10px;
+	margin-right: 10px;
+	text-align:center;
+	font-size: 1.2em;
+	font-weight:bolder;
+}
+
+ .vevent .event-location{
+	margin-left: 10px;
+	margin-right: 10px;
+	font-size: 1em;
+	font-style: oblique;
+	text-align: center;
+	
+}
+
+.vevent .event-start, .vevent .event-end  {
+	margin-left: 20px;
+	margin-right: 20px;
+	margin-bottom: 2px;
+	margin-top: 2px;
+	font-size: 0.9em;
+	font-variant: small-caps;
+	text-align: left;
+}
+
+#new-event-link{
+	width: 130px;
+	padding: 7px;
+	margin-bottom: 10px;
+	margin-left: 170px; ;
+	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color:#bdbdbd;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+	color: #efefef;
+}
+
+#new-event-link:hover {
+	color: #efefef;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
+	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
+	background-color:#b20202;
+}
+
+#new-event-link:active {
+	background-color: #b20202;
+	position:relative;
+	top:1px;
+}
+
+#new-event-link a {
+	color: #efefef;
+	text-align: center;
+}
+
+.edit-event-link, .plink-event-link {
+	float: left;
+	margin-top: 4px;
+	margin-right: 4px;
+	margin-bottom: 15px;
+}
+
+.event-description:before {
+	content: url('calendar.png');
+	margin-right: 15px;
+	vertical-align: middle;
+}
+
+.event-start, .event-end {
+	margin-left: 10px;
+	width: 330px;
+}
+
+.event-start .dtstart, .event-end .dtend {
+	float: right;
+}
+
+.event-list-date {
+	color: #626262;
+	margin-bottom: 10px;
+	font-variant:small-caps;
+	font-stretch:condensed;
+}
+
+.prevcal, .nextcal {
+	float: left;
+	margin-left: 32px;
+	margin-right: 32px;
+	margin-top: 64px;
+}
+
+.event-calendar-end {
+	clear: both;
+}
+
+.calendar {
+	width: 300px;
+	font-family: Helvetica, Arial, sans-serif;
+	background-color: #f1f1f1;
+	border: 1px solid #dedede;
+	margin-bottom: 10px;
+	-moz-box-shadow: 5px 5px 8px #959494;
+	-webkit-box-shadow: 5px 5px 8px #959494;
+	box-shadow: 5px 5px 8px #959494;	
+}
+
+.calendar caption{
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #d60808), color-stop(1, #b20202) );
+	background:-moz-linear-gradient( center top, #d60808 5%, #b20202 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#d60808', endColorstr='#b20202');
+	background-color: #b20202;
+	padding: 10px 0px 10px 0px;
+	width: 300px;
+	color: #ffffff;
+	font-weight: bold;
+	text-align:center;
+	font-variant:small-caps;
+	-moz-box-shadow: 5px 2px 8px #959494;
+	-webkit-box-shadow: 5px 2px 8px #959494;
+	box-shadow: 5px 2px 8px #959494;
+}
+
+tr {
+	border: 1px solid #eeeeee;
+}
+
+.calendar td {
+	font-size: 14px;
+	text-align: center;
+	padding: 3px 0px;
+}
+
+.calendar td > a {
+	background-color: #cdcdcd;
+	padding: 2px;
+	color: #000;
+}
+
+.calendar th {
+	font-size: 16px;	
+}
+
+.today {
+	font-weight: bold;
+	text-align: center;
+	background-color: #b20202;
+	color: #fff;
+}
+ 
+#event-start-text, 
+#event-finish-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+
+#event-nofinish-checkbox, 
+#event-nofinish-text, 
+#event-adjust-checkbox, 
+#event-adjust-text,
+#event-share-checkbox {
+	float: left;
+}
+
+#event-datetime-break {
+	margin-bottom: 10px;
+}
+
+#event-nofinish-break, 
+#event-adjust-break,
+#event-share-break {
+	clear: both;
+}
+
+#event-desc-text, 
+#event-location-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+
+#event-submit {
+	margin-top: 10px;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+
+.directory-item {
+	float: left;
+	margin: 50px 50px 0px 0px;
+}
+
+.directory-details {
+	font-size: 0.9em;
+	font-variant: small-caps;
+	width: 160px;
+}
+
+.directory-name {
+	font-size: 1em;
+	font-variant: small-caps;
+	width: 150px;	
+}