From 865e89bf64324f6211fa7afbbcfbf95e5a0de038 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 27 Sep 2013 12:19:13 +0200 Subject: [PATCH] Update templates --- templates/web/admin/index.html.twig | 24 +- .../web/admin/task-manager/list.html.twig | 205 ++++++++++ .../task-editor/record-mover.html.twig | 4 +- .../task-manager/task-editor/task.html.twig | 34 +- templates/web/admin/task.html.twig | 226 ----------- templates/web/admin/tasks/list.html.twig | 352 ------------------ 6 files changed, 238 insertions(+), 607 deletions(-) create mode 100644 templates/web/admin/task-manager/list.html.twig delete mode 100644 templates/web/admin/task.html.twig delete mode 100644 templates/web/admin/tasks/list.html.twig diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig index ecc55dc671..8fe1b82766 100644 --- a/templates/web/admin/index.html.twig +++ b/templates/web/admin/index.html.twig @@ -18,7 +18,10 @@ + diff --git a/templates/web/admin/task-manager/task-editor/record-mover.html.twig b/templates/web/admin/task-manager/task-editor/record-mover.html.twig index 73298b7a9b..6fa94a1e60 100644 --- a/templates/web/admin/task-manager/task-editor/record-mover.html.twig +++ b/templates/web/admin/task-manager/task-editor/record-mover.html.twig @@ -85,7 +85,7 @@ data["taskid"]={{ task.getId() }}; data["cls"]="RecordMover"; data["xml"] = xml; - $.ajax({ url: "{{ path('admin_tasks_task_facility2', { 'id' : task.getID() }) }}" + $.ajax({ url: "{{ path('admin_tasks_task_facility', { 'task' : task.getID() }) }}" , data: data , dataType:'json' , type:"POST" @@ -127,7 +127,7 @@ data["taskid"]={{ task.getId() }}; data["cls"]="RecordMover"; data["xml"] = xml; - $.ajax({ url: "{{ path('admin_tasks_task_facility2', { 'id' : task.getID() }) }}" + $.ajax({ url: "{{ path('admin_tasks_task_facility', { 'task' : task.getID() }) }}" , data: data , dataType:'json' , type:"POST" diff --git a/templates/web/admin/task-manager/task-editor/task.html.twig b/templates/web/admin/task-manager/task-editor/task.html.twig index 41f666a707..7ba17c1577 100644 --- a/templates/web/admin/task-manager/task-editor/task.html.twig +++ b/templates/web/admin/task-manager/task-editor/task.html.twig @@ -2,11 +2,10 @@ {% block css %}{% endblock %}
{% if form.vars.errors|length > 0 %} {{ form_errors(form) }} @@ -14,7 +13,7 @@ {{ form_rest(form) }} - {% trans 'Cancel' %} + {% trans 'Cancel' %} @@ -113,7 +112,7 @@ $("#taskResetCrashCounterButton").click(function() { $.ajax({ - "url" : "{{ path('admin_tasks_task_reset2', {'id' : task.getId()}) }}", + "url" : "{{ path('admin_tasks_task_reset', {'task' : task.getId()}) }}", "dataType" : "json", "type" : "POST", success:function(data) { @@ -129,7 +128,7 @@ function xmlFromForm(callback) { var data = $("#graphicForm").serializeJSON(); data["xml"] = $("#txtareaxml").val(); - $.ajax({ url: "{{ path('admin_tasks_xml_from_form', {'id' : task.getId()}) }}" + $.ajax({ url: "{{ path('admin_tasks_xml_from_form', {'task' : task.getId()}) }}" , data: data , dataType:'text' , type:"POST" @@ -146,26 +145,25 @@ }); } - $("#taskSaveButton").click(function() + $("form[name='task-edit']").on('submit', function() { - xmlFromForm(function () { - $.ajax({ url: "../admin/task-manager2/task/{{task.getID()}}/save/" - , data: { - title:$("#taskTaskname").val(), - active:!!$("#taskTaskActive").attr("checked"), - xml:data - } + xmlFromForm(function (data) { + $("form[name='task-edit'] input[name='settings']").val(data); + formData = $("form[name='task-edit']").serializeArray(); + $.ajax({ + url: "{{ path('admin_tasks_task_save', { 'task' : task.getID() }) }}" + , data: formData , dataType:'json' , type:"POST" , async:false , success:function(data) { if (data.success) { - $("#taskFormByeBye").submit(); + loadRightAjax("{{ path('admin_tasks_list') }}"); } else { if (window.console) { console.log(data.message); } - alert("{% trans %}An error occured{% endtrans %}"); + alert("{% trans %}An error occured{% endtrans %} "+data.message); } } , error:function(jqXHR, textStatus, errorThrown) { @@ -173,6 +171,8 @@ } }); }); + + return false; }); }); diff --git a/templates/web/admin/task.html.twig b/templates/web/admin/task.html.twig deleted file mode 100644 index b1461d7ad2..0000000000 --- a/templates/web/admin/task.html.twig +++ /dev/null @@ -1,226 +0,0 @@ -
- - {{task.printInterfaceHEAD()}} - - - - {{task.printInterfaceJS()}} - - -
- - {{task.getName()}} id : {{task.getID()}} - - - - - - -
- {% trans 'admin::tasks: Nombre de crashes : ' %} {{task.getCrashCounter()}} - - -
-
- - -
- - - -
- {{task.getInterfaceHTML()|raw}} -
- - - -
-
- -
-
- -
- - - -
-
- - - - - -
-
-
- - diff --git a/templates/web/admin/tasks/list.html.twig b/templates/web/admin/tasks/list.html.twig deleted file mode 100644 index caccdbe61c..0000000000 --- a/templates/web/admin/tasks/list.html.twig +++ /dev/null @@ -1,352 +0,0 @@ - - -
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - -{% for task in task_manager.getTasks() %} - - - - - - - - - -{% endfor %} - - - - - - -
ID!{% trans 'admin::tasks: statut de la tache' %}{% trans 'admin::tasks: process_id de la tache' %}{% trans 'admin::tasks: etat de progression de la tache' %}{% trans 'admin::tasks: nom de la tache' %}
-
- - - - -
-
    TaskManager
- - {{ task.getID() }}  -
-
-
-
-
-
-
{{ task.getTitle() }} [{{ task.getName() }}]
- -
- - - -