aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-02-04 10:30:56 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-02-04 10:30:56 +0100
commitfb7959cfc0541604b9d931e2ba28af8411ab4685 (patch)
tree56f4b747538c2bcdb867979eb5425e078c4ba8b9
parentd72f248b3c0279cf8b8b525012fbf1572815e99e (diff)
downloadvolse-hubzilla-fb7959cfc0541604b9d931e2ba28af8411ab4685.tar.gz
volse-hubzilla-fb7959cfc0541604b9d931e2ba28af8411ab4685.tar.bz2
volse-hubzilla-fb7959cfc0541604b9d931e2ba28af8411ab4685.zip
Add a link to user photos in Upload Profile Photo page
-rw-r--r--mod/profile_photo.php2
-rw-r--r--view/de/profile_photo.tpl6
-rw-r--r--view/en/profile_photo.tpl6
-rw-r--r--view/fr/profile_photo.tpl6
-rw-r--r--view/it/profile_photo.tpl4
-rw-r--r--view/theme/default/style.css4
-rw-r--r--view/theme/duepuntozero/style.css6
7 files changed, 28 insertions, 6 deletions
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 1bf4e176b..4f0d567f4 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 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 */