diff options
author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-01-31 09:54:08 +0100 |
---|---|---|
committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-01-31 09:54:08 +0100 |
commit | e962561f8d511129d87b5e50eede8e96b2bdfb7c (patch) | |
tree | ce3a0404855e11a59679f4b108433a74e38b3256 /view | |
parent | bf8dadb9700fd0600a38116bf03588883350aab1 (diff) | |
parent | d8877b88d6c26e29019312f02297411817692361 (diff) | |
download | volse-hubzilla-e962561f8d511129d87b5e50eede8e96b2bdfb7c.tar.gz volse-hubzilla-e962561f8d511129d87b5e50eede8e96b2bdfb7c.tar.bz2 volse-hubzilla-e962561f8d511129d87b5e50eede8e96b2bdfb7c.zip |
Merge remote branch 'friendika-master/master'
Diffstat (limited to 'view')
-rw-r--r-- | view/de/contact_edit.tpl | 5 | ||||
-rw-r--r-- | view/en/contact_edit.tpl | 5 | ||||
-rw-r--r-- | view/fr/contact_edit.tpl | 5 | ||||
-rw-r--r-- | view/it/contact_edit.tpl | 5 | ||||
-rw-r--r-- | view/theme/default/style.css | 3 | ||||
-rw-r--r-- | view/theme/duepuntozero/style.css | 4 |
6 files changed, 19 insertions, 8 deletions
diff --git a/view/de/contact_edit.tpl b/view/de/contact_edit.tpl index fcd3f2d66..0b32bdd66 100644 --- a/view/de/contact_edit.tpl +++ b/view/de/contact_edit.tpl @@ -3,6 +3,8 @@ <div id="contact-edit-banner-name">$name</div> +<form action="contacts/$contact_id" method="post" > +<input type="hidden" name="contact_id" value="$contact_id"> <div id="contact-edit-wrapper" > @@ -24,13 +26,12 @@ </div> <div id="contact-edit-nav-end"></div> -<form action="contacts/$contact_id" method="post" > -<input type="hidden" name="contact_id" value="$contact_id"> <div id="contact-edit-poll-wrapper"> <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div> <div id="contact-edit-poll-text">$updpub</div> $poll_interval + <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div> </div> </div> <div id="contact-edit-end" ></div> diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl index ea546b784..9aca60188 100644 --- a/view/en/contact_edit.tpl +++ b/view/en/contact_edit.tpl @@ -3,6 +3,8 @@ <div id="contact-edit-banner-name">$name</div> +<form action="contacts/$contact_id" method="post" > +<input type="hidden" name="contact_id" value="$contact_id"> <div id="contact-edit-wrapper" > @@ -24,13 +26,12 @@ </div> <div id="contact-edit-nav-end"></div> -<form action="contacts/$contact_id" method="post" > -<input type="hidden" name="contact_id" value="$contact_id"> <div id="contact-edit-poll-wrapper"> <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div> <div id="contact-edit-poll-text">$updpub</div> $poll_interval + <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div> </div> </div> <div id="contact-edit-end" ></div> diff --git a/view/fr/contact_edit.tpl b/view/fr/contact_edit.tpl index c7d2d5975..9f36ddcc4 100644 --- a/view/fr/contact_edit.tpl +++ b/view/fr/contact_edit.tpl @@ -3,6 +3,8 @@ <div id="contact-edit-banner-name">$name</div> +<form action="contacts/$contact_id" method="post" > +<input type="hidden" name="contact_id" value="$contact_id"> <div id="contact-edit-wrapper" > @@ -24,14 +26,13 @@ </div> <div id="contact-edit-nav-end"></div> -<form action="contacts/$contact_id" method="post" > -<input type="hidden" name="contact_id" value="$contact_id"> <div id="contact-edit-poll-wrapper"> <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div> <div id="contact-edit-poll-text">$updpub</div> $poll_interval + <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div> </div> </div> <div id="contact-edit-end" ></div> diff --git a/view/it/contact_edit.tpl b/view/it/contact_edit.tpl index d4217ba8c..ac0f13a54 100644 --- a/view/it/contact_edit.tpl +++ b/view/it/contact_edit.tpl @@ -3,6 +3,8 @@ <div id="contact-edit-banner-name">$name</div> +<form action="contacts/$contact_id" method="post" > +<input type="hidden" name="contact_id" value="$contact_id"> <div id="contact-edit-wrapper" > @@ -24,13 +26,12 @@ </div> <div id="contact-edit-nav-end"></div> -<form action="contacts/$contact_id" method="post" > -<input type="hidden" name="contact_id" value="$contact_id"> <div id="contact-edit-poll-wrapper"> <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div> <div id="contact-edit-poll-text">$updpub</div> $poll_interval + <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div> </div> </div> <div id="contact-edit-end" ></div> diff --git a/view/theme/default/style.css b/view/theme/default/style.css index 3ef63e265..ae45a4244 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -1333,6 +1333,9 @@ input#dfrn-url { #contact-edit-poll-text { margin-bottom: 10px; } +#contact-edit-update-now { + margin-top: 15px; +} #contact-edit-photo-wrapper { margin-bottom: 20px; diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 59a5bf88a..d6a1744a6 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1209,6 +1209,10 @@ input#dfrn-url { margin-bottom: 10px; } +#contact-edit-update-now { + margin-top: 15px; +} + #contact-edit-photo-wrapper { margin-bottom: 20px; } |