diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-02-06 08:48:07 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-02-06 08:48:07 +0100 |
| commit | dd3f21b98ab2777fbfccb72d6caccaa5a5541310 (patch) | |
| tree | a554f7881fd17b4850125bbeb3a3a077c873b05f /view | |
| parent | 0c83fb4d807d2cdf78acc4bd206bc7b278b01f53 (diff) | |
| parent | d322bb461326adac29e4b3a16d6638de74da2348 (diff) | |
| download | volse-hubzilla-dd3f21b98ab2777fbfccb72d6caccaa5a5541310.tar.gz volse-hubzilla-dd3f21b98ab2777fbfccb72d6caccaa5a5541310.tar.bz2 volse-hubzilla-dd3f21b98ab2777fbfccb72d6caccaa5a5541310.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
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/fr/strings.php | 2 | ||||
| -rw-r--r-- | view/theme/default/style.css | 4 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 6 |
6 files changed, 24 insertions, 6 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/fr/strings.php b/view/fr/strings.php index 39e15eccf..8bac6347f 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -293,7 +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 nuovel album'; +$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]'; 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 */ |