diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-27 23:09:16 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-27 23:09:16 +0200 |
| commit | 8f6517965947b4a7bc44ca623e6e3db72d034484 (patch) | |
| tree | 7106cbfa52ff52c6ec9f1b79c8b6157a7ad84a64 | |
| parent | cd396d71477a4f54d58fc9f6fdb42c898bf194e8 (diff) | |
| parent | 799e4584fdd7aa1a56c519008fb9491377a1a92b (diff) | |
| download | Chimère-8f6517965947b4a7bc44ca623e6e3db72d034484.tar.bz2 Chimère-8f6517965947b4a7bc44ca623e6e3db72d034484.zip | |
Merge branch 'master' into saclay
| -rw-r--r-- | chimere/forms.py | 1 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/welcome.html | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 23bd295..818fa6e 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -122,6 +122,7 @@ class MarkerAdminForm(forms.ModelForm): """ Main form for marker """ + description = forms.CharField(widget=TextareaWidget) class Meta: model = Marker diff --git a/chimere/templates/chimere/blocks/welcome.html b/chimere/templates/chimere/blocks/welcome.html index abbf910..95ad1ac 100644 --- a/chimere/templates/chimere/blocks/welcome.html +++ b/chimere/templates/chimere/blocks/welcome.html @@ -5,11 +5,11 @@ function display_welcome(){$("#welcome").dialog({title:"{% trans "Welcome"%}", width:360});} $("#welcome_button").bind('click', display_welcome); -{% if display %}display_welcome();{%endif%} $(function(){ $('#welcome div.media-player').jmeEmbedControls(); $('#welcome video').each(function(index){$(this).pause()}); $('#welcome audio').each(function(index){$(this).pause()}); + {% if display %}display_welcome();{%endif%} }); </script> <div id='welcome' style='display:none'> |