diff options
| author | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-25 13:59:53 +0300 |
|---|---|---|
| committer | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-25 13:59:53 +0300 |
| commit | 94f895e98df73efe32a7c986a4b7844b0ab8fc01 (patch) | |
| tree | 92324c19bb13025d8f2f0087212348a039acbec6 /view | |
| parent | 00668aaa71336f48b141c443749a66c58a555503 (diff) | |
| parent | 7ea5917bf794c431fe304fa25380f19a6927cf63 (diff) | |
| download | volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.tar.gz volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.tar.bz2 volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.zip | |
Merge git://github.com/friendica/friendica
Diffstat (limited to 'view')
| -rw-r--r-- | view/en/update_fail_eml.tpl | 2 | ||||
| -rw-r--r-- | view/photos_upload.tpl | 3 | ||||
| -rw-r--r-- | view/profile_advanced.tpl | 13 | ||||
| -rw-r--r-- | view/profile_edit.tpl | 24 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 3 |
5 files changed, 44 insertions, 1 deletions
diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl index f68a3dece..548e1a0df 100644 --- a/view/en/update_fail_eml.tpl +++ b/view/en/update_fail_eml.tpl @@ -1,5 +1,5 @@ Hey,
-I'm $sitename.
+I'm $sitename;
The friendica developers released update $update recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and I can't do it alone. Please contact a
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl index 318a92427..706b3398d 100644 --- a/view/photos_upload.tpl +++ b/view/photos_upload.tpl @@ -1,4 +1,7 @@ <h3>$pagename</h3> + +<div id="photos-usage-message">$usage</div> + <form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" > <div id="photos-upload-new-wrapper" > <div id="photos-upload-newalbum-div"> diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl index 0b8f31f43..b02b7f27d 100644 --- a/view/profile_advanced.tpl +++ b/view/profile_advanced.tpl @@ -89,6 +89,19 @@ </dl> {{ endif }} +{{ if $profile.likes }} +<dl id="aprofile-likes" class="aprofile"> + <dt>$profile.likes.0</dt> + <dd>$profile.likes.1</dd> +</dl> +{{ endif }} + +{{ if $profile.dislikes }} +<dl id="aprofile-dislikes" class="aprofile"> + <dt>$profile.dislikes.0</dt> + <dd>$profile.dislikes.1</dd> +</dl> +{{ endif }} {{ if $profile.contact }} <dl id="aprofile-contact" class="aprofile"> diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl index ad34b9956..64cd47324 100644 --- a/view/profile_edit.tpl +++ b/view/profile_edit.tpl @@ -187,6 +187,30 @@ $lbl_hobbies </div> +<div id="likes-jot-wrapper" > +<p id="likes-jot-desc" > +$lbl_likes +</p> + +<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >$likes</textarea> + +</div> +<div id="likes-jot-end"></div> +</div> + + +<div id="dislikes-jot-wrapper" > +<p id="dislikes-jot-desc" > +$lbl_dislikes +</p> + +<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >$dislikes</textarea> + +</div> +<div id="dislikes-jot-end"></div> +</div> + + <div id="contact-jot-wrapper" > <p id="contact-jot-desc" > $lbl_social diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index de366210b..ea3a2da9c 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1644,6 +1644,9 @@ input#dfrn-url { display:block!important; } +#photos-usage-message { + margin-bottom: 15px; +} #acl-wrapper { |