#514: Improve visibility of open events

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

diff --git a/ChangeLog b/ChangeLog
index f32d925..609059a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@ Bug/Wish:
     * Profile:
         - #502: Use 'alias' instead of 'aka' to specify the nickname       -FRU
 
+    * Xnet/Events:
+        - #490: Events can be opened to non-members                        -FRU
+        - #514: Improve visibility of open events                          -FRU
+
 From 0.9.11 branch:
 
     * Core:
@@ -38,9 +42,6 @@ From 0.9.11 branch:
         - #486: fix force login to see private fiche.                      -Car
         - #509: can access trombi of the current year promotion            -FRU
 
-    * Xnet/Events:
-        - #490: Events can be opened to non-members                        -FRU
-
 ================================================================================
 VERSION 0.9.11                                                 18 Septembre 2006
 

diff --git a/htdocs/css/xnet.css b/htdocs/css/xnet.css
index 10599b3..e184fa3 100644 (file)
--- a/htdocs/css/xnet.css
+++ b/htdocs/css/xnet.css
@@ -232,6 +232,10 @@ table.tinybicol .pair, table.bicol .pair {
 table.normal td { border: none; }
 
 th { background: #d0c198; }
+th.grayed {
+    background: #d0cbb0;
+    color: #666;
+}
 
 /***************************************************************************
  * Special pages

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 39147d0..22b4586 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -100,7 +100,7 @@ class XnetEventsModule extends PLModule
                  WHERE  asso_id = {?}"
             . (is_member() || may_update() ? "" : " AND accept_nonmembre != 0 ")
               . "GROUP BY  e.eid
-              ORDER BY  debut", S::v('uid'), $globals->asso('id'));
+                 ORDER BY  inscr_open DESC, debut DESC", S::v('uid'), $globals->asso('id'));
 
         $evts = array();
 

diff --git a/templates/xnetevents/index.tpl b/templates/xnetevents/index.tpl
index 6e2339b..2f282d1 100644 (file)
--- a/templates/xnetevents/index.tpl
+++ b/templates/xnetevents/index.tpl
@@ -35,8 +35,11 @@
     <col width='25%' />
   </colgroup>
   <tr>
-    <th colspan="2">
+    <th colspan="2"{if !$e.inscr_open} class="grayed"{/if}>
       {$e.intitule}
+      {if !$e.inscr_open}
+      (<span class="error">Inscriptions closes</span>)
+      {/if}
       {if $admin}
       <br />
       [<a href="{$platal->ns}events/edit/{$e.eid}">
@@ -74,6 +77,7 @@
     </td>
   </tr>
 
+  {if $admin || $e.show_participants || ($e.deadline_inscription && $e.inscr_open)}
   <tr>
     <td class="titre">Informations :</td>
     <td class='actions'>
@@ -83,16 +87,13 @@
         {icon name=group title="Liste des participants"}
       </a><br />
       {/if}
-      {if $e.deadline_inscription}
-        {if $e.inscr_open}
-          dernières inscriptions
-          le {$e.deadline_inscription|date_format:"%d %B %Y"}
-        {else}
-          <span class='error'>Inscriptions closes.</span><br />
-        {/if}
+      {if $e.deadline_inscription && $e.inscr_open}
+        dernières inscriptions
+        le {$e.deadline_inscription|date_format:"%d %B %Y"}
       {/if}
     </td>
   </tr>
+  {/if}
 
   <tr>
     <td class="titre">