From c45a544a1d39874a5a4fcd748fe2f4d8c4f8d48b Mon Sep 17 00:00:00 2001
From: Ludvig Wadenstein <ludvig.wadenstein@codemill.se>
Date: Sun, 2 Jun 2013 20:17:04 +0200
Subject: [PATCH 1/4] List row links to update or read page based on
 permissions

---
 .../templates/admin2/bootstrap/model_list.html    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/djadmin2/templates/admin2/bootstrap/model_list.html b/djadmin2/templates/admin2/bootstrap/model_list.html
index cc8f058..6cc3068 100644
--- a/djadmin2/templates/admin2/bootstrap/model_list.html
+++ b/djadmin2/templates/admin2/bootstrap/model_list.html
@@ -46,15 +46,14 @@
                     <tr>
                         <td><input type="checkbox" class="model-select" name="selected_model_pk" value="{{ obj.pk }}"></td>
                         <td>
-                            {{ obj }}
-                            {% if permissions.has_view_permission %}
-                            <a href="{% url view|admin2_urlname:'detail' pk=obj.pk %}">{% trans "Detail" %}</a>
-                            {% endif %}
                             {% if permissions.has_change_permission %}
-                            <a href="{% url view|admin2_urlname:'update' pk=obj.pk %}">{% trans "Edit" %}</a>
-                            {% endif %}
-                            {% if permissions.has_delete_permission %}
-                            <a href="{% url view|admin2_urlname:'delete' pk=obj.pk %}">{% trans "Delete" %}</a>
+								<a href="{% url view|admin2_urlname:'update' pk=obj.pk %}">{{ obj }}</a>
+							{% else %}
+                            	{% if permissions.has_view_permission %}
+                            		<a href="{% url view|admin2_urlname:'detail' pk=obj.pk %}">{{ obj }}</a>
+								{% else %}
+									{{ obj }}
+                            	{% endif %}
                             {% endif %}
                         </td>
                     </tr>

From 574037acfe40ece29fa66e753aeb9dca423e950f Mon Sep 17 00:00:00 2001
From: Ludvig Wadenstein <ludvig.wadenstein@codemill.se>
Date: Sun, 2 Jun 2013 20:18:47 +0200
Subject: [PATCH 2/4] Chackbox column has apropriate width

---
 djadmin2/templates/admin2/bootstrap/model_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/djadmin2/templates/admin2/bootstrap/model_list.html b/djadmin2/templates/admin2/bootstrap/model_list.html
index 6cc3068..d7b73ac 100644
--- a/djadmin2/templates/admin2/bootstrap/model_list.html
+++ b/djadmin2/templates/admin2/bootstrap/model_list.html
@@ -38,7 +38,7 @@
 
             <table class="table table-bordered table-striped">
                 <thead>
-                    <th><input type="checkbox" class="model-select-all"></th>
+                    <th class="checkbox-column"><input type="checkbox" class="model-select-all"></th>
                     <th>{{ model_name }}</th>
                 </thead>
                 <tbody>

From a802dfe8ae5bb3b6ba03c4566d6a61520f2d12b1 Mon Sep 17 00:00:00 2001
From: Ludvig Wadenstein <ludvig.wadenstein@codemill.se>
Date: Sun, 2 Jun 2013 20:58:27 +0200
Subject: [PATCH 3/4] Replaced actions select with button dropdown.

---
 .../static/themes/bootstrap/js/actions.js     | 15 ++++++++++--
 .../admin2/bootstrap/model_list.html          | 24 ++++++++++++-------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/djadmin2/static/themes/bootstrap/js/actions.js b/djadmin2/static/themes/bootstrap/js/actions.js
index daf3f0b..9ee124f 100644
--- a/djadmin2/static/themes/bootstrap/js/actions.js
+++ b/djadmin2/static/themes/bootstrap/js/actions.js
@@ -9,8 +9,8 @@ $(function() {
 		for (var ix = 0; ix < selectCheckboxen.length; ix++) {
 			if ($(selectCheckboxen[ix]).prop('checked')) {
 				count++;
-			};
-		};
+			}
+		}
 		selectAllCheckbox.prop('checked', count == selectCheckboxen.length);
 		selectedCount.text(count);
 	};
@@ -23,4 +23,15 @@ $(function() {
 	selectCheckboxen.click(function(e) {
 		updateSelectedCount();
 	});
+
+    
+    var actionDropdownLink = element.find('.dropdown-menu a');
+    actionDropdownLink.click(function (e) {
+        e.preventDefault();
+        var form = $(this).closest('form');
+        form.find('input[name="' + $(this).data('name') + '"]').val(
+            $(this).data('value'));
+        form.submit();
+    });
+
 });
diff --git a/djadmin2/templates/admin2/bootstrap/model_list.html b/djadmin2/templates/admin2/bootstrap/model_list.html
index d7b73ac..aa46b7d 100644
--- a/djadmin2/templates/admin2/bootstrap/model_list.html
+++ b/djadmin2/templates/admin2/bootstrap/model_list.html
@@ -19,16 +19,22 @@
 
 <div id="model-list" class="row">
     <form id="model-list-form" class="form-inline" method="post">
+    	{% csrf_token %}
         <div class="span12">
             <div class="navbar">
-                {% csrf_token %}
-                <select name="action">
-                    {% for action in actions %}
-                    <option value="{{ action.name }}">{{ action.description }}</option>
-                    {% endfor %}
-                </select>
-                <button type="Submit" class="btn">Go</button>
-		<span id="selected-count">0</span> of {{ object_list|length }} selected
+				<div class="btn-group">
+            	    <button class="btn dropdown-toggle" data-toggle="dropdown">
+            	        Actions
+            	        <span class="caret"></span>
+            	    </button>
+            	    <ul class="dropdown-menu">
+                    	{% for action in actions %}
+							<li><a tabindex="-1" href="#" data-name="action" data-value="{{ action.name }}">{{ action.description }}</a></li>
+                    	{% endfor %}
+            	    </ul>
+            	</div>
+				<input type="hidden" name="action" value="" />
+            	<small class="muted"><span id="selected-count">0</span> of {{ object_list|length }} selected</small>
                 <div class="pull-right">
                     {% if permissions.has_add_permission %}
                     <a href="{% url view|admin2_urlname:'create' %}" class="btn"><i class="icon-plus"></i> {% blocktrans with model_verbose_name=model|model_verbose_name %}Add {{ model_verbose_name }}{% endblocktrans %}</a>
@@ -39,7 +45,7 @@
             <table class="table table-bordered table-striped">
                 <thead>
                     <th class="checkbox-column"><input type="checkbox" class="model-select-all"></th>
-                    <th>{{ model_name }}</th>
+                    <th>{{ model_name|capfirst }}</th>
                 </thead>
                 <tbody>
                     {% for obj in object_list %}

From 9c296ccff58457acbdcf2d2f4b3201c3ddbe28c1 Mon Sep 17 00:00:00 2001
From: Ludvig Wadenstein <ludvig.wadenstein@codemill.se>
Date: Sun, 2 Jun 2013 21:09:04 +0200
Subject: [PATCH 4/4] Updated tests

---
 example/blog/tests/test_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/blog/tests/test_views.py b/example/blog/tests/test_views.py
index 3e4faee..7ccdf20 100644
--- a/example/blog/tests/test_views.py
+++ b/example/blog/tests/test_views.py
@@ -32,7 +32,7 @@ class PostListTest(BaseIntegrationTest):
 
     def test_actions_displayed(self):
         response = self.client.get(reverse("admin2:blog_post_index"))
-        self.assertInHTML('<option value="DeleteSelectedAction">Delete selected items</option>', response.content)
+        self.assertInHTML('<a tabindex="-1" href="#" data-name="action" data-value="DeleteSelectedAction">Delete selected items</a>', response.content)
 
     def test_delete_selected_post(self):
         post = Post.objects.create(title="a_post_title", body="body")