diff options
| -rw-r--r-- | static/saclay/js/interface.js | 18 | ||||
| -rw-r--r-- | templates/chimere/blocks/actions.html | 8 | ||||
| -rw-r--r-- | templates/chimere/default_extra_page.html | 2 | ||||
| -rw-r--r-- | templates/chimere/main_map.html | 1 |
4 files changed, 26 insertions, 3 deletions
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js index 686e66e..b8ab2d7 100644 --- a/static/saclay/js/interface.js +++ b/static/saclay/js/interface.js @@ -1,4 +1,6 @@ $(function(){ + $('#default-message').dialog({'autoOpen':false}); + var update_editmarker = function(){ $('#action-edit-event').removeClass('ui-state-active'); $('#action-edit-route').removeClass('ui-state-active'); @@ -94,4 +96,20 @@ $(function(){ $("#action-edit-event").click(update_editevent); $("#action-edit-marker").click(update_editmarker); $("#action-edit-route").click(update_editroute); + + $('.dyn-page').click(function(){ + url = $(this).filter('a').attr('href'); + $.ajax({url: url, + dataType: "html", + success: function (content) { + $('#default-message').html(content); + dialog_title = $("#default-message #dialog-title"); + $('#default-message').dialog('option', 'title', + dialog_title.html()); + dialog_title.remove(); + $('#default-message').dialog('open'); + } + }); + return false; + }); }); diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html index 67f401e..b13c5db 100644 --- a/templates/chimere/blocks/actions.html +++ b/templates/chimere/blocks/actions.html @@ -12,8 +12,10 @@ <li id='action-news' class='ui-widget ui-button ui-state-default ui-corner-all'> {% trans "News" %} </li> - <li id='action-participate' class='ui-widget ui-button ui-state-default ui-corner-all'> - {% trans "The project" %} - </li> + {% for action, subactions in actions %}{% if forloop.counter0 > 3 %} + <li class='ui-widget ui-button ui-state-default ui-corner-all {% ifequal action.id action_selected.0 %} ui-state-active{% endifequal %}'> + <a class='dyn-page' href='{{action.url}}'>{{ action.label }}</a> + </li> + {% endif %}{% endfor %} </ul> </div> diff --git a/templates/chimere/default_extra_page.html b/templates/chimere/default_extra_page.html new file mode 100644 index 0000000..aa098eb --- /dev/null +++ b/templates/chimere/default_extra_page.html @@ -0,0 +1,2 @@ +<h4 id='dialog-title'>{{title}}</h4> +{{content|safe}} diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index e5ec99e..a7991bd 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -78,6 +78,7 @@ </div> {{block.super}} <div id='main-map'></div> + <div id='default-message'></div> <script type="text/javascript"> $("#main-map").show(); </script> |