diff options
| author | Friendika <info@friendika.com> | 2011-02-05 13:05:57 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-05 13:05:57 -0800 |
| commit | 8a55168d4f470fb06b2e02896541688d3967bae5 (patch) | |
| tree | d00fe193bfdde9c94a9b11ef96ef348150137f64 /view | |
| parent | ebbdb7b301d8ab5a1eb249a68888d1dd772a06c3 (diff) | |
| parent | fb7959cfc0541604b9d931e2ba28af8411ab4685 (diff) | |
| download | volse-hubzilla-8a55168d4f470fb06b2e02896541688d3967bae5.tar.gz volse-hubzilla-8a55168d4f470fb06b2e02896541688d3967bae5.tar.bz2 volse-hubzilla-8a55168d4f470fb06b2e02896541688d3967bae5.zip | |
Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master
Diffstat (limited to 'view')
| -rw-r--r-- | view/de/profile_photo.tpl | 6 | ||||
| -rw-r--r-- | view/en/profile_photo.tpl | 6 | ||||
| -rw-r--r-- | view/fr/profile_photo.tpl | 6 | ||||
| -rw-r--r-- | view/theme/default/style.css | 4 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 6 |
5 files changed, 23 insertions, 5 deletions
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/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 */ |