Index: branches/1.0.x/elements/sorting.elm.tpl
===================================================================
diff -u -N -r14864 -r14890
--- branches/1.0.x/elements/sorting.elm.tpl	(.../sorting.elm.tpl)	(revision 14864)
+++ branches/1.0.x/elements/sorting.elm.tpl	(.../sorting.elm.tpl)	(revision 14890)
@@ -1,27 +1,24 @@
 <inp2:m_DefaultParam prefix="" list_name="" layout="list" ajax="0"/>
 
 <div class="filter-block">
+	<div class="paginate">
+		<a href="#prev" class="prev"><img src="<inp2:m_TemplatesBase/>img/arrow-left.png" width="7" height="13" alt="" /></a>&nbsp;
+		Products
+		<select id="paginate">
+			<inp2:m_DefineElement name="option_page_current">
+				<option value="<inp2:m_param name='page'/>" selected><inp2:m_param name="from_record"/> - <inp2:m_param name="to_record"/></a>
+			</inp2:m_DefineElement>
 
-	<inp2:m_if check="{$prefix}_GridInfo" type="needs_pagination" list_name="$list_name">
-		<div class="paginate">
-			<a href="#prev" class="prev"><img src="<inp2:m_TemplatesBase/>img/arrow-left.png" width="7" height="13" alt="" /></a>&nbsp;
-			Products
-			<select id="paginate">
-				<inp2:m_DefineElement name="option_page_current">
-					<option value="<inp2:m_param name='page'/>" selected><inp2:m_param name="from_record"/> - <inp2:m_param name="to_record"/></a>
-				</inp2:m_DefineElement>
+			<inp2:m_DefineElement name="option_page_link">
+				<option value="<inp2:m_param name='page'/>"><inp2:m_param name="from_record"/> - <inp2:m_param name="to_record"/></a>
+			</inp2:m_DefineElement>
 
-				<inp2:m_DefineElement name="option_page_link">
-					<option value="<inp2:m_param name='page'/>"><inp2:m_param name="from_record"/> - <inp2:m_param name="to_record"/></a>
-				</inp2:m_DefineElement>
+			<inp2:$prefix_PaginationBar list_name="$list_name" current_render_as="option_page_current" link_render_as="option_page_link"/>
+		</select>
+		out of <inp2:p_TotalRecords/>&nbsp;
+		<a href="#next" class="next"><img src="<inp2:m_TemplatesBase/>img/arrow-right.png" width="7" height="13" alt="" /></a>
+	</div>
 
-				<inp2:$prefix_PaginationBar list_name="$list_name" current_render_as="option_page_current" link_render_as="option_page_link"/>
-			</select>
-			out of <inp2:p_TotalRecords/>&nbsp;
-			<a href="#next" class="next"><img src="<inp2:m_TemplatesBase/>img/arrow-right.png" width="7" height="13" alt="" /></a>
-		</div>
-	</inp2:m_if>
-
 	<div class="sortby">
 		<form method="post" action="<inp2:m_FormAction/>">
 			Sort by:
@@ -88,26 +85,24 @@
 					}
 				);
 
-				<inp2:m_if check="{$prefix}_GridInfo" type="needs_pagination" list_name="$list_name">
-					$('#paginate').change(
-						function () {
-							ListManager.setParam('page', $(this).val(), true);
-						}
-					);
+				$('#paginate').change(
+					function () {
+						ListManager.setParam('page', $(this).val(), true);
+					}
+				);
 
-					$('.prev, .next', '.paginate').click(
-						function ($e) {
-							var $option = $('option:selected', '#paginate')[ $(this).attr('class') ]();
+				$('.prev, .next', '.paginate').click(
+					function ($e) {
+						var $option = $('option:selected', '#paginate')[ $(this).attr('class') ]();
 
-							if ( $option.length ) {
-								$('#paginate').val( $option.attr('value') ).change();
-							}
-
-							return false;
+						if ( $option.length ) {
+							$('#paginate').val( $option.attr('value') ).change();
 						}
-					);
-				</inp2:m_if>
 
+						return false;
+					}
+				);
+
 				$('#sorting').change(
 					function ($e) {
 						ListManager.setParam('sort_by', $(this).val().replace('|', ','), true);
@@ -116,7 +111,13 @@
 
 				$('#per-page').change(
 					function ($e) {
-						ListManager.setParam('per_page', $(this).val(), true);
+						var $per_page = $(this).val();
+
+						if ( $per_page == -1 ) {
+							ListManager.setParam('page', '');
+						}
+
+						ListManager.setParam('per_page', $per_page, true);
 					}
 				);