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: [PATCH] Add a link to user photos in Upload Profile Photo page

---
 mod/profile_photo.php             | 2 +-
 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 ++++--
 7 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 1bf4e176b8..4f0d567f40 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -188,7 +188,7 @@ function profile_photo_content(&$a) {
 		$tpl = load_view_file('view/profile_photo.tpl');
 
 		$o .= replace_macros($tpl,array(
-
+			'$user' => $a->user['nickname']
 		));
 
 		return $o;
diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl
index 9589522400..fe74b47465 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 d518e73312..30e51210a8 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 d518e73312..30e51210a8 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 d941743d4e..375197a925 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 61782f6e37..5dd0b87121 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 a1098f6a46..c7eb56fb13 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 */