Changeset 14011 for trunk/administration

Timestamp:

05/18/10 05:05:03 (2 years ago)

Author:

Anton Lesnikov

Message:

Ticket #2019

Location:

trunk/administration

Files:

• js/memb_levels.js (modified) (1 diff)
• memb_levels.php (modified) (4 diffs)
• templates/base/css/memb_levels.css (modified) (2 diffs)

trunk/administration/js/memb_levels.js

@@ -33 +33 @@
                 closeOnOuterClick: false
             });
-            $('#adm-mlevels-holder > #adm-mlevels-action').addWebForms();
+
+            $(document).addWebForms();
+            $("input[type='datetime']", document).each(function() {
+                $(this).dynDateTime({
+                    ifFormat: '%Y-%m-%d %H:%M:%S',
+                    showsTime: true,
+                    position_css: 'fixed'
+                });
+            });
         },
         'json'

trunk/administration/memb_levels.php

@@ -74 +74 @@
     $sQuery .= !empty($_POST['allowedCnt']) ? ", `AllowedCount`='" . $_POST['allowedCnt'] . "'" : "";
     $sQuery .= !empty($_POST['period']) ? ", `AllowedPeriodLen`='" . $_POST['period'] . "'" : "";        
-    $sQuery .= !empty($_POST['dateStart']) ? ", `AllowedPeriodStart`=FROM_UNIXTIME(" . d2i($_POST['dateStart']) . ")" : "";
-    $sQuery .= !empty($_POST['dateEnd']) ? ", `AllowedPeriodEnd`=FROM_UNIXTIME(" . d2i($_POST['dateEnd']) . ")" : "";
+    $sQuery .= !empty($_POST['dateStart']) ? ", `AllowedPeriodStart`=FROM_UNIXTIME(" . strtotime($_POST['dateStart']) . ")" : "";
+    $sQuery .= !empty($_POST['dateEnd']) ? ", `AllowedPeriodEnd`=FROM_UNIXTIME(" . strtotime($_POST['dateEnd']) . ")" : "";
     $aResult = $GLOBALS['MySQL']->query($sQuery) > 0 ? array('code' => 0, 'message' => MsgBox(_t('_adm_txt_mlevels_action_saved'))) : array('code' => 1, 'message' => MsgBox(_t('_adm_txt_mlevels_action_cannot_save')));
 
@@ -363 +363 @@
                 'caption' => _t('_adm_txt_mlevels_actions_avail_start'),
                 'info' => _t('_adm_txt_mlevels_actions_avail_desc'),
-                'value' => isset($aAction['AllowedPeriodStart']) ? (int)$aAction['AllowedPeriodStart'] : "",
+                'value' => isset($aAction['AllowedPeriodStart']) ? $aAction['AllowedPeriodStart'] : "",
                 'display' => 'filterDate',
             ),
@@ -371 +371 @@
                 'caption' => _t('_adm_txt_mlevels_actions_avail_end'),
                 'info' => _t('_adm_txt_mlevels_actions_avail_desc'),
-                'value' => isset($aAction['AllowedPeriodEnd']) ? (int)$aAction['AllowedPeriodEnd'] : "",
+                'value' => isset($aAction['AllowedPeriodEnd']) ? $aAction['AllowedPeriodEnd'] : "",
                 'display' => 'filterDate',
             ), 
@@ -472 +472 @@
     return true;
 }
-function d2i($sDate) {
-    $iResult = 0;
-    
-    $aMatch = array();
-    if(preg_match('#(\d+)/(\d+)/(\d+)#', $sDate, $aMatch)) {
-        $iDay   = $aMatch[1];
-        $iMonth = $aMatch[2];
-        $iYear  = $aMatch[3];        
-        $iResult = mktime (0, 0, 0, $iMonth, $iDay, $iYear);
-        $iResult = $iResult > 0 ? $iResult : 0;
-    }
-
-    return $iResult;
-}
-
 ?>

trunk/administration/templates/base/css/memb_levels.css

@@ -32 +32 @@
 
 /*--- 'Manage Action' section ---*/
+div.calendar {
+    z-index: 9999;
+}
 div#adm-mlevels-action{
     width: 562px;    
@@ -52 +55 @@
     display: none;
 }
+div.ui-datepicker {
+    z-index: 9999;
+}