Should finalize miniwiki integration

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1617 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/massmailer.inc.php b/include/massmailer.inc.php
index 1ac9aea..af9a5bd 100644 (file)
--- a/include/massmailer.inc.php
+++ b/include/massmailer.inc.php
@@ -133,7 +133,7 @@ abstract class MassMailer
     {
         $this->css($page);
         $page->assign('is_mail', false);
-        $page->assign('html_version', false);
+        $page->assign('mail_part', 'text');
         $page->assign('prenom', $prenom);
         $page->assign('nom', $nom);
         $page->assign('sexe', $sexe);
@@ -145,7 +145,7 @@ abstract class MassMailer
         $this->css($page);
         $page->assign('prefix', $this->_prefix . '/' . $this->id());
         $page->assign('is_mail', false);
-        $page->assign('html_version', true);
+        $page->assign('mail_part', 'html');
         $page->assign('prenom', $prenom);
         $page->assign('nom', $nom);
         $page->assign('sexe', $sexe);

diff --git a/modules/admin.php b/modules/admin.php
index e33f27b..216d5b1 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -793,6 +793,7 @@ class AdminModule extends PLModule
         $page->changeTpl('admin/valider.tpl');
         $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande');
                $page->addCssLink('nl.css');
+        $page->addJsLink('ajax.js');
         require_once("validations.inc.php");
 
 

diff --git a/modules/newsletter.php b/modules/newsletter.php
index a969875..d05c52a 100644 (file)
--- a/modules/newsletter.php
+++ b/modules/newsletter.php
@@ -108,6 +108,7 @@ class NewsletterModule extends PLModule
     
     function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
         $page->changeTpl('newsletter/edit.tpl');
+        $page->addCssLink('nl.css');
         $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : Edition'); 
         require_once("newsletter.inc.php");
         

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 208408a..a393e97 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -301,8 +301,8 @@ class XnetListsModule extends ListsModule
                          a.alias
                    FROM  x4dat.virtual_redirect AS vr
              INNER JOIN  x4dat.virtual          AS v  USING(vid)
-              LEFT JOIN  x4dat.aliases          AS a  ON(vr.redirect = CONCAT(a.alias, CONCAT('@', {?}))
-                                                        OR vr.redirect = CONCAT(a.alias, CONCAT('@', {?})))
+              LEFT JOIN  x4dat.aliases          AS a  ON(vr.redirect = CONCAT(a.alias, '@', {?})
+                                                        OR vr.redirect = CONCAT(a.alias, '@', {?}))
               LEFT JOIN  x4dat.auth_user_md5    AS u  ON(a.id = u.user_id)
               LEFT JOIN  groupex.membres        AS m2 ON(u.user_id = m2.uid AND m2.asso_id = {?})
               LEFT JOIN  groupex.membres        AS m  ON(m.email = vr.redirect AND m.asso_id = {?})

diff --git a/templates/include/form.valid.edit-nl.tpl b/templates/include/form.valid.edit-nl.tpl
index 41a39c9..f4bd369 100644 (file)
--- a/templates/include/form.valid.edit-nl.tpl
+++ b/templates/include/form.valid.edit-nl.tpl
@@ -26,4 +26,5 @@
 <br />
 <textarea rows="3" cols="60" name="nl_append">{$valid->art->_append}</textarea>
 
+
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/include/form.valid.edit-paiements.tpl b/templates/include/form.valid.edit-paiements.tpl
index d185314..1fe24e1 100644 (file)
--- a/templates/include/form.valid.edit-paiements.tpl
+++ b/templates/include/form.valid.edit-paiements.tpl
@@ -22,8 +22,10 @@
 
 <input type="text" name="pay_titre" size="50" maxlength="200" value="{$valid->titre}" />
 <br />
-<textarea rows="10" cols="60" name="pay_msg_reponse">{$valid->msg_reponse}</textarea>
+<div id="preview_{$valid->id()}" style="display: none; text-align: left"></div>
+<textarea rows="10" cols="60" id="msg_{$valid->id()}" name="pay_msg_reponse">{$valid->msg_reponse}</textarea>
 <br />
+<input type="submit" name="preview" value="Aperçu" onclick="previewWiki('msg_{$valid->id()}', 'preview_{$valid->id()}', true, 'preview_{$valid->id()}'); return false;" /><br />
 <strong>Site&nbsp;:</strong> <input type="text" name="pay_site" size="45" value="{$valid->site}" />
 <br>
 <strong>Montant&nbsp;:</strong> <input type="text" name="pay_montant" size="5" value="{$valid->montant}" /> 

diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl
index fde3192..fbbd359 100644 (file)
--- a/templates/newsletter/edit.tpl
+++ b/templates/newsletter/edit.tpl
@@ -194,6 +194,12 @@
         <textarea cols="68" rows="6" name='append'>{$art->append()}</textarea>
       </td>
     </tr>
+    <tr class="pair smaller">
+      <td></td>
+      <td>
+        <a href="wiki_help/notitle" class="popup3">{icon name=information} Voir la documentation du wiki</a>
+      </td>
+    </tr>
     <tr class='pair'>
       <td colspan='2' class='center'>
         <input type='submit' value='visualiser' />

diff --git a/templates/newsletter/nl.tpl b/templates/newsletter/nl.tpl
index fbb887d..00a4d1a 100644 (file)
--- a/templates/newsletter/nl.tpl
+++ b/templates/newsletter/nl.tpl
@@ -26,7 +26,7 @@
 {subject text=$nl->title(true)}
 {if isset(#replyto#)}{add_header name='Reply-To' value=#replyto#}{/if}
 {if isset(#retpath#)}{add_header name='Return-Path' value=#retpath#}{/if}
-{elseif $mail_part eq 'html'}
+{elseif $mail_part eq 'text'}
 {if !$is_mail}
 <pre style="width : 72ex; margin: auto">
 {/if}