Changeset 15565 for tags

Timestamp:

10/09/11 00:26:22 (8 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2620

Location:

tags/7.0

Files:

• administration/js/lang_file.js (modified) (1 diff)
• administration/lang_file.php (modified) (3 diffs)
• administration/templates/base/langs_keys.html (modified) (1 diff)
• install/langs/lang-en.php (modified) (1 diff)
• templates/base/scripts/BxBaseSearchResult.php (modified) (2 diffs)

tags/7.0/administration/js/lang_file.js

@@ -20 +20 @@
  ***************************************************************************/
 
-function onApply(oCheckbox) {
-    var sFilter = 'filter';
-    var sUrl = ('' + document.location).replace(/[&]{0,1}filter=.*/, '');
-    var bChecked = oCheckbox.checked == undefined ? oCheckbox.attr('checked') : oCheckbox.checked;
-    if(bChecked && $('#adm-langs-look-for').val().length > 2)
-        sUrl += (sUrl.indexOf('?') == -1 ? '?' : '&') + 'filter=' + $('#adm-langs-look-for').val();
-    document.location = sUrl;
-}
 function onCreate() {
     $('#adm-langs-add-key').dolPopup({

tags/7.0/administration/lang_file.php

@@ -371 +371 @@
 }
 function PageCodeKeys($mixedResult) {
+    $sFilterName = 'filter';
     $sFilter = '';
-    $aItems = array();
-    if(isset($_GET['filter'])) {
-        $sFilter = process_db_input($_GET['filter'], BX_TAGS_STRIP);
+    $aItems = array();    
+    if(isset($_GET[$sFilterName])) {
+        $sFilter = process_db_input($_GET[$sFilterName], BX_TAGS_STRIP);
 
         $aKeys = $GLOBALS['MySQL']->getAll("SELECT `tk`.`ID` AS `id`, `tk`.`Key` AS `key`, `tc`.`Name` AS `category` FROM `sys_localization_keys` AS `tk` LEFT JOIN `sys_localization_strings` AS `ts` ON `tk`.`ID`=`ts`.`IDKey` LEFT JOIN `sys_localization_categories` AS `tc` ON `tk`.`IDCategory`=`tc`.`ID` WHERE `tk`.`Key` LIKE '%" . $sFilter . "%' OR `ts`.`String` LIKE '%" . $sFilter . "%' GROUP BY `tk`.`ID`");
@@ -392 +393 @@
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-keys-form', $aButtons, 'keys');
     
+    $sFilter = BxTemplSearchResult::showAdminFilterPanel(false !== bx_get($sFilterName) ? bx_get($sFilterName) : '', 'adm-langs-look-for', 'adm-langs-apply', $sFilterName);
+
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('langs_keys.html', array(
-        'filter_value' => $sFilter,
-        'filter_checked' => !empty($sFilter) ? 'checked="checked"' : '',
+        'filter_panel' => $sFilter,
         'bx_repeat:items' => !empty($aItems) ? $aItems : MsgBox(_t('_Empty')),
         'control' => $sControls,
@@ -402 +404 @@
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = MsgBox(_t($mixedResult), 3) . $sResult;
-        
-    return DesignBoxAdmin(_t('_adm_box_cpt_lang_keys'), $sResult);
+    
+    $aTopItems = array(
+        'adm-langs-add-key-db-top-item' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:onCreate()', 'title' => _t('_adm_txt_langs_add_key'), 'active' => 0),
+    );
+
+    return DesignBoxAdmin(_t('_adm_box_cpt_lang_keys'), $sResult, $aTopItems);
 }
 function PageCodeKeyCreate() {

tags/7.0/administration/templates/base/langs_keys.html

@@ -1 +1 @@
 <form id="adm-keys-form" enctype="multipart/form-data" method="post" action="" class="form_advanced">
-    <div class="adm-db-control-panel">
-        <div class="adm-lk-look">
-            <bx_text:_adm_txt_langs_looks_for />
-        </div>
-        <div class="input_wrapper input_wrapper_text adm-lk-input-filter">
-            <input type="text" id="adm-langs-look-for" value="__filter_value__" class="form_input_text" onkeyup="$('#adm-langs-apply').attr('checked', '')" />
-            <div class="input_close input_close_text">&nbsp;</div>
-        </div>
-        <div class="adm-lk-chb-apply">
-            <input type="checkbox" id="adm-langs-apply" name="adm-langs-apply" onclick="javascript:onApply(this);" __filter_checked__ />
-            <label for="adm-langs-apply">
-                <bx_text:_adm_txt_langs_apply />
-            </label>
-        </div>
-        <div class="adm-lk-btn-new">
-            <div class="button_wrapper">
-                <input type="button" value="<bx_text:_adm_txt_langs_add_key />" name="adm-langs-add-key" class="form_input_submit" onclick="javascript:onCreate()" />
-                <div class="button_wrapper_close">&nbsp;</div>
-            </div>
-        </div>
-        <div class="clear_both">&nbsp;</div>
-    </div>
+    __filter_panel__
     <div class="adm-lk-keys">
         <bx_repeat:items>

tags/7.0/install/langs/lang-en.php

@@ -2101 +2101 @@
     '_adm_txt_langs_delete' => 'Delete', 
     '_adm_txt_langs_default' => 'default',
-    '_adm_txt_langs_looks_for' => 'Look for:',
-    '_adm_txt_langs_apply' => 'Search',
     '_adm_txt_langs_add_key' => 'Add key',
     '_adm_txt_langs_files' => 'List',

tags/7.0/templates/base/scripts/BxBaseSearchResult.php

@@ -141 +141 @@
             document.location = s;
         }
+        function on_filter_key_up (e) {            
+            if (13 == e.keyCode) {
+                $('#<?php echo $sCheckboxId; ?>').attr('checked', 'checked');
+                on_filter_apply($('#<?php echo $sCheckboxId; ?>').get(0));
+            } else {
+                $('#{$sCheckboxId}').attr('checked', '');
+            }
+        }
     </script>
 <?
@@ -154 +162 @@
                 <td>
                     <div class="input_wrapper input_wrapper_text">
-                        <input type="text" id="{$sInputId}" value="{$sFilterValue}" class="form_input_text" onkeyup="$('#{$sCheckboxId}').attr('checked', '')" />
+                        <input type="text" id="{$sInputId}" value="{$sFilterValue}" class="form_input_text" onkeyup="on_filter_key_up(event)" />
                         <div class="input_close input_close_text">&nbsp;</div>
                     </div>