aboutsummaryrefslogtreecommitdiffstats
path: root/view/fr
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-02-01 07:18:23 +0100
committerfabrixxm <fabrix.xm@gmail.com>2011-02-01 07:18:23 +0100
commit0bec0fc5fb5bfb02a80c6a84581d9daeb9f17813 (patch)
tree26afc64e0e9f7b1b240798bc457d4aa3c5fe5614 /view/fr
parente7d87e4ab3086b7cc10e92bfee769179f80a4d0d (diff)
parent7dbdf8e6faf082e962772b76511f0fd24b6227cc (diff)
downloadvolse-hubzilla-0bec0fc5fb5bfb02a80c6a84581d9daeb9f17813.tar.gz
volse-hubzilla-0bec0fc5fb5bfb02a80c6a84581d9daeb9f17813.tar.bz2
volse-hubzilla-0bec0fc5fb5bfb02a80c6a84581d9daeb9f17813.zip
Merge branch 'friendika-master'
Diffstat (limited to 'view/fr')
-rw-r--r--view/fr/contact_edit.tpl5
-rw-r--r--view/fr/jot.tpl7
2 files changed, 9 insertions, 3 deletions
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/fr/jot.tpl b/view/fr/jot.tpl
index 9a5c58153..7c49d771d 100644
--- a/view/fr/jot.tpl
+++ b/view/fr/jot.tpl
@@ -41,8 +41,13 @@
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
</div>
- <div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif" alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" />$bang</div>
+ <div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif" alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper');" />$bang</div>
<div id="profile-jot-perms-end"></div>
+ <div id="profile-jot-email-wrapper" style="display: none;" >
+ <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle">
+ <div id="profile-jot-email-end"></div>
+ </div>
+
<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
</div>