From 21171c63339648b63e7bb2a76a485cd73e2c1d08 Mon Sep 17 00:00:00 2001 From: Ryan Walberg Date: Thu, 15 Nov 2012 04:06:05 +0000 Subject: [PATCH] changed date formats, collapsed some columns --- src/index.php | 4 ++-- src/templates/event.tpl | 2 +- src/templates/shop.tpl | 34 ++++++++++++++++++---------------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/index.php b/src/index.php index 74277aa..c9fb880 100644 --- a/src/index.php +++ b/src/index.php @@ -122,7 +122,7 @@ $query = "SELECT u.userid, u.fullname, u.comment, u.list_stamp, COUNT(i.itemid) $rs = mysql_query($query) or die("Could not query: " . mysql_error()); $shoppees = array(); while ($row = mysql_fetch_array($rs, MYSQL_ASSOC)) { - $row['list_stamp'] = ($row['list_stamp == 0'] ? '-' : strftime("%B %d, %Y", strtotime($row['list_stamp']))); + $row['list_stamp'] = ($row['list_stamp == 0'] ? '-' : strftime("%m/%d/%Y", strtotime($row['list_stamp']))); $shoppees[] = $row; } mysql_free_result($rs); @@ -197,7 +197,7 @@ while ($row = mysql_fetch_array($rs, MYSQL_ASSOC)) { 'fullname' => $event_fullname, 'eventname' => $row['description'], 'daysleft' => $days_left, - 'date' => strftime("%B %d, %Y", $event_date) + 'date' => strftime("%m/%d/%Y", $event_date) ); $events[] = $thisevent; } diff --git a/src/templates/event.tpl b/src/templates/event.tpl index d363c1e..b5b9406 100644 --- a/src/templates/event.tpl +++ b/src/templates/event.tpl @@ -134,7 +134,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA {/if}
- +
diff --git a/src/templates/shop.tpl b/src/templates/shop.tpl index f49fc32..760cac5 100644 --- a/src/templates/shop.tpl +++ b/src/templates/shop.tpl @@ -71,14 +71,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - - - - - - - + + + + + + + @@ -134,7 +133,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA {if $row.ibought > 0} Return Item {/if} - + {* *} {else} {if $row.rfullname == '' && $row.bfullname == ''} + {* *} {elseif $row.rfullname != ''} {if $row.reservedid == $userid} + {* *} {else} - + *} {/if} {elseif $row.bfullname != ''} {if $row.boughtid == $userid} @@ -168,23 +168,25 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + {* *} {else} {if $opt.anonymous_purchasing} - + *} {else} - + *} {/if} {/if} {/if} {/if} -
RankDescriptionCategoryPriceStore/LocationStatus  RankDescriptionCategoryPriceStore/LocationStatus 
@@ -142,7 +141,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Reserve Item Purchase Item - @@ -150,7 +149,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Release Item Purchase Item - {if $opt.anonymous_purchasing} @@ -159,7 +158,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Reserved by {$row.rfullname|escape:'htmlall'}. {/if}   + {* Return Item - Bought.   + {* Bought by {$row.bfullname|escape:'htmlall'}.   + {* + {* *} I Want This Too