aboutsummaryrefslogtreecommitdiffstats
path: root/view/fr
diff options
context:
space:
mode:
Diffstat (limited to 'view/fr')
-rw-r--r--view/fr/contact_edit.tpl8
-rw-r--r--view/fr/jot-header.tpl16
-rw-r--r--view/fr/jot.tpl14
-rw-r--r--view/fr/profile_advanced.php4
-rw-r--r--view/fr/settings.tpl2
5 files changed, 34 insertions, 10 deletions
diff --git a/view/fr/contact_edit.tpl b/view/fr/contact_edit.tpl
index 79a7651c1..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" >
@@ -23,10 +25,14 @@
<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>
+
+
+
<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>
@@ -35,8 +41,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>
diff --git a/view/fr/jot-header.tpl b/view/fr/jot-header.tpl
index b687f65a6..d0c956a02 100644
--- a/view/fr/jot-header.tpl
+++ b/view/fr/jot-header.tpl
@@ -2,17 +2,20 @@
<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
+var editor;
+
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/,
- plugins : "bbcode",
- theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect",
+ plugins : "bbcode,paste",
+ theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
+ paste_text_sticky : true,
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
@@ -43,8 +46,13 @@ tinyMCE.init({
$('#character-counter').addClass('red');
}
$('#character-counter').text(text);
- });
- }
+ });
+
+ ed.onInit.add(function(ed) {
+ ed.pasteAsPlainText = true;
+ });
+
+ }
});
</script>
diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl
index 6590cace8..720cb0d1b 100644
--- a/view/fr/jot.tpl
+++ b/view/fr/jot.tpl
@@ -15,6 +15,8 @@
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
+
+
<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;" >
@@ -32,11 +34,21 @@
<div id="profile-nolocation-wrapper" style="display: none;" >
<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
</div>
+
+ <div id="profile-jot-plugin-wrapper" >
+ $jotplugins
+ </div>
+
<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>
diff --git a/view/fr/profile_advanced.php b/view/fr/profile_advanced.php
index 9aee6c262..f2c891383 100644
--- a/view/fr/profile_advanced.php
+++ b/view/fr/profile_advanced.php
@@ -39,8 +39,8 @@ EOT;
$o .= '<div id="advanced-profile-dob">'
. ((intval($a->profile['dob']))
- ? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y'))
- : day_translate(datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F')))
+ ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'],'j F, Y'))
+ : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6),'j F')))
. "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>';
diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl
index 5e1bfabf4..97d67cbf6 100644
--- a/view/fr/settings.tpl
+++ b/view/fr/settings.tpl
@@ -5,7 +5,7 @@
$nickname_block
-<form action="settings" id="settings-form" method="post" autocomplete="false" >
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
<h3 class="settings-heading">Basic Settings</h3>