From fb7959cfc0541604b9d931e2ba28af8411ab4685 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 4 Feb 2011 10:30:56 +0100
Subject: Add a link to user photos in Upload Profile Photo page

---
 view/de/profile_photo.tpl         | 6 +++++-
 view/en/profile_photo.tpl         | 6 +++++-
 view/fr/profile_photo.tpl         | 6 +++++-
 view/it/profile_photo.tpl         | 4 ++++
 view/theme/default/style.css      | 4 ++++
 view/theme/duepuntozero/style.css | 6 ++++--
 6 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl
index 958952240..fe74b4746 100644
--- a/view/de/profile_photo.tpl
+++ b/view/de/profile_photo.tpl
@@ -11,4 +11,8 @@
 <input type="submit" name="submit" id="profile-photo-submit" value="Upload">
 </div>
 
-</form>
\ No newline at end of file
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>
\ No newline at end of file
diff --git a/view/en/profile_photo.tpl b/view/en/profile_photo.tpl
index d518e7331..30e51210a 100644
--- a/view/en/profile_photo.tpl
+++ b/view/en/profile_photo.tpl
@@ -11,4 +11,8 @@
 <input type="submit" name="submit" id="profile-photo-submit" value="Upload">
 </div>
 
-</form>
\ No newline at end of file
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>
\ No newline at end of file
diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl
index d518e7331..30e51210a 100644
--- a/view/fr/profile_photo.tpl
+++ b/view/fr/profile_photo.tpl
@@ -11,4 +11,8 @@
 <input type="submit" name="submit" id="profile-photo-submit" value="Upload">
 </div>
 
-</form>
\ No newline at end of file
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div>
\ No newline at end of file
diff --git a/view/it/profile_photo.tpl b/view/it/profile_photo.tpl
index d941743d4..375197a92 100644
--- a/view/it/profile_photo.tpl
+++ b/view/it/profile_photo.tpl
@@ -12,3 +12,7 @@
 </div>
 
 </form>
+
+<div id="profile-photo-link-select-wrapper">
+o <a href='photos/$user'>seleziona una foto da un album</a>
+</div>
\ No newline at end of file
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 61782f6e3..5dd0b8712 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -734,6 +734,10 @@ input#dfrn-url {
 	margin-bottom: 20px;
 }
 
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
 #profile-edit-pdesc-label,
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index a1098f6a4..c7eb56fb1 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -602,6 +602,10 @@ input#dfrn-url {
 	margin-bottom: 20px;
 }
 
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
 #profile-edit-pdesc-label,
@@ -1853,8 +1857,6 @@ a.mail-list-link {
 	margin-bottom: 25px;
 }
 
-
-
 /* end from defautlt */
 	
 
-- 
cgit v1.2.3


From 4e913d59eabbddfc5428c4b0f91d1cd612f0dd5e Mon Sep 17 00:00:00 2001
From: olivierm <olivier@migeot.org>
Date: Sat, 5 Feb 2011 15:19:28 +0100
Subject: Fixed some typo (prevented Friendika to load with french locale)

---
 view/fr/strings.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view')

diff --git a/view/fr/strings.php b/view/fr/strings.php
index c64bba1b7..8bac6347f 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -293,6 +293,7 @@ $a->strings['Edit Album'] = 'Éditer l\'album';
 $a->strings['View Photo'] = 'Voir la photo';
 $a->strings['Photo not available'] = 'Photo indisponible';
 $a->strings['Edit photo'] = 'Éditer la photo';
+$a->strings['New album name'] = 'Nom du nouvel album';
 $a->strings['View Full Size'] = 'Voir en taille réelle';
 $a->strings['Tags: '] = 'Étiquettes: ';
 $a->strings['[Remove any tag]'] = '[Retirer toutes les étiquettes]';
-- 
cgit v1.2.3