diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-01-27 07:14:55 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-01-27 07:14:55 +0100 |
| commit | 444d82a5328433fbe48e18b928d35218905a756c (patch) | |
| tree | 84bd92072bf37eee3b54ebf7cb9ccaf408562e67 /view/en | |
| parent | 6558ee1e2210fb41b1f4d95f806ee441a565087d (diff) | |
| parent | d2dddd995abef2d0805901b278647bef0ce50f88 (diff) | |
| download | volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.gz volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.bz2 volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'view/en')
| -rw-r--r-- | view/en/contact_edit.tpl | 7 | ||||
| -rw-r--r-- | view/en/jot.tpl | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl index 79a7651c1..ea546b784 100644 --- a/view/en/contact_edit.tpl +++ b/view/en/contact_edit.tpl @@ -23,6 +23,10 @@ <a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a> </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> @@ -35,9 +39,6 @@ $insecure $blocked $ignored -<form action="contacts/$contact_id" method="post" > -<input type="hidden" name="contact_id" value="$contact_id"> - <div id="contact-edit-info-wrapper"> <h4>Contact Information / Notes</h4> <textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea> diff --git a/view/en/jot.tpl b/view/en/jot.tpl index 6590cace8..de88fb84f 100644 --- a/view/en/jot.tpl +++ b/view/en/jot.tpl @@ -15,6 +15,11 @@ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> +<div id="profile-jot-plugin-wrapper" > + $jotplugins +</div> +<div id="profile-jot-plugin-end"></div> + <div id="profile-jot-submit-wrapper" > <input type="submit" id="profile-jot-submit" name="submit" value="Share" /> <div id="profile-upload-wrapper" style="display: $visitor;" > |