Changeset 28497 for trunk/admin/history.php

Timestamp:

May 18, 2014, 12:04:36 AM (10 years ago)

Author:

mistic100

Message:

feature 3080 : simpler date inputs (one input + fontello + picker selects)

File:

• trunk/admin/history.php (modified) (5 diffs)

trunk/admin/history.php

@@ -74 +74 @@
 {
   // dates
-  if (!empty($_POST['start_year']))
-  {
-    $search['fields']['date-after'] = sprintf(
-      '%d-%02d-%02d',
-      $_POST['start_year'],
-      $_POST['start_month'],
-      $_POST['start_day']
-      );
-  }
-
-  if (!empty($_POST['end_year']))
-  {
-    $search['fields']['date-before'] = sprintf(
-      '%d-%02d-%02d',
-      $_POST['end_year'],
-      $_POST['end_month'],
-      $_POST['end_day']
-      );
+  if (!empty($_POST['start']))
+  {
+    $search['fields']['date-after'] = $_POST['start'];
+  }
+
+  if (!empty($_POST['end']))
+  {
+    $search['fields']['date-before'] = $_POST['end'];
   }
 
@@ -552 +542 @@
   if (isset($page['search']['fields']['date-after']))
   {
-    $tokens = explode('-', $page['search']['fields']['date-after']);
-
-    $form['start_year']  = (int)$tokens[0];
-    $form['start_month'] = (int)$tokens[1];
-    $form['start_day']   = (int)$tokens[2];
+    $form['start'] = $page['search']['fields']['date-after'];
   }
 
   if (isset($page['search']['fields']['date-before']))
   {
-    $tokens = explode('-', $page['search']['fields']['date-before']);
-
-    $form['end_year']  = (int)$tokens[0];
-    $form['end_month'] = (int)$tokens[1];
-    $form['end_day']   = (int)$tokens[2];
+    $form['end'] = $page['search']['fields']['date-before'];
   }
 
@@ -589 +571 @@
   // by default, at page load, we want the selected date to be the current
   // date
-  $form['start_year']  = $form['end_year']  = date('Y');
-  $form['start_month'] = $form['end_month'] = date('n');
-  $form['start_day']   = $form['end_day']   = date('j');
+  $form['start'] = $form['end'] = date('Y-n-j');
   $form['types'] = $types;
   // Hoverbox by default
@@ -598 +578 @@
 }
 
-
-$month_list = $lang['month'];
-$month_list[0]='------------';
-ksort($month_list);
 
 $template->assign(
@@ -608 +584 @@
     'FILENAME' => @$form['filename'],
     'IP' => @$form['ip'],
-
-    'month_list' => $month_list,
-
-    'START_DAY_SELECTED' => @$form['start_day'],
-    'START_MONTH_SELECTED' => @$form['start_month'],
-    'START_YEAR' => @$form['start_year'],
-
-    'END_DAY_SELECTED' => @$form['end_day'],
-    'END_MONTH_SELECTED' => @$form['end_month'],
-    'END_YEAR'   => @$form['end_year'],
+    'START' => @$form['start'],
+    'END' => @$form['end'],
     )
   );