design-backend-templates-addons-responsive_admin-overrides-addons-banners-pickers-banners-picker_contents.tpl.diff

diff --git a/design/backend/templates/addons/responsive_admin/overrides/addons/banners/pickers/banners/picker_contents.tpl b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/pickers/banners/picker_contents.tpl
index 2b791fd..bb0b4ab 100644
--- a/design/backend/templates/addons/responsive_admin/overrides/addons/banners/pickers/banners/picker_contents.tpl
+++ b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/pickers/banners/picker_contents.tpl
@@ -35,31 +35,12 @@
 </script>
 {/if}
 </head>
-<form action="{$smarty.request.extra|fn_url}" data-ca-result-id="{$smarty.request.data_id}" method="post" name="banners_form">
-{if $banners}
-<div class="table-responsive-wrapper">
-    <table width="100%" class="table table-middle table-responsive">
-    <thead>
-    <tr>
-        <th class="mobile-hide">
-            {include file="common/check_items.tpl"}
-        </th>
-        <th>{__("banner")}</th>
-    </tr>
-    </thead>
-    {foreach from=$banners item=banner}
-    <tr>
-        <td class="mobile-hide">
-            <input type="checkbox" name="{$smarty.request.checkbox_name|default:"banners_ids"}[]" value="{$banner.banner_id}" class="cm-item" />
-        </td>
-        <td id="banner_{$banner.banner_id}" width="100%" data-th="{__("banner")}">{$banner.banner}</td>
-    </tr>
-    {/foreach}
-    </table>
-</div>
-{else}
-    <p class="no-items">{__("no_data")}</p>
-{/if}
+
+{include file="addons/banners/views/banners/components/banners_search_form.tpl" dispatch="banners.picker" extra="<input type=\"hidden\" name=\"result_ids\" value=\"pagination_`$smarty.request.data_id`\">" put_request_vars=true form_meta="cm-ajax" in_popup=true}
+
+<form action="{$smarty.request.extra|fn_url}" data-ca-result-id="{$smarty.request.data_id}" method="post" name="banners_form" enctype="multipart/form-data">
+
+{include file="addons/banners/views/banners/components/banners_list.tpl" banners=$banners form_name="banners_form"}
 
 {if $banners}
 <div class="buttons-container">

design-backend-templates-addons-responsive_admin-overrides-addons-banners-views-banners-components-banners_list.tpl.diff

diff --git a/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/components/banners_list.tpl b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/components/banners_list.tpl
new file mode 100644
index 0000000..7c784a4
--- /dev/null
+++ b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/components/banners_list.tpl
@@ -0,0 +1,41 @@
+
+{include file="common/pagination.tpl" div_id="pagination_`$smarty.request.data_id`"}
+
+{assign var="c_url" value=$config.current_url|fn_query_remove:"sort_by":"sort_order"}
+{assign var="rev" value="pagination_`$smarty.request.data_id`"|default:"pagination_contents"}
+
+{assign var="c_icon" value="<i class=\"icon-`$search.sort_order_rev`\"></i>"}
+{assign var="c_dummy" value="<i class=\"icon-dummy\"></i>"}
+
+{if $banners}
+<input type="hidden" id="add_banner_id" name="banner_id" value=""/>
+
+<div class="table-responsive-wrapper">
+    <table width="100%" class="table table-middle table-responsive">
+    <thead>
+    <tr>
+        {hook name="banners_list:table_head"}
+        <th class="center" width="1%">
+            {include file="common/check_items.tpl"}
+        </th>
+        <th width="90%"><a class="cm-ajax" href="{"`$c_url`&sort_by=name&sort_order=`$search.sort_order_rev`"|fn_url}" data-ca-target-id={$rev}>{__("banner")}{if $search.sort_by == "name"}{$c_icon nofilter}{else}{$c_dummy nofilter}{/if}</a></th>
+        {/hook}
+    </tr>
+    </thead>
+    {foreach from=$banners item=banner}
+    <tr>
+        {hook name="banners_list:table_body"}
+        <td>
+            <input type="checkbox" name="{$smarty.request.checkbox_name|default:"banners_ids"}[]" value="{$banner.banner_id}" class="cm-item mrg-check" /></td>
+        <td id="banner_{$banner.banner_id}" width="100%" data-th="{__("banner")}">{$banner.banner}</td>
+        {/hook}
+    </tr>
+    {/foreach}
+    </table>
+</div>
+
+{else}
+    <p class="no-items">{__("no_data")}</p>
+{/if}
+
+{include file="common/pagination.tpl" div_id="pagination_`$smarty.request.data_id`"}
\ No newline at end of file

design-backend-templates-addons-responsive_admin-overrides-addons-banners-views-banners-components-banners_search_form.tpl.diff

diff --git a/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/components/banners_search_form.tpl b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/components/banners_search_form.tpl
new file mode 100644
index 0000000..50df8a4
--- /dev/null
+++ b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/components/banners_search_form.tpl
@@ -0,0 +1,66 @@
+{if $in_popup}
+    <div class="adv-search">
+    <div class="group">
+{else}
+    <div class="sidebar-row">
+    <h6>{__("search")}</h6>
+{/if}
+
+<form name="banner_search_form" action="{""|fn_url}" method="get" class="{$form_meta}">
+
+    {if $smarty.request.redirect_url}
+        <input type="hidden" name="redirect_url" value="{$smarty.request.redirect_url}" />
+    {/if}
+
+    {if $selected_section != ""}
+        <input type="hidden" id="selected_section" name="selected_section" value="{$selected_section}" />
+    {/if}
+
+    {if $put_request_vars}
+        {array_to_fields data=$smarty.request skip=["callback"]}
+    {/if}
+
+    {$extra nofilter}
+
+    {capture name="simple_search"}
+        <div class="sidebar-field">
+            <label for="elm_name">{__("banner")}</label>
+            <div class="break">
+                <input type="text" name="name" id="elm_name" value="{$search.name}" />
+            </div>
+        </div>
+
+        <div class="sidebar-field">
+            <label for="elm_type">{__("type")}</label>
+            <div class="controls">
+                <select name="type" id="elm_type">
+                    <option value="">{__("all")}</option>
+                    <option {if $search.type == "G"}selected="selected"{/if} value="G">{__("graphic_banner")}</option>
+                    <option {if $search.type == "T"}selected="selected"{/if} value="T">{__("text_banner")}</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="sidebar-field">
+            <label for="elm_type">{__("status")}</label>
+            {assign var="items_status" value=""|fn_get_default_statuses:true}
+            <div class="controls">
+                <select name="status" id="elm_type">
+                    <option value="">{__("all")}</option>
+                    {foreach from=$items_status key=key item=status}
+                        <option value="{$key}" {if $search.status == $key}selected="selected"{/if}>{$status}</option>
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+    {/capture}
+
+    {include file="common/advanced_search.tpl" no_adv_link=true simple_search=$smarty.capture.simple_search dispatch=$dispatch view_type="banners"}
+
+</form>
+
+{if $in_popup}
+    </div></div>
+{else}
+    </div><hr>
+{/if}
\ No newline at end of file

design-backend-templates-addons-responsive_admin-overrides-addons-banners-views-banners-manage.tpl.diff

diff --git a/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/manage.tpl b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/manage.tpl
index f5c1344..0677590 100644
--- a/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/manage.tpl
+++ b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/manage.tpl
@@ -4,6 +4,13 @@
 
 <form action="{""|fn_url}" method="post" name="banners_form" class=" cm-hide-inputs" enctype="multipart/form-data">
 <input type="hidden" name="fake" value="1" />
+{include file="common/pagination.tpl" save_current_page=true save_current_url=true div_id="pagination_contents_banners"}
+
+{assign var="c_url" value=$config.current_url|fn_query_remove:"sort_by":"sort_order"}
+
+{assign var="rev" value=$smarty.request.content_id|default:"pagination_contents_banners"}
+{assign var="c_icon" value="<i class=\"icon-`$search.sort_order_rev`\"></i>"}
+{assign var="c_dummy" value="<i class=\"icon-dummy\"></i>"}
 
 {if $banners}
 <div class="table-responsive-wrapper">
@@ -12,14 +19,14 @@
     <tr>
         <th width="1%" class="left mobile-hide">
             {include file="common/check_items.tpl" class="cm-no-hide-input"}</th>
-        <th>{__("banner")}</th>
-        <th class="mobile-hide">{__("type")}</th>
+        <th><a class="cm-ajax" href="{"`$c_url`&sort_by=name&sort_order=`$search.sort_order_rev`"|fn_url}" data-ca-target-id={$rev}>{__("banner")}{if $search.sort_by == "name"}{$c_icon nofilter}{else}{$c_dummy nofilter}{/if}</a></th>
+        <th class="mobile-hide"><a class="cm-ajax" href="{"`$c_url`&sort_by=type&sort_order=`$search.sort_order_rev`"|fn_url}" data-ca-target-id={$rev}>{__("type")}{if $search.sort_by == "type"}{$c_icon nofilter}{else}{$c_dummy nofilter}{/if}</a></th>
 
         {hook name="banners:manage_header"}
         {/hook}
 
         <th width="6%" class="mobile-hide">&nbsp;</th>
-        <th width="10%" class="right">{__("status")}</th>
+        <th width="10%" class="right"><a class="cm-ajax" href="{"`$c_url`&sort_by=status&sort_order=`$search.sort_order_rev`"|fn_url}" data-ca-target-id={$rev}>{__("status")}{if $search.sort_by == "status"}{$c_icon nofilter}{else}{$c_dummy nofilter}{/if}</a></th>
     </tr>
     </thead>
     {foreach from=$banners item=banner}
@@ -65,6 +72,8 @@
     <p class="no-items">{__("no_data")}</p>
 {/if}
 
+{include file="common/pagination.tpl" div_id="pagination_contents_banners"}
+
 {capture name="buttons"}
     <span class="mobile-hide">
     {capture name="tools_list"}
@@ -82,6 +91,14 @@
 </form>
 
 {/capture}
-{include file="common/mainbox.tpl" title=__("banners") content=$smarty.capture.mainbox buttons=$smarty.capture.buttons adv_buttons=$smarty.capture.adv_buttons select_languages=true}
+
+{capture name="sidebar"}
+    {hook name="banners:manage_sidebar"}
+    {include file="common/saved_search.tpl" dispatch="banners.manage" view_type="banners"}
+    {include file="addons/banners/views/banners/components/banners_search_form.tpl" dispatch="banners.manage"}
+    {/hook}
+{/capture}
+
+{include file="common/mainbox.tpl" title=__("banners") content=$smarty.capture.mainbox buttons=$smarty.capture.buttons adv_buttons=$smarty.capture.adv_buttons select_languages=true sidebar=$smarty.capture.sidebar}
 
 {** ad section **}
\ No newline at end of file

design-backend-templates-addons-responsive_admin-overrides-addons-banners-views-banners-update.tpl.diff

diff --git a/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/update.tpl b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/update.tpl
index bc34e68..7478c32 100644
--- a/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/update.tpl
+++ b/design/backend/templates/addons/responsive_admin/overrides/addons/banners/views/banners/update.tpl
@@ -17,80 +17,90 @@
 <input type="hidden" class="cm-no-hide-input" name="banner_id" value="{$id}" />
 
 {capture name="tabsbox"}
-<div id="content_general">
-    {hook name="banners:general_content"}
-    <div class="control-group">
-        <label for="elm_banner_name" class="control-label cm-required">{__("name")}</label>
-        <div class="controls">
-        <input type="text" name="banner_data[banner]" id="elm_banner_name" value="{$banner.banner}" size="25" class="input-large" /></div>
-    </div>
-
-    {if "ULTIMATE"|fn_allowed_for}
-        {include file="views/companies/components/company_field.tpl"
-            name="banner_data[company_id]"
-            id="banner_data_company_id"
-            selected=$banner.company_id
-        }
-    {/if}
 
-    <div class="control-group">
-        <label for="elm_banner_position" class="control-label">{__("position_short")}</label>
-        <div class="controls">
-            <input type="text" name="banner_data[position]" id="elm_banner_position" value="{$banner.position|default:"0"}" size="3"/>
+    <div id="content_general">
+        {hook name="banners:general_content"}
+        <div class="control-group">
+            <label for="elm_banner_name" class="control-label cm-required">{__("name")}</label>
+            <div class="controls">
+            <input type="text" name="banner_data[banner]" id="elm_banner_name" value="{$banner.banner}" size="25" class="input-large" /></div>
+        </div>
+
+        {if "ULTIMATE"|fn_allowed_for}
+            {include file="views/companies/components/company_field.tpl"
+                name="banner_data[company_id]"
+                id="banner_data_company_id"
+                selected=$banner.company_id
+            }
+        {/if}
+
+        <div class="control-group">
+            <label for="elm_banner_position" class="control-label">{__("position_short")}</label>
+            <div class="controls">
+                <input type="text" name="banner_data[position]" id="elm_banner_position" value="{$banner.position|default:"0"}" size="3"/>
+            </div>
         </div>
-    </div>
-
-    <div class="control-group">
-        <label for="elm_banner_type" class="control-label cm-required">{__("type")}</label>
-        <div class="controls">
-        <select name="banner_data[type]" id="elm_banner_type" onchange="Tygh.$('#banner_graphic').toggle();  Tygh.$('#banner_text').toggle(); Tygh.$('#banner_url').toggle();  Tygh.$('#banner_target').toggle();">
-            <option {if $banner.type == "G"}selected="selected"{/if} value="G">{__("graphic_banner")}</option>
-            <option {if $banner.type == "T"}selected="selected"{/if} value="T">{__("text_banner")}</option>
-        </select>
+
+        <div class="control-group">
+            <label for="elm_banner_type" class="control-label cm-required">{__("type")}</label>
+            <div class="controls">
+            <select name="banner_data[type]" id="elm_banner_type" onchange="Tygh.$('#banner_graphic').toggle();  Tygh.$('#banner_text').toggle(); Tygh.$('#banner_url').toggle();  Tygh.$('#banner_target').toggle();">
+                <option {if $banner.type == "G"}selected="selected"{/if} value="G">{__("graphic_banner")}</option>
+                <option {if $banner.type == "T"}selected="selected"{/if} value="T">{__("text_banner")}</option>
+            </select>
+            </div>
         </div>
-    </div>
 
-    <div class="control-group {if $b_type != "G"}hidden{/if}" id="banner_graphic">
-        <label class="control-label">{__("image")}</label>
-        <div class="controls">
-            {include file="common/attach_images.tpl" image_name="banners_main" image_object_type="promo" image_pair=$banner.main_pair image_object_id=$id no_detailed=true hide_titles=true}
+        <div class="control-group {if $b_type != "G"}hidden{/if}" id="banner_graphic">
+            <label class="control-label">{__("image")}</label>
+            <div class="controls">
+                {include file="common/attach_images.tpl" image_name="banners_main" image_object_type="promo" image_pair=$banner.main_pair image_object_id=$id no_detailed=true hide_titles=true}
+            </div>
         </div>
-    </div>
 
-    <div class="control-group {if $b_type == "G"}hidden{/if}" id="banner_text">
-        <label class="control-label" for="elm_banner_description">{__("description")}:</label>
-        <div class="controls">
-            <textarea id="elm_banner_description" name="banner_data[description]" cols="35" rows="8" class="cm-wysiwyg input-large">{$banner.description}</textarea>
+        <div class="control-group {if $b_type == "G"}hidden{/if}" id="banner_text">
+            <label class="control-label" for="elm_banner_description">{__("description")}:</label>
+            <div class="controls">
+                <textarea id="elm_banner_description" name="banner_data[description]" cols="35" rows="8" class="cm-wysiwyg input-large">{$banner.description}</textarea>
+            </div>
         </div>
-    </div>
 
-    <div class="control-group {if $b_type == "T"}hidden{/if}" id="banner_target">
-        <label class="control-label" for="elm_banner_target">{__("open_in_new_window")}</label>
-        <div class="controls">
-        <input type="hidden" name="banner_data[target]" value="T" />
-        <input type="checkbox" name="banner_data[target]" id="elm_banner_target" value="B" {if $banner.target == "B"}checked="checked"{/if} />
+        <div class="control-group {if $b_type == "T"}hidden{/if}" id="banner_target">
+            <label class="control-label" for="elm_banner_target">{__("open_in_new_window")}</label>
+            <div class="controls">
+            <input type="hidden" name="banner_data[target]" value="T" />
+            <input type="checkbox" name="banner_data[target]" id="elm_banner_target" value="B" {if $banner.target == "B"}checked="checked"{/if} />
+            </div>
         </div>
-    </div>
 
-    <div class="control-group {if $b_type == "T"}hidden{/if}" id="banner_url">
-        <label class="control-label" for="elm_banner_url">{__("url")}:</label>
-        <div class="controls">
-            <input type="text" name="banner_data[url]" id="elm_banner_url" value="{$banner.url}" size="25" class="input-large" />
+        <div class="control-group {if $b_type == "T"}hidden{/if}" id="banner_url">
+            <label class="control-label" for="elm_banner_url">{__("url")}:</label>
+            <div class="controls">
+                <input type="text" name="banner_data[url]" id="elm_banner_url" value="{$banner.url}" size="25" class="input-large" />
+            </div>
         </div>
-    </div>
 
-    <div class="control-group">
-        <label class="control-label" for="elm_banner_timestamp_{$id}">{__("creation_date")}</label>
-        <div class="controls">
-        {include file="common/calendar.tpl" date_id="elm_banner_timestamp_`$id`" date_name="banner_data[timestamp]" date_val=$banner.timestamp|default:$smarty.const.TIME start_year=$settings.Company.company_start_year}
+        <div class="control-group">
+            <label class="control-label" for="elm_banner_timestamp_{$id}">{__("creation_date")}</label>
+            <div class="controls">
+            {include file="common/calendar.tpl" date_id="elm_banner_timestamp_`$id`" date_name="banner_data[timestamp]" date_val=$banner.timestamp|default:$smarty.const.TIME start_year=$settings.Company.company_start_year}
+            </div>
         </div>
-    </div>
 
-    {include file="views/localizations/components/select.tpl" data_name="banner_data[localization]" data_from=$banner.localization}
+        {include file="views/localizations/components/select.tpl" data_name="banner_data[localization]" data_from=$banner.localization}
+
+        {include file="common/select_status.tpl" input_name="banner_data[status]" id="elm_banner_status" obj_id=$id obj=$banner hidden=true}
+        {/hook}
+    <!--content_general--></div>
+
+    <div id="content_addons" class="hidden clearfix">
+        {hook name="banners:detailed_content"}
+        {/hook}
+    <!--content_addons--></div>
 
-    {include file="common/select_status.tpl" input_name="banner_data[status]" id="elm_banner_status" obj_id=$id obj=$banner hidden=true}
+    {hook name="banners:tabs_content"}
     {/hook}
-</div>
+
 {/capture}
 {include file="common/tabsbox.tpl" content=$smarty.capture.tabsbox active_tab=$smarty.request.selected_section track=true}
 
@@ -105,7 +115,7 @@
         {include file="buttons/save_cancel.tpl" but_name="dispatch[banners.update]" but_role="submit-link" but_target_form="banners_form" hide_first_button=$hide_first_button hide_second_button=$hide_second_button save=$id}
     {/if}
 {/capture}
-    
+
 </form>
 
 {/capture}
@@ -117,7 +127,7 @@
 {/notes}
 
 {if !$id}
-    {assign var="title" value=__("banners.new_banner")}
+    {$title = __("banners.new_banner")}
 {else}
     {$title_start = __("banners.editing_banner")}
     {$title_end = $banner.banner}