Datepicker translation, minor theming improvements.

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

diff --git a/Makefile b/Makefile
index 2418710..0041ae2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ JSTREE_PATH=htdocs/javascript/jquery.jstree.js
 # TODO: jquery.autocomplete.js should rather be downloaded from an official source. The issue
 # is that the version we use is not available anymore on the Internet, and the latest version
 # we could use is not backward compatible with our current code.
-jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES) $(JQUERY_TMPL_PATH) $(JSTREE_PATH)
+jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES) $(JQUERY_TMPL_PATH) $(JSTREE_PATH) htdocs/javascript/jquery.ui.datepicker-fr.js
 
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F)
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
@@ -212,7 +212,11 @@ htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jqu
 htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js:
        @$(download)
 
-$(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).datepicker-fr.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/minified/i18n/jquery.ui.datepicker-fr.min.js
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).datepicker-fr.js:
+       @$(download)
+
+$(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js: htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
        ln -snf $(<F) $@
 
 htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js: DOWNLOAD_SRC = https://github.com/jquery/jquery-tmpl/raw/$(JQUERY_TMPL_VERSION)/jquery.tmpl.min.js --no-check-certificate

diff --git a/htdocs/css/base.css b/htdocs/css/base.css
index a38d408..10890c6 100644 (file)
--- a/htdocs/css/base.css
+++ b/htdocs/css/base.css
@@ -128,6 +128,15 @@
     overflow: hidden;
 }
 
+.ui-datepicker-calendar {
+    border-collapse: collapse;
+    text-align: right;
+}
+
+.ui-datepicker-calendar td {
+    width: 20px;
+}
+
 .ui-datepicker-week-end {
     background-color: #eee;
 }

diff --git a/htdocs/javascript/survey.js b/htdocs/javascript/survey.js
index abd6aca..fb944cd 100644 (file)
--- a/htdocs/javascript/survey.js
+++ b/htdocs/javascript/survey.js
@@ -30,4 +30,12 @@
 })(jQuery);
 
 
+$(function() {
+    $(".datepicker").datepicker({
+        hideIfNoPrevNext: true,
+        minDate: new Date()
+    });
+});
+
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:

diff --git a/modules/survey.php b/modules/survey.php
index c6a3914..1d0c014 100644 (file)
--- a/modules/survey.php
+++ b/modules/survey.php
@@ -109,6 +109,7 @@ class SurveyModule extends PLModule
         $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');
         $page->changeTpl('survey/edit.tpl');

diff --git a/templates/survey/edit.tpl b/templates/survey/edit.tpl
index 9c6145d..6a2d274 100644 (file)
--- a/templates/survey/edit.tpl
+++ b/templates/survey/edit.tpl
@@ -28,23 +28,14 @@
 
     Titre&nbsp;: <input type="text" name="title" /><br />
     Nom&nbsp;: <input type="text" name="shortname" /><br />
+    Description&nbsp;:<br /><textarea name="description" style="width: 100%"></textarea>
+  </fieldset>
 
+  <fieldset>
+    <legend>Déroulement du sondage</legend>
     Premier jour&nbsp;: <input type="text" class="datepicker" name="begin" /><br />
     Dernier jour&nbsp;: <input type="text" class="datepicker" name="end" /><br />
   </fieldset>
 </form>
 
-{literal}
-<script type="text/javascript">
-  //<![CDATA[
-  $($(".datepicker").datepicker({
-    dateFormat: 'dd/mm/yyyy',
-    firstDay: 1,
-    hideIfNoPrevNext: true,
-    minDate: new Date()
-  }));
-  //]]>
-</script>
-{/literal}
-
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}

diff --git a/templates/survey/questions.tpl b/templates/survey/vote.questions.tpl
similarity index 100%
rename from templates/survey/questions.tpl
rename to templates/survey/vote.questions.tpl

diff --git a/templates/survey/vote.tpl b/templates/survey/vote.tpl
index ad20cc7..e76065e 100644 (file)
--- a/templates/survey/vote.tpl
+++ b/templates/survey/vote.tpl
@@ -34,7 +34,7 @@
   </div>
 </form>
 
-{include file="survey/questions.tpl"}
+{include file="survey/vote.questions.tpl"}
 
 <script type="text/javascript">
   //<![CDATA[