Index: lang_fr.default/category_list.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/category_list.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -b -u -r1.2 -r1.4
--- lang_fr.default/category_list.html 16 May 2002 17:52:38 -0000 1.2
+++ lang_fr.default/category_list.html 12 Jun 2002 19:33:45 -0000 1.4
@@ -84,7 +84,7 @@
<%header_font%>^M
<%if cat_depth%><img src="<%image_url%>/clear_shim.gif" height=1 width="<%cat_depth * 25%>"><%endif%><a href="gforum.cgi?category=<%cat_id%>;<%hidden_query%>"><%cat_name%></a>^M
<%if current_user_id and cat_show_forums and main_page%><a href="gforum.cgi?<%if cat_hidden%>un<%endif%>hide_cat=<%cat_id%>;<%hidden_query%>" title="<%if cat_hidden%>Déplier<%else%>Plier<%endif%> cette catégorie"><small><%if cat_hidden%>[+]<%else%>[-]<%endif%></small></a><%endif%>^M
- <%if cat_desc%> - <%cat_desc%><%endif%>^M
+ <%if cat_desc%> - <%unescape_html cat_desc%><%endif%>
<%/header_font%>^M
</td>^M
</tr>^M
Index: lang_fr.default/include_message_display.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/include_message_display.html,v
retrieving revision 1.1
retrieving revision 1.4
diff -b -u -r1.1 -r1.4
--- lang_fr.default/include_message_display.html 30 Apr 2002 21:25:06 -0000 1.1
+++ lang_fr.default/include_message_display.html 12 Jun 2002 19:33:45 -0000 1.4
@@ -32,7 +32,8 @@
<%if preview%>^M
<b>À:</b> <%nbsp user_username%><br>^M
<% if user_icon%>^M
- <img src="<%image_url%>/<%user_icon%>" border=0>^M
+<%GForum::User::icon_dimensions($user_icon)%>
+ <img src="<%image_url%>/<%user_icon%>" border=0 width="<%icon_width%>" height="<%icon_height%>">
<% endif%>^M
<%else%>^M
<% if message_display_sent%>^M
@@ -44,9 +45,8 @@
<%nbsp msg_username%>^M
</a>^M
<% if user_icon%>^M
- <center>^M
- <img src="<%image_url%>/<%user_icon%>" border=0>^M
- </center>^M
+<%GForum::User::icon_dimensions($user_icon)%>
+ <img src="<%image_url%>/<%user_icon%>" border=0 width="<%icon_width%>" height="<%icon_height%>">
<% endif%>^M
<%endif%>^M
<br>^M
Index: lang_fr.default/include_post_common_write.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/include_post_common_write.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- lang_fr.default/include_post_common_write.html 1 May 2002 03:42:43 -0000 1.2
+++ lang_fr.default/include_post_common_write.html 12 Jun 2002 19:33:45 -0000 1.3
@@ -193,11 +193,11 @@
<input type="button" class="button" name="markup_tag_code" tabindex=30 value="code" onClick="javascript: addTag(this.value); this.value = (this.value == 'code' ? '/code' : 'code');">^M
<input type="button" class="button" name="markup_tag_reply" tabindex=30 value="répondre" onClick="javascript: addTag(this.value); this.value = (this.value == 'répondre' ? '/répondre' : 'répondre');">^M
<input type="button" class="button" name="markup_tag_quote" tabindex=30 value="citation" onClick="javascript: addTag(this.value); this.value = (this.value == 'citation' ? '/citation' : 'citation');">^M
- <input type="button" class="button" name="markup_tag_b" tabindex=30 value=" b " onClick="javascript: addTag(this.value == ' b ' ? 'b' : '/b'); this.value = (this.value == ' b ' ? ' /b ' : ' b ');" style="font-weight: bold">^M
- <input type="button" class="button" name="markup_tag_u" tabindex=30 value=" u " onClick="javascript: addTag(this.value == ' u ' ? 'u' : '/u'); this.value = (this.value == ' u ' ? ' /u ' : ' u ');" style="text-decoration: underline">^M
+ <input type="button" class="button" name="markup_tag_b" tabindex=30 value=" g " onClick="javascript: addTag(this.value == ' g ' ? 'g' : '/g'); this.value = (this.value == ' g ' ? ' /g ' : ' g ');" style="font-weight: bold">
+ <input type="button" class="button" name="markup_tag_u" tabindex=30 value=" s " onClick="javascript: addTag(this.value == ' s ' ? 's' : '/s'); this.value = (this.value == ' s ' ? ' /s ' : ' s ');" style="text-decoration: underline">
<input type="button" class="button" name="markup_tag_i" tabindex=30 value=" i " onClick="javascript: addTag(this.value == ' i ' ? 'i' : '/i'); this.value = (this.value == ' i ' ? ' /i ' : ' i ');" style="font-style: italic">^M
- <input type="button" class="button" name="markup_tag_email" tabindex=30 value="email" onClick="javascript: addTag(this.value); this.value = (this.value == 'email' ? '/email' : 'email');">^M
- <input type="button" class="button" name="markup_tag_url" tabindex=30 value="url" onClick="javascript: addTag(this.value); this.value = (this.value == 'url' ? '/url' : 'url');">^M
+ <input type="button" class="button" name="markup_tag_email" tabindex=30 value="courriel" onClick="javascript: addTag(this.value); this.value = (this.value == 'courriel' ? '/courriel' : 'courriel');">
+ <input type="button" class="button" name="markup_tag_url" tabindex=30 value="lien" onClick="javascript: addTag(this.value); this.value = (this.value == 'lien' ? '/lien' : 'lien');">
<br>^M
<%if forum_style % 2 and is_ie and ie_version >= 5.5%>^M
<br>^M
Index: lang_fr.default/include_post_display.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/include_post_display.html,v
retrieving revision 1.1
retrieving revision 1.4
diff -b -u -r1.1 -r1.4
--- lang_fr.default/include_post_display.html 30 Apr 2002 21:25:06 -0000 1.1
+++ lang_fr.default/include_post_display.html 12 Jun 2002 19:33:45 -0000 1.4
@@ -41,9 +41,11 @@
<br>^M
<%endif%>^M
^M
-<%if user_icon%>^M
- <center><img src="<%image_url%>/<%user_icon%>" border=0></center><br>^M
-<%endif%>^M
+<%if user_icon%><%if not current_user_id or current_user_show_user_icons%>
+<%-- The person viewing this page is either a guest or hasn't turned off viewing user icons --%>
+<%GForum::User::icon_dimensions($user_icon)%>
+ <img src="<%image_url%>/<%user_icon%>" border=0 width="<%icon_width%>" height="<%icon_height%>"><br>
+<%endif%><%endif%>
<br>^M
<%nbsp post_date%>^M
<br><br>^M
Index: lang_fr.default/language.txt
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/language.txt,v
retrieving revision 1.1
retrieving revision 1.3
diff -b -u -r1.1 -r1.3
--- lang_fr.default/language.txt 30 Apr 2002 21:25:06 -0000 1.1
+++ lang_fr.default/language.txt 12 Jun 2002 19:33:45 -0000 1.3
@@ -120,6 +120,10 @@
'USER_BANNED' => 'Vous avez été exclu',^M
'USER_DELETED' => '<i>Supprimé</i>',^M
'USER_DOES_NOT_EXIST' => 'Le nom d\'utilisateur que vous essayez d\'atteindre n\'existe pas',^M
+ 'USER_ICON_BAD_TYPE' => 'Vous avez essayé de transférer des images du type \'%s\', mais seuls les types d\'images suivants sont permis: %s',
+ 'USER_ICON_CURRENT' => 'Image personnalisée actuelle',
+ 'USER_ICON_SYSTEM_ERROR' => 'Une erreur système s\'est produite lors de la tentative de transfert de votre image :%s',
+ 'USER_ICON_TOO_LARGE' => 'Le poids de l\'image que vous avez essayé de transférer est plus grand que le poids maximum autorisé (%s)',
'USER_INVALID_USERNAME' => '%s n\'est pas un nom d\'utilisateur valide',^M
'USER_NEVER_LOGGED_IN' => 'L\'utilisateur ne s\'est jamais connecté',^M
'USER_NO_PRIVMSG' => '%s a choisi de ne pas recevoir de messages privés',^M
Index: lang_fr.default/markup_help.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/markup_help.html,v
retrieving revision 1.1
retrieving revision 1.3
diff -b -u -r1.1 -r1.3
--- lang_fr.default/markup_help.html 30 Apr 2002 21:25:06 -0000 1.1
+++ lang_fr.default/markup_help.html 13 Jun 2002 18:44:50 -0000 1.3
@@ -134,9 +134,9 @@
<td style="border-right:1px solid <%dark_beige%>">^M
<%body_font%>^M
<ol>^M
- <li>[url]http://www.gossamer-threads.com[/url]</li>^M
- <li>[url "http://www.gossamer-threads.com"]Gossamer Threads[/url]</li>^M
- <li>[email]gforum@gossamer-threads.com[/email]</li>^M
+ <li>[lien]http://www.gossamer-threads.com[/lien]</li>
+ <li>[lien "http://www.gossamer-threads.com"]Gossamer Threads[/lien]</li>
+ <li>[courriel]gforum@gossamer-threads.com[/courriel]</li>
</ol>^M
<%/body_font%>^M
</td>^M
Index: lang_fr.default/redirect.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/redirect.html,v
retrieving revision 1.1
retrieving revision 1.3
diff -b -u -r1.1 -r1.3
--- lang_fr.default/redirect.html 30 Apr 2002 21:25:06 -0000 1.1
+++ lang_fr.default/redirect.html 13 Jun 2002 18:44:29 -0000 1.3
@@ -11,7 +11,8 @@
new web site. If an offending web site looked at the URL you^M
were coming from, and you were using parameter-based^M
sessions, a malicious user could "hack" your Gossamer Forum^M
-account.^M
+account. Note: As of 1.1.6, this redirect is only used for
+people logging in without cookies.
^M
--%>^M
<html>^M
Index: lang_fr.default/user_profile_basic.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/user_profile_basic.html,v
retrieving revision 1.2
retrieving revision 1.5
diff -b -u -r1.2 -r1.5
--- lang_fr.default/user_profile_basic.html 16 May 2002 02:05:10 -0000 1.2
+++ lang_fr.default/user_profile_basic.html 12 Jun 2002 19:33:45 -0000 1.5
@@ -34,7 +34,7 @@
<%include include_logo.html%>^M
</td>^M
</tr>^M
-<form action="gforum.cgi" method=post>^M
+<form action="gforum.cgi" method="post" enctype="multipart/form-data">
<tr>^M
<td colspan="2">^M
<%hidden_form%>^M
@@ -62,7 +62,7 @@
<%body_font%>Nom d'Utilisateur:<%/body_font%>^M
</td>^M
<td>^M
-<%GForum::Config::tpl_get(username_allow_change)%>^M
+<%GForum::Config::tpl_get(username_allow_change, user_icon_allow_upload)%>
<%if username_allow_change%>^M
<input type=text name=user_username value="<%user_username%>" size=20 maxlength=50 class="button">^M
<input type="hidden" name="old_username" value="<%user_username%>">^M
@@ -167,8 +167,7 @@
</select>^M
</td>^M
</tr>^M
-<%-- The following section of code should be uncommented if you want users to be able to select icons. Be sure to delete the ending comment if you delete this one, 41 lines down^M
-<%GForum::User::icons('with blank')%>^M
+<%GForum::User::icons('with_leading_blank', $user_icon_allow_upload)%>
<tr>^M
<td align=right valign=top>^M
<%body_font%>Icon:<%/body_font%>^M
@@ -182,15 +181,15 @@
<table border=0 cellspacing=0 cellpadding=0>^M
<tr valign=center align=left>^M
<td>^M
- <%if first%> <%else%><img src="<%image_url%>/<%icon_filename%>" align=middle><%endif%>^M
+ <%if first%> <%elsif last and user_icon_allow_upload%><input type="file" class="button" name="user_icon_upload" onClick="document.getElementById('upload_radio').checked = 1"><%else%><img src="<%image_url%>/<%icon_filename%>" align="middle" width="<%icon_width%>" height="<%icon_height%>"><%endif%>
</td>^M
<td>^M
- <input type=radio name=user_icon value="<%if first%><%else%><%icon_filename%><%endif%>"<%if user_icon eq $icon_filename%> checked<%endif%>>^M
+ <input type="radio" name="user_icon" value="<%if first%><%elsif user_icon_allow_upload and last%>" id="upload_radio<%else%><%icon_filename%><%endif%>"<%if user_icon eq $icon_filename and not last%> checked<%endif%>>
</td>^M
</tr>^M
<tr>^M
<td colspan=2 align=center>^M
- <%body_font%><%if first%>Aucune<%else%><%icon_name%><%endif%><%/body_font%>^M
+ <%body_font%><%if first%>Aucune<%elsif last and user_icon_allow_upload%>Transférer nouvelle image<%else%><%icon_name%><%endif%><%/body_font%>
</td>^M
</tr>^M
</table>^M
@@ -208,7 +207,17 @@
</table>^M
</td>^M
</tr>^M
---%>^M
+ <tr>
+ <td align=right>
+ <%body_font%>Montrer les autres icônes utilisateur:<%/body_font%>
+ </td>
+ <td>
+ <select class="button" name="user_show_user_icons" size="1">
+ <option value="1"<%if user_show_user_icons%> selected<%endif%>>Yes</option>
+ <option value="0"<%ifnot user_show_user_icons%> selected<%endifnot%>>No</option>
+ </select>
+ </td>
+ </tr>
<tr>^M
<td align=right>^M
<%body_font%>Vrai Nom:<%/body_font%>^M
Index: lang_fr.default/user_view.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/user_view.html,v
retrieving revision 1.3
retrieving revision 1.5
diff -b -u -r1.3 -r1.5
--- lang_fr.default/user_view.html 17 May 2002 19:53:20 -0000 1.3
+++ lang_fr.default/user_view.html 12 Jun 2002 19:33:45 -0000 1.5
@@ -42,14 +42,12 @@
<%list_table%>^M
<tr>^M
<td bgcolor="<%even_color%>" align=center style="border-right:1px solid <%dark_beige%>">^M
-<%-- If you are using user icons, you should uncomment the section below. --%>^M
-<%--^M
<%if user_icon%>^M
- <img src="<%image_url%>/<%user_icon%>" border=0>^M
+<%GForum::User::icon_dimensions($user_icon)%>
+ <img src="<%image_url%>/<%user_icon%>" border=0 width="<%icon_width%>" height="<%icon_height%>">
<%else%>^M
^M
<%endif%>^M
---%> ^M
</td>^M
<td bgcolor="<%medium_green%>" align=left>^M
<%body_font%><font size=7><b><i><%nbsp user_username%></i></b></font><%/body_font%>^M
Index: lang_fr.default/whos_online.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.default/whos_online.html,v
retrieving revision 1.2
retrieving revision 1.5
diff -b -u -r1.2 -r1.5
--- lang_fr.default/whos_online.html 16 May 2002 02:09:01 -0000 1.2
+++ lang_fr.default/whos_online.html 12 Jun 2002 19:33:45 -0000 1.5
@@ -89,7 +89,7 @@
</td>^M
<% endif%>^M
<td>^M
- <%body_font%><%online_date%><%if user_localdate%> (<%GT::Date::date_get($user_localtime, '%h%:%MM% %tt')%>)<%/body_font%>^M
+ <%body_font%><%online_date%><%if user_localdate%> (<%GT::Date::date_get($user_localtime, '%h%:%MM% %tt%')%>)<%endif%><%/body_font%>
</td>^M
</tr>^M
<% endloop%>^M
Index: lang_fr.common/editor_dialog.css
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.common/editor_dialog.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -r1.1 -r1.2
--- lang_fr.common/editor_dialog.css 30 Apr 2002 21:25:05 -0000 1.1
+++ lang_fr.common/editor_dialog.css 12 Jun 2002 19:33:44 -0000 1.2
@@ -3,7 +3,7 @@
*^M
* dialog^M
* Author : Scott Beck^M
- * $Id: editor_dialog.css,v 1.1 2002/04/30 21:25:05 jagerman Exp $^M
+ * $Id: editor_dialog.css,v 1.2 2002/06/12 19:33:44 jagerman Exp $
*^M
* Copyright (c) 2000 Gossamer Threads Inc. All Rights Reserved.^M
* ==================================================================^M
Index: lang_fr.common/editor_iframe.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.common/editor_iframe.html,v
retrieving revision 1.1
retrieving revision 1.3
diff -b -u -r1.1 -r1.3
--- lang_fr.common/editor_iframe.html 30 Apr 2002 21:25:05 -0000 1.1
+++ lang_fr.common/editor_iframe.html 12 Jun 2002 19:33:44 -0000 1.3
@@ -1,8 +1,6 @@
<html>^M
-<head>^M
-^M
+ <head>
<%include include_css.html%>^M
-^M
<style type="text/css" media="screen">^M
<!--^M
<%include editor_style.css%>^M
@@ -30,22 +28,22 @@
<div class="toolbar" id="Format" title="Format" onselectstart="return parent.cancel_event ();">^M
<!--=====================================-->^M
<span title="Handle" class=tb_handle></span>^M
- <span id="bold" title="Bold Item" onclick="parent.command('Bold');" class="tb_menu_item">^M
- <img id="boldImage" title="Bold" class="tb_icon" src="<%image_url%>/toolbar/bold.gif" alt="Bold"></img>^M
+ <span id="bold" title="Gras" onclick="parent.command('Bold');" class="tb_menu_item">
+ <img id="boldImage" title="Gras" class="tb_icon" src="<%image_url%>/toolbar/bold.gif" alt="Bold"></img>
</span>^M
- <span id="italic" title="Italic Item" onclick="parent.command('Italic');" class="tb_menu_item">^M
- <img id="italicImage" title="Italic" class="tb_icon" src="<%image_url%>/toolbar/italic.gif" alt="Italic"></img>^M
+ <span id="italic" title="Italique" onclick="parent.command('Italic');" class="tb_menu_item">
+ <img id="italicImage" title="Italique" class="tb_icon" src="<%image_url%>/toolbar/italic.gif" alt="Italic"></img>
</span>^M
- <span id="underline" title="Underline Item" onclick="parent.command('Underline');" class="tb_menu_item">^M
- <img id="underlineImage" title="Underline" class="tb_icon" src="<%image_url%>/toolbar/under.gif" alt="Underline"></img>^M
+ <span id="underline" title="Souligné" onclick="parent.command('Underline');" class="tb_menu_item">
+ <img id="underlineImage" title="Souligné" class="tb_icon" src="<%image_url%>/toolbar/under.gif" alt="Underline"></img>
</span>^M
<!----------------------------------------->^M
<span title="Seperator" class="tb_sep"></span>^M
- <span title="Quote" onclick="parent.insertQuote()" class="tb_menu_item">^M
- <img title="Quote" class="tb_icon" src="<%image_url%>/toolbar/quote.gif" alt="Quote"></img>^M
+ <span title="Citation" onclick="parent.insertQuote()" class="tb_menu_item">
+ <img title="Citation" class="tb_icon" src="<%image_url%>/toolbar/quote.gif" alt="Citation"></img>
</span>^M
- <span title="Reply" onclick="parent.insertReply()" class="tb_menu_item">^M
- <img title="Reply" class="tb_icon" src="<%image_url%>/toolbar/reply.gif" alt="Reply"></img>^M
+ <span title="Répondre" onclick="parent.insertReply()" class="tb_menu_item">
+ <img title="Répondre" class="tb_icon" src="<%image_url%>/toolbar/reply.gif" alt="Répondre"></img>
</span>^M
<span title="Code" onclick="parent.insertCode()" class="tb_menu_item">^M
<img title="Code" class="tb_icon" src="<%image_url%>/toolbar/code.gif" alt="Code"></img>^M
@@ -53,13 +51,13 @@
<!----------------------------------------->^M
<span title="Seperator" class="tb_sep"></span>^M
<span id="jleft" title="Left Div" TEXT_MODE='no' onclick="parent.command('JustifyLeft');" class="tb_menu_item">^M
- <img id="jleftImage" title="Justify Left" class="tb_icon" src="<%image_url%>/toolbar/left.gif" alt="Justify Left"></img>^M
+ <img id="jleftImage" title="Gauche" class="tb_icon" src="<%image_url%>/toolbar/left.gif" alt="Justify Left"></img>
</span>^M
<span id="jcenter" title="Center Div" TEXT_MODE='no' onclick="parent.command('JustifyCenter');" class="tb_menu_item">^M
- <img id="jcenterImage" title="Justify Center" class="tb_icon" src="<%image_url%>/toolbar/center.gif" alt="Justify Center"></img>^M
+ <img id="jcenterImage" title="Centre" class="tb_icon" src="<%image_url%>/toolbar/center.gif" alt="Justify Center"></img>
</span>^M
<span id="jright" title="Right Div" TEXT_MODE='no' onclick="parent.command('JustifyRight');" class="tb_menu_item">^M
- <img id="jrightImage" title="Justify Right" class="tb_icon" src="<%image_url%>/toolbar/right.gif" alt="Justify Right"></img>^M
+ <img id="jrightImage" title="Droit" class="tb_icon" src="<%image_url%>/toolbar/right.gif" alt="Justify Right"></img>
</span>^M
<!----------------------------------------->^M
<span title="Seperator" class="tb_sep"></span>^M
@@ -78,10 +76,10 @@
<!----------------------------------------->^M
<span title="Sperator" class="tb_sep"></span>^M
<span title="Font Div" TEXT_MODE='no' onclick="parent.fontDialog()" class="tb_menu_item">^M
- <img title="Font Face" class="tb_icon" src="<%image_url%>/toolbar/font.gif" alt="Font Face"></img>^M
+ <img title="Police" class="tb_icon" src="<%image_url%>/toolbar/font.gif" alt="Font Face"></img>
</span>^M
<span title="Font Div" TEXT_MODE='no' onclick="parent.colorDialog()" class="tb_menu_item">^M
- <img title="Font Color" class="tb_icon" src="<%image_url%>/toolbar/font_color.gif" alt="Font Color"></img>^M
+ <img title="Couleur" class="tb_icon" src="<%image_url%>/toolbar/font_color.gif" alt="Font Color"></img>
</span>^M
</div>^M
<div class="toolbar" id="Misc" title="Misc" onselectstart="return parent.cancel_event();">^M
Index: lang_fr.common/editor_style.css
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/lang_fr.common/editor_style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -r1.1 -r1.2
--- lang_fr.common/editor_style.css 30 Apr 2002 21:25:05 -0000 1.1
+++ lang_fr.common/editor_style.css 12 Jun 2002 19:33:44 -0000 1.2
@@ -3,7 +3,7 @@
* HTML Editor - A wysiwyg web based editor for IE5.5+^M
* Website : http://gossamer-threads.com/^M
* Author : Scott Beck sbeck@gossamer-threads.com^M
- * Revision : $Id: editor_style.css,v 1.1 2002/04/30 21:25:05 jagerman Exp $^M
+ * Revision : $Id: editor_style.css,v 1.2 2002/06/12 19:33:44 jagerman Exp $
*^M
* Copyright (c) 2000 Gossamer Threads Inc. All Rights Reserved.^M
* Redistribution in part or in whole strictly prohibited. Please^M