Add a link to user photos in Upload Profile Photo page

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 1bf4e176b83473e191d87b2bb0bb960b87b2d413..4f0d567f407a265bf0cf8441e8ff532a33f52260 100644 (file)
--- 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 9589522400aaa8bd484e90e1873c50a04de4dc20..fe74b474652325deba460cd5b4fa77b65e7a2bb2 100644 (file)
--- 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 d518e73312efb290ad3e20852910128eca49912e..30e51210a8ff4aae71caf512c538b667f7a70f8f 100644 (file)
--- 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 d518e73312efb290ad3e20852910128eca49912e..30e51210a8ff4aae71caf512c538b667f7a70f8f 100644 (file)
--- 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 d941743d4ef47c19b4372fcedf144443ec6fa439..375197a925bcb213681211cf24ace89ad61074cd 100644 (file)
--- 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 61782f6e37399be07f038369598c8c97117ae7f8..5dd0b871211782c1adf67057f592c01d5582e04b 100644 (file)
--- 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 a1098f6a46f682e15d467b9d15c9d7de12583e32..c7eb56fb137072911870f156a6b4490726ebb695 100644 (file)
--- 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 */