Improves index page.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/modules/survey.php b/modules/survey.php
index d730af5..832d3a4 100644 (file)
--- a/modules/survey.php
+++ b/modules/survey.php
@@ -37,9 +37,20 @@ class SurveyModule extends PLModule
       */  );
     }
 
       */  );
     }
 

-    function handler_index(&$page, $action = null)
+    private function setup_page(PlPage $page)

     {
         $this->load('survey.inc.php');
     {
         $this->load('survey.inc.php');

+        $page->addJsLink('jquery.ui.core.js');
+        $page->addJsLink('jquery.ui.widget.js');
+        $page->addJsLink('jquery.ui.datepicker.js');
+        $page->addJsLink('jquery.ui.datepicker-fr.js');
+        $page->addJsLink('jquery.tmpl.js');
+        $page->addJsLink('survey.js');
+    }
+
+    function handler_index(&$page, $action = null)
+    {
+        $this->setup_page($page);

 
         $page->changeTpl('survey/index.tpl');
         $page->assign('active', Survey::iterActive());
 
         $page->changeTpl('survey/index.tpl');
         $page->assign('active', Survey::iterActive());


@@ -47,10 +58,9 @@ class SurveyModule extends PLModule
 
     function handler_vote(PlPage $page, $name)
     {
 
     function handler_vote(PlPage $page, $name)
     {

-        $this->load('survey.inc.php');
-        $page->addJsLink('jquery.tmpl.js');
-        $page->addJsLink('survey.js');
+        $this->setup_page($page);

         $page->changeTpl('survey/vote.tpl');
         $page->changeTpl('survey/vote.tpl');

+

         $survey = Survey::get($name);
         if (is_null($survey)) {
             return PL_NOT_FOUND;
         $survey = Survey::get($name);
         if (is_null($survey)) {
             return PL_NOT_FOUND;


@@ -75,13 +85,7 @@ class SurveyModule extends PLModule
 
     function handler_edit(PlPage $page, $name = null)
     {
 
     function handler_edit(PlPage $page, $name = null)
     {

-        $this->load('survey.inc.php');
-        $page->addJsLink('jquery.ui.core.js');
-        $page->addJsLink('jquery.ui.widget.js');
-        $page->addJsLink('jquery.ui.datepicker.js');
-        $page->addJsLink('jquery.ui.datepicker-fr.js');
-        $page->addJsLink('jquery.tmpl.js');
-        $page->addJsLink('survey.js');
+        $this->setup_page($page);

         $page->changeTpl('survey/edit.tpl');
 
         if (!is_null($name)) {
         $page->changeTpl('survey/edit.tpl');
 
         if (!is_null($name)) {


@@ -98,9 +102,7 @@ class SurveyModule extends PLModule
             $survey->begin     = Post::t('begin');
             $survey->end       = Post::t('end');
             $survey->flags     = 'validated';
             $survey->begin     = Post::t('begin');
             $survey->end       = Post::t('end');
             $survey->flags     = 'validated';

-            if (Post::b('anonymous')) {
-                $survey->flags->addFlag('anonymous');
-            }
+            $survey->flags->addFlag('anonymous', Post::b('anonymous'));

 
             $q_edit = Post::v('q_edit');
             $qs = array();
 
             $q_edit = Post::v('q_edit');
             $qs = array();

diff --git a/templates/survey/index.tpl b/templates/survey/index.tpl
index 0291a3a..c0ade2f 100644 (file)
--- a/templates/survey/index.tpl
+++ b/templates/survey/index.tpl
@@ -28,15 +28,27 @@
     <th>
       Sondages en cours
     </th>
     <th>
       Sondages en cours
     </th>

+    {if hasPerm('admin')}
+    <th></th>
+    {/if}

   </tr>
   {iterate from=$active item=survey}
   </tr>
   {iterate from=$active item=survey}

-  <tr>
+  <tr class="{cycle values="impair,pair"}">

     <td>
       <a href="survey/vote/{$survey->shortname}">{$survey->title}</a>
     </td>
     <td>
       <a href="survey/vote/{$survey->shortname}">{$survey->title}</a>
     </td>

+    {if hasPerm('admin')}
+    <td style="text-align: right">
+      <a href="survey/edit/{$survey->shortname}">{icon name=page_edit}</a>
+    </td>
+    {/if}

   </tr>
   {/iterate}
 </table>
 {/if}
 
   </tr>
   {/iterate}
 </table>
 {/if}
 

+<div class="center">
+  <a href="survey/edit">{icon name=page_edit} Proposer un nouveau sondage</a>
+</div>
+

 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}