X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fnewsletter%2Fedit.tpl;h=5ef95614780ee49608f84ba5fb9eafc3e1efb778;hb=3eaeedd1621a4ad6f3b89b01dcab4143e6f27545;hp=90ae27f0cdc0d92fdd4fc66a54a2fbbbc93dd84f;hpb=45ea6160465aeba0aa780e49c12272819dedffd1;p=platal.git

diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl
index 90ae27f..5ef9561 100644
--- a/templates/newsletter/edit.tpl
+++ b/templates/newsletter/edit.tpl
@@ -130,6 +130,14 @@
         <input type='text' size='60' name='signature' value="{$issue->signature}" />
       </td>
     </tr>
+    <tr>
+      <td class='titre'>
+        Adresse de réponse (optionnelle)
+      </td>
+      <td>
+        <input type='text' size='60' name='reply_to' value="{$issue->reply_to}" />
+      </td>
+    </tr>
     {if $nl->automaticMailingEnabled() && ($issue->isEditable() || $issue->isPending())}
     <tr>
       <td class='titre'>
@@ -137,59 +145,61 @@
       </td>
       <td>
         {if $issue->isEditable()}
-        Le {valid_date name="send_before_date" value=$issue->getSendBeforeDate() from=3 to=15} vers {html_select_time prefix="send_before_time_" time=$issue->getSendBeforeTime() display_hours=true display_minutes=false display_seconds=false display_meridian=false use_24_hours=true} heures
+        Le {valid_date name="send_before_date" value=$issue->getSendBeforeDate() from=1 to=15} vers {html_select_time prefix="send_before_time_" time=$issue->getSendBeforeTime() display_hours=true display_minutes=false display_seconds=false display_meridian=false use_24_hours=true} heures
         {else}
         Le {$issue->send_before|date_format:"%d/%m/%Y vers %Hh"}
         {/if}
       </td>
     </tr>
     {/if}
-    {if $issue->isEditable()}
-      {if $nl->criteria->hasFlag('promo')}
+    {if $nl->criteria->hasFlag('promo')}
       <tr>
-        <td class='titre'>
-          Promotions
-        </td>
+        <td class="titre">Promotions</td>
         <td>
-          <script type="text/javascript">/*<![CDATA[*/
-            {literal}
-            function updatepromofields(egal1) {
-              var f = egal1.form;
-              f.egal2.disabled = f.promo2.disabled = egal1.value == '=';
-              f.egal2.readOnly = true;
-              if (f.egal1.value == '>=') {
-                f.egal2.value = '<=';
-              } else {
-                f.egal2.value = '>=';
-              }
-            }
-            $(function() { updatepromofields($('select[name=egal1]')[0]); });
-            {/literal}
-          /*]]>*/</script>
-          <select name="egal1" onchange="updatepromofields(this)" style="text-align:center">
-            <option value="=" {if $smarty.request.egal1 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
-            <option value="&gt;=" {if $smarty.request.egal1 eq "&gt;="}selected="selected"{/if}>&nbsp;&gt;=&nbsp;</option>
-            <option value="&lt;=" {if $smarty.request.egal1 eq "&lt;="}selected="selected"{/if}>&nbsp;&lt;=&nbsp;</option>
-          </select>
-          <input type="text" name="promo1" size="4" maxlength="4" value="{$smarty.request.promo1}" />
-          &nbsp;et&nbsp;
-          <input type="text" name="egal2" size="1" style="text-align:center" value="{if t($smarty.request.egal2) eq '&lt;'}&lt;{else}&gt;{/if}" readonly="readonly" />
-          <input type="text" name="promo2" size="4" maxlength="4" value="{$smarty.request.promo2}" />
+          {if $issue->isEditable()}
+            {include file="include/select_promo.tpl" promo_data=$smarty.request egal1="egal1" egal2="egal2" promo1="promo1" promo2="promo2" edu_type="edu_type"}
+          {else}
+            {if t($smarty.request.promo1)}
+              {if $smarty.request.egal1 eq "="}
+                {$smarty.request.promo1}
+              {elseif t($smarty.request.promo2)}
+                {if $smarty.request.egal1 eq "&gt;="}
+                  {$smarty.request.promo1} à {$smarty.request.promo2}
+                {else}
+                  {$smarty.request.promo2} à {$smarty.request.promo1}
+                {/if}
+              {else}
+                {if $smarty.request.egal1 eq "&gt;="}
+                  après {$smarty.request.promo1}
+                {else}
+                  avant {$smarty.request.promo1}
+                {/if}
+              {/if}
+            {else}
+              Toutes les promotions
+            {/if}
+            {if $smarty.request.edu_type eq #UserFilter::GRADE_ING#}(X){/if}
+            {if $smarty.request.edu_type eq #UserFilter::GRADE_MST#}(Master){/if}
+            {if $smarty.request.edu_type eq #UserFilter::GRADE_PHD#}(Docteur){/if}
+          {/if}
         </td>
       </tr>
-      {/if}
-      {if $nl->criteria->hasFlag('axid')}
+    {/if}
+    {if $nl->criteria->hasFlag('axid')}
       <tr>
-        <td>Matricule AX</td>
+        <td class="titre">Matricule AX</td>
         <td>
-          <textarea name="axid" rows="10" cols="12">{$smarty.request.axid}</textarea>
-          <br />
-          <i>Entrer une liste de matricules AX (un par ligne)</i><br />
-          <input type="checkbox" name="axid_reversed" id="axid_reversed" {if $smarty.request.axid_reversed}checked="checked"{/if} value="1" />
-          Inverser la sélection <i>(sélectionner dans l'intervalle de promotions, à l'exception des matricules indiqués)</i>
+          {if $issue->isEditable()}
+            <textarea name="axid" rows="10" cols="12">{$smarty.request.axid}</textarea>
+            <br />
+            <i>Entrer une liste de matricules AX (un par ligne)</i><br />
+            <input type="checkbox" name="axid_reversed" id="axid_reversed" {if $smarty.request.axid_reversed}checked="checked"{/if} value="1" />
+            Inverser la sélection <i>(sélectionner dans l'intervalle de promotions, à l'exception des matricules indiqués)</i>
+          {else}
+            {$smarty.request.axid}
+          {/if}
         </td>
       </tr>
-      {/if}
     {/if}
     <tr class='center'>
       <td colspan='2'>