Merge commit 'mike/master'

9 files changed, 26 insertions, 45 deletions

diff --git a/view/de/netfriend.tpl b/view/de/netfriend.tpl
deleted file mode 100644
index 79a7a0940..000000000
--- a/view/de/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Genehmigen als: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Freund</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Verehrer</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/de/strings.php b/view/de/strings.php
index ef6892e8d..cc0319606 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -274,6 +274,9 @@ $a->strings['Hide Ignored Requests'] = 'Verberge ignorierte Anfragen';
 $a->strings['Claims to be known to you: '] = 'Behauptet dich zu kennen: ';
 $a->strings['yes'] = 'ja';
 $a->strings['no'] = 'nein';
+$a->strings['Approve as: '] = 'Genehmigen als: ';
+$a->strings['Friend'] = 'Freund';
+$a->strings['Fan/Admirer'] = 'Fan/Verehrer';
 $a->strings['Notification type: '] = 'Benachrichtigungs Typ: ';
 $a->strings['Friend/Connect Request'] = 'Kontakt-/Freundschaftsanfrage';
 $a->strings['New Follower'] = 'Neuer Bewunderer';
diff --git a/view/fr/netfriend.tpl b/view/fr/netfriend.tpl
deleted file mode 100644
index b041ec49f..000000000
--- a/view/fr/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Approve as: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Friend</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Admirer</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 8bac6347f..cbcf11ead 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -262,6 +262,9 @@ $a->strings['Hide Ignored Requests'] = 'Cacher les demandes ignorées';
 $a->strings['Claims to be known to you: '] = 'Prétend que vous le connaissez: ';
 $a->strings['yes'] = 'oui';
 $a->strings['no'] = 'non';
+$a->strings['Approve as: '] = 'Approuver en tant que: ';
+$a->strings['Friend'] = 'Ami';
+$a->strings['Fan/Admirer'] = 'Fan/Admirateur';
 $a->strings['Notification type: '] = 'Type de notification: ';
 $a->strings['Friend/Connect Request'] = 'Demande de connexion/relation';
 $a->strings['New Follower'] = 'Nouvel abonné';
diff --git a/view/it/netfriend.tpl b/view/it/netfriend.tpl
deleted file mode 100644
index d1cdf1a98..000000000
--- a/view/it/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Approva come: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Amico</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Ammiratore</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/it/strings.php b/view/it/strings.php
index d04e02167..2b4a84d05 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -236,6 +236,9 @@ $a->strings['Hide Ignored Requests'] = 'Nascondi richieste ignorate';
 $a->strings['Claims to be known to you: '] = 'Dice di conoscerti: ';
 $a->strings['yes'] = 'si';
 $a->strings['no'] = 'no';
+$a->strings['Approve as: '] = 'Approva come: ';
+$a->strings['Friend'] = 'Amico';
+$a->strings['Fan/Admirer'] = 'Fan/Admiratore';
 $a->strings['Notification type: '] = 'Tipo di notifica: ';
 $a->strings['Friend/Connect Request'] = 'Richiesta Amicizia/Connessione';
 $a->strings['New Follower'] = 'Nuovo Seguace';
diff --git a/view/en/netfriend.tpl b/view/netfriend.tpl
index b041ec49f..c2a92ce9e 100644
--- a/view/en/netfriend.tpl
+++ b/view/netfriend.tpl
@@ -1,13 +1,13 @@
-<div class="intro-approve-as-friend-desc">Approve as: </div>
+<div class="intro-approve-as-friend-desc">$approve_as</div>
 
 <div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Friend</label>
+	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">$as_friend</label>
 	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
 	<div class="intro-approve-friend-break" ></div>	
 </div>
 <div class="intro-approve-as-friend-end"></div>
 <div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Admirer</label>
+	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">$as_fan</label>
 	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
 	<div class="intro-approve-fan-break"></div>
 </div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 35ffe3a89..a820c381c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2019,3 +2019,9 @@ a.mail-list-link {
 }
 
 
+.calendar {
+	font-family: Courier, monospace;
+}
+.today {
+	color: #FF0000;
+}
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index e4ebeda7e..145123aaf 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2065,3 +2065,11 @@ a.mail-list-link {
 .tool-link {
   cursor: pointer;
 }
+
+
+.calendar {
+	font-family: Courier, monospace;
+}
+.today {
+	color: #FF0000;
+}