[TEP-COMMIT] [CVS admin] update to the template structure

anonymous-OfajU3CKLf1/[email protected] 22 Jul 2004 23:30:19 -0000
Newsgroups	gmane.comp.web.oscommerce.cvs
Message-ID	<[email protected]>
Commit in admin/admin on MAIN

products_expected.php +42 -101 1.31 -> 1.32

templates/pages/products_expected.php +96 added 1.1

+138 -101

1 added + 1 modified, total 2 files

update to the template structure

----------

admin /admin

products_expected.php 1.31 -> 1.32

diff -u -r1.31 -r1.32
--- products_expected.php 2003/06/29 22:50:52 1.31
+++ products_expected.php 2004/07/22 23:30:17 1.32
@@ -5,119 +5,60 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2003 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

require('includes/application_top.php');

- tep_db_query("update " . TABLE_PRODUCTS . " set products_date_available = '' where to_days(now()) > to_days(products_date_available)");
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="includes/stylesheet.css">
-<script language="javascript" src="includes/general.js"></script>
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0" bgcolor="#FFFFFF" onload="SetFocus();">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="2" cellpadding="2">
- <tr>
- <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="1" cellpadding="1" class="columnLeft">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
- </table></td>
-<!-- body_text //-->
- <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_draw_separator('pixel_trans.gif', HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="dataTableHeadingRow">
- <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_PRODUCTS; ?></td>
- <td class="dataTableHeadingContent" align="center"><?php echo TABLE_HEADING_DATE_EXPECTED; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_ACTION; ?>&nbsp;</td>
- </tr>
-<?php
- $products_query_raw = "select pd.products_id, pd.products_name, p.products_date_available from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p where p.products_id = pd.products_id and p.products_date_available != '' and pd.language_id = '" . (int)$languages_id . "' order by p.products_date_available DESC";
- $products_split = new splitPageResults($HTTP_GET_VARS['page'], MAX_DISPLAY_SEARCH_RESULTS, $products_query_raw, $products_query_numrows);
- $products_query = tep_db_query($products_query_raw);
- while ($products = tep_db_fetch_array($products_query)) {
- if ((!isset($HTTP_GET_VARS['pID']) || (isset($HTTP_GET_VARS['pID']) && ($HTTP_GET_VARS['pID'] == $products['products_id']))) && !isset($pInfo)) {
- $pInfo = new objectInfo($products);
- }

+ $selected_box = 'catalog';

- if (isset($pInfo) && is_object($pInfo) && ($products['products_id'] == $pInfo->products_id)) {
- echo ' <tr id="defaultSelected" class="dataTableRowSelected" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="document.location.href=\'' . tep_href_link(FILENAME_CATEGORIES, 'pID=' . $products['products_id'] . '&action=new_product') . '\'">' . "\n";
- } else {
- echo ' <tr class="dataTableRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="document.location.href=\'' . tep_href_link(FILENAME_PRODUCTS_EXPECTED, 'page=' . $HTTP_GET_VARS['page'] . '&pID=' . $products['products_id']) . '\'">' . "\n";
- }
-?>
- <td class="dataTableContent"><?php echo $products['products_name']; ?></td>
- <td class="dataTableContent" align="center"><?php echo tep_date_short($products['products_date_available']); ?></td>
- <td class="dataTableContent" align="right"><?php if (isset($pInfo) && is_object($pInfo) && ($products['products_id'] == $pInfo->products_id)) { echo tep_image(DIR_WS_IMAGES . 'icon_arrow_right.gif'); } else { echo '<a href="' . tep_href_link(FILENAME_PRODUCTS_EXPECTED, 'page=' . $HTTP_GET_VARS['page'] . '&pID=' . $products['products_id']) . '">' . tep_image(DIR_WS_IMAGES . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>&nbsp;</td>
- </tr>
-<?php

+ $action = (isset($_GET['action']) ? $_GET['action'] : '');
+
+ if (!isset($_GET['page']) || (isset($_GET['page']) && !is_numeric($_GET['page']))) {
+ $_GET['page'] = 1;

}

-?>
- <tr>
- <td colspan="3"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="smallText" valign="top"><?php echo $products_split->display_count($products_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $HTTP_GET_VARS['page'], TEXT_DISPLAY_NUMBER_OF_PRODUCTS_EXPECTED); ?></td>
- <td class="smallText" align="right"><?php echo $products_split->display_links($products_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $HTTP_GET_VARS['page']); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
-<?php
- $heading = array();
- $contents = array();

- if (isset($pInfo) && is_object($pInfo)) {
- $heading[] = array('text' => '<b>' . $pInfo->products_name . '</b>');

+ if (!empty($action)) {
+ switch ($action) {
+ case 'save':
+ if (isset($_GET['pID']) && is_numeric($_GET['pID'])) {
+ $Qproduct = $osC_Database->query('update :table_products set products_date_available = :products_date_available, products_last_modified = now() where products_id = :products_id');
+ $Qproduct->bindTable(':table_products', TABLE_PRODUCTS);
+ if (date('Y-m-d') < $_POST['products_date_available']) {
+ $Qproduct->bindValue(':products_date_available', $_POST['products_date_available']);
+ } else {
+ $Qproduct->bindRaw(':products_date_available', 'null');
+ }
+ $Qproduct->bindInt(':products_id', $_GET['pID']);
+ $Qproduct->execute();
+
+ if ($osC_Database->isError() === false) {
+ $messageStack->add_session(SUCCESS_DB_ROWS_UPDATED, 'success');
+ } else {
+ $messageStack->add_session(ERROR_DB_ROWS_NOT_UPDATED, 'error');
+ }
+ }

- $contents[] = array('align' => 'center', 'text' => '<a href="' . tep_href_link(FILENAME_CATEGORIES, 'pID=' . $pInfo->products_id . '&action=new_product') . '">' . tep_image_button('button_edit.gif', IMAGE_EDIT) . '</a>');
- $contents[] = array('text' => '<br>' . TEXT_INFO_DATE_EXPECTED . ' ' . tep_date_short($pInfo->products_date_available));

+ tep_redirect(tep_href_link(FILENAME_PRODUCTS_EXPECTED, 'page=' . $_GET['page']));
+ break;
+ }

}

- if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
- echo ' <td width="25%" valign="top">' . "\n";

+ $Qcheck = $osC_Database->query('select products_id from :table_products where products_date_available is not null limit 1');
+ $Qcheck->bindTable(':table_products', TABLE_PRODUCTS);
+ $Qcheck->execute();
+
+ if ($Qcheck->numberOfRows()) {
+ $Qupdate = $osC_Database->query('update :table_products set products_date_available = null where unix_timestamp(now()) > unix_timestamp(products_date_available)');
+ $Qupdate->bindTable(':table_products', TABLE_PRODUCTS);
+ $Qupdate->execute();
+ }

- $box = new box;
- echo $box->infoBox($heading, $contents);

+ $page_contents = 'products_expected.php';

- echo ' </td>' . "\n";
- }

+ require('templates/default.php');
+
+ require('includes/application_bottom.php');

?>

- </tr>
- </table></td>
- </tr>
- </table></td>
-<!-- body_text_eof //-->
- </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

----------

admin /admin /templates /pages

products_expected.php added at 1.1

diff -N products_expected.php
--- /dev/null Fri Jul 23 01:30:17 2004
+++ /tmp/cvsAAAvzayye Fri Jul 23 01:30:17 2004
@@ -0,0 +1,96 @@

+<?php
+/*
+ $Id$
+
+ osCommerce, Open Source E-Commerce Solutions
+ http://www.oscommerce.com
+
+ Copyright (c) 2004 osCommerce
+
+ Released under the GNU General Public License
+*/
+?>
+
+<style type="text/css">@import url('external/jscalendar/0.9.6/calendar-win2k-1.css');</style>
+<script type="text/javascript" src="external/jscalendar/0.9.6/calendar.js"></script>
+<script type="text/javascript" src="external/jscalendar/0.9.6/lang/calendar-en.js"></script>
+<script type="text/javascript" src="external/jscalendar/0.9.6/calendar-setup.js"></script>
+
+<h1><?php echo HEADING_TITLE; ?></h1>
+
+<div id="infoBox_pDefault" <?php if (!empty($action)) { echo 'style="display: none;"'; } ?>>
+ <table border="0" width="100%" cellspacing="0" cellpadding="2" class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo TABLE_HEADING_PRODUCTS; ?></th>
+ <th><?php echo TABLE_HEADING_DATE_EXPECTED; ?></th>
+ <th><?php echo TABLE_HEADING_ACTION; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+<?php
+ $Qproducts = $osC_Database->query('select p.products_id, p.products_date_available, pd.products_name from :table_products p, :table_products_description pd where p.products_date_available is not null and p.products_id = pd.products_id and pd.language_id = :language_id order by p.products_date_available');
+ $Qproducts->bindTable(':table_products', TABLE_PRODUCTS);
+ $Qproducts->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
+ $Qproducts->bindInt(':language_id', $osC_Session->value('languages_id'));
+ $Qproducts->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
+ $Qproducts->execute();
+
+ while ($Qproducts->next()) {
+ if (!isset($pInfo) && (!isset($_GET['pID']) || (isset($_GET['pID']) && ($_GET['pID'] == $Qproducts->valueInt('products_id'))))) {
+ $pInfo = new objectInfo($Qproducts->toArray());
+ }
+
+ if (isset($pInfo) && ($Qproducts->valueInt('products_id') == $pInfo->products_id)) {
+ echo ' <tr class="selected">' . "\n";
+ } else {
+ echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_PRODUCTS_EXPECTED, 'page=' . $_GET['page'] . '&pID=' . $Qproducts->valueInt('products_id')) . '\'">' . "\n";
+ }
+?>
+ <td><?php echo $Qproducts->value('products_name'); ?></td>
+ <td><?php echo tep_date_short($Qproducts->value('products_date_available')); ?></td>
+ <td align="right">
+<?php
+ if (isset($pInfo) && ($Qproducts->valueInt('products_id') == $pInfo->products_id)) {
+ echo '<a href="#" onClick="toggleInfoBox(\'pEdit\');">' . tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . '</a>';
+ } else {
+ echo '<a href="' . tep_href_link(FILENAME_PRODUCTS_EXPECTED, 'page=' . $_GET['page'] . '&pID=' . $Qproducts->valueInt('products_id') . '&action=pEdit') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . '</a>';
+ }
+?>
+ </td>
+ </tr>
+<?php
+ }
+?>
+ </tbody>
+ </table>
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="smallText"><?php echo $Qproducts->displayBatchLinksTotal(TEXT_DISPLAY_NUMBER_OF_PRODUCTS_EXPECTED); ?></td>
+ <td class="smallText" align="right"><?php echo $Qproducts->displayBatchLinksPullDown(); ?></td>
+ </tr>
+ </table>
+</div>
+
+<?php
+ if (isset($pInfo)) {
+?>
+
+<div id="infoBox_pEdit" <?php if ($action != 'pEdit') { echo 'style="display: none;"'; } ?>>
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . ' ' . $pInfo->products_name; ?></div>
+ <div class="infoBoxContent">
+ <?php echo tep_draw_form('pEdit', FILENAME_PRODUCTS_EXPECTED, 'page=' . $_GET['page'] . '&pID=' . $pInfo->products_id . '&action=save'); ?>
+
+ <p><?php echo TEXT_EDIT_INTRO; ?></p>
+ <p><?php echo TEXT_INFO_DATE_EXPECTED . '<br>' . osc_draw_input_field('products_date_available', $pInfo->products_date_available, 'id="calendarValue"'); ?><input type="button" value="..." id="calendarTrigger" class="operationButton"><script type="text/javascript">Calendar.setup( { inputField: "calendarValue", ifFormat: "%Y-%m-%d", button: "calendarTrigger" } );</script></p>
+
+ <p align="center"><?php echo '<input type="submit" value="' . IMAGE_SAVE . '" class="operationButton"> <input type="button" value="' . IMAGE_CANCEL . '" onClick="toggleInfoBox(\'pDefault\');" class="operationButton">'; ?></p>
+
+ </form>
+ </div>
+</div>
+
+<?php
+ }
+?>

CVSspam 0.2.8

-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click