Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/views.py

7 files changed, 81 insertions, 2 deletions

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 578b3edcc..1bab3d647 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -74,7 +74,7 @@
                 <td>
                   <select class='{{main_cls}}' id='current_{{model_name}}'>
                     <option class='normal' value=''>--</option>
-                    {% for val, label, selected, cls in items %}<option class='{{cls}}' value='{{val}}'{%if selected%} selected="selected"{%endif%}>{{label}}</option>
+                    {% for val, label, selected, cls in items %}<option class='{{cls}}' value='{{val}}'{% if selected %} selected="selected"{%endif%}>{{label}}</option>
                   {% endfor %}</select>
                 </td>{% with 'show-'|add:model_name as model_url%}
                 <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></td>
@@ -87,7 +87,7 @@
         {% endif %}{% endblock %}
     </div>{% endif %}
 {% if reminders %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend>
-{% for lbl, value in reminders%}
+{% for lbl, value in reminders %}
 <p><strong class='lbl'>{{lbl}}{% trans ":"%}</strong> <span class='value'>{{value}}</span></p>
 {% endfor %}
 </fieldset>{%endif%}
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 063a3c1da..c6a15243a 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -90,6 +90,7 @@ jQuery(document).ready(function(){
     width: null,
     shrinkToFit: false,
     rowNum:20,
+    {% if multiple_select %}multiselect: true,{% endif %}
     jsonReader : {repeatitems: false},
     loadError: function (jqXHR, textStatus, errorThrown) {
         alert("{% trans "An error as occured during search. Check your query fields." %}");
diff --git a/ishtar_common/templates/ishtar/basket_list.html b/ishtar_common/templates/ishtar/basket_list.html
new file mode 100644
index 000000000..a0a0e5d73
--- /dev/null
+++ b/ishtar_common/templates/ishtar/basket_list.html
@@ -0,0 +1,10 @@
+{% load i18n %}
+<table>
+<tr>{% for item in basket.items.all %}
+    <td><a class="display_details" href="#" onclick="load_window('{{item_url}}/{{item.pk}}/');">{% trans 'Details' %}</a></td>
+    <td>{{item.full_label}}</td>
+    <td><a class='async-link' data-target='#basket-content' href='{{delete_url}}/{{basket.pk}}/{{item.pk}}/'>{% trans "remove" %}</a></td></tr>{% endfor %}
+</table>
+<script type='text/javascript'>
+    $("a.async-link").click(manage_async_link);
+</script>
diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
index 7239b64fc..8850bd34a 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
@@ -42,6 +42,7 @@ setTimeout(
             alert("{% trans "An error as occured during search. Check your query fields." %}");
         }
       });
+      {% if large %}jQuery("#grid_{{name}}").jqGrid('setGridHeight', 400);{% endif %}
 }, 200);
 
 </script>
diff --git a/ishtar_common/templates/ishtar/form_delete.html b/ishtar_common/templates/ishtar/form_delete.html
new file mode 100644
index 000000000..6243e9423
--- /dev/null
+++ b/ishtar_common/templates/ishtar/form_delete.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+{% load i18n inline_formset %}
+{% block content %}
+<h2>{{page_name}}</h2>
+<div class='form'>
+<form enctype="multipart/form-data" action="." method="post"
+    onsubmit="return confirm('Do you really want to delete this item?');">{% csrf_token %}
+<table>
+{{form}}
+</table>
+<input type="submit" value="{% trans "Delete" %}"/>
+</form>
+</div>
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html
new file mode 100644
index 000000000..6332b326e
--- /dev/null
+++ b/ishtar_common/templates/ishtar/manage_basket.html
@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% load i18n inline_formset %}
+{% block content %}
+<h2>{{page_name}}{% trans ":"%} {{basket}}</h2>
+<form enctype="multipart/form-data" action="." method="post">{% csrf_token %}
+<div class='form'>
+<p class='alert'>{% trans 'Checking "Select all" only select the current page.' %}</p>
+{{form}}
+<button id='add_to' onclick='return false'>{% trans "Add" %}</button>
+<h3>{% trans "Basket content" %}</h3>
+<div id='basket-content' style='text-align:left'>
+</div>
+</div>
+</form>
+<script type='text/javascript' language='javascript'>
+
+function load_list(data){
+    $('#basket-content').html(data);
+}
+
+$('#add_to').click(function(){
+    var selected_items = jQuery("#grid_pk").getGridParam('selarrrow');
+    if(!selected_items) return false;
+    for (i = 0, n = selected_items.length; i < n; i++) {
+        var selected_item = selected_items[i];
+        $.ajax({
+            type: "POST",
+            url: '{{add_url}}',
+            data: {
+                basket_id: {{basket.pk}},
+                item_id: selected_item
+            },
+            success: load_list
+        });
+    }
+    return false;
+});
+jQuery(document).ready(function(){
+    $.get('{{list_url}}', load_list);
+});
+</script>
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/simple_form.html b/ishtar_common/templates/ishtar/simple_form.html
new file mode 100644
index 000000000..e3a464459
--- /dev/null
+++ b/ishtar_common/templates/ishtar/simple_form.html
@@ -0,0 +1,11 @@
+{% load i18n  %}
+<html>
+<body>
+<div class='form'>
+<form enctype="multipart/form-data" action="." method="post">{% csrf_token %}
+{{form}}
+<input type="submit" value="{% trans "Validate" %}"/>
+</form>
+</div>
+</body>
+</html>