mike/wishlist
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed date formats, collapsed some columns

Browse source
This commit is contained in:
Ryan Walberg 2012-11-15 04:06:05 +00:00
parent 60aeb3ebcf
commit 21171c6333
3 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/index.php
View file

@ -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()); $rs = mysql_query($query) or die("Could not query: " . mysql_error());
$shoppees = array(); $shoppees = array();
while ($row = mysql_fetch_array($rs, MYSQL_ASSOC)) { 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; $shoppees[] = $row;
} }
mysql_free_result($rs); mysql_free_result($rs);
@ -197,7 +197,7 @@ while ($row = mysql_fetch_array($rs, MYSQL_ASSOC)) {
'fullname' => $event_fullname, 'fullname' => $event_fullname,
'eventname' => $row['description'], 'eventname' => $row['description'],
'daysleft' => $days_left, 'daysleft' => $days_left,
'date' => strftime("%B %d, %Y", $event_date) 'date' => strftime("%m/%d/%Y", $event_date)
); );
$events[] = $thisevent; $events[] = $thisevent;
} }

2
src/templates/event.tpl
View file

@ -134,7 +134,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{/if} {/if}
<div class="form-actions"> <div class="form-actions">
<button type="submit" class="btn btn-primary">{if $action == "" || $action == "insert"}Add{else}Update{/if}</button> <button type="submit" class="btn btn-primary">{if $action == "" || $action == "insert"}Add{else}Update{/if}</button>
<button type="button" onClick="document.location.href='event.php';">Cancel</button> <button type="button" class="btn" onClick="document.location.href='event.php';">Cancel</button>
</div> </div>
</fieldset> </fieldset>
</form> </form>

34
src/templates/shop.tpl
View file

@ -71,14 +71,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>
<th class="colheader"><a href="shop.php?shopfor={$shopfor}&sort=ranking">Rank</a></th> <th><a href="shop.php?shopfor={$shopfor}&sort=ranking">Rank</a></th>
<th class="colheader"><a href="shop.php?shopfor={$shopfor}&sort=description">Description</a></th> <th><a href="shop.php?shopfor={$shopfor}&sort=description">Description</a></th>
<th class="colheader"><a href="shop.php?shopfor={$shopfor}&sort=category">Category</a></th> <th><a href="shop.php?shopfor={$shopfor}&sort=category">Category</a></th>
<th class="rcolheader"><a href="shop.php?shopfor={$shopfor}&sort=price">Price</a></th> <th><a href="shop.php?shopfor={$shopfor}&sort=price">Price</a></th>
<th class="colheader"><a href="shop.php?shopfor={$shopfor}&sort=source">Store/Location</a></th> <th><a href="shop.php?shopfor={$shopfor}&sort=source">Store/Location</a></th>
<th class="colheader"><a href="shop.php?shopfor={$shopfor}&sort=status">Status</a></th> <th><a href="shop.php?shopfor={$shopfor}&sort=status">Status</a></th>
<th class="rcolheader">&nbsp;</th> <th>&nbsp;</th>
<th class="rcolheader">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -134,7 +133,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{if $row.ibought > 0} {if $row.ibought > 0}
<a href="shop.php?action=return&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Return Item" title="Return Item" src="images/run_exc.gif" border="0" /></a> <a href="shop.php?action=return&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Return Item" title="Return Item" src="images/run_exc.gif" border="0" /></a>
{/if} {/if}
</td> {* </td> *}
{else} {else}
{if $row.rfullname == '' && $row.bfullname == ''} {if $row.rfullname == '' && $row.bfullname == ''}
<td> <td>
@ -142,7 +141,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</td> </td>
<td nowrap align="right"> <td nowrap align="right">
<a href="shop.php?action=reserve&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Reserve Item" title="Reserve Item" src="images/lock_co.gif" border="0" /></a>&nbsp;<a href="shop.php?action=purchase&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Purchase Item" title="Purchase Item" src="images/step_done.gif" border="0" /></a> <a href="shop.php?action=reserve&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Reserve Item" title="Reserve Item" src="images/lock_co.gif" border="0" /></a>&nbsp;<a href="shop.php?action=purchase&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Purchase Item" title="Purchase Item" src="images/step_done.gif" border="0" /></a>
</td> {* </td> *}
{elseif $row.rfullname != ''} {elseif $row.rfullname != ''}
{if $row.reservedid == $userid} {if $row.reservedid == $userid}
<td> <td>
@ -150,7 +149,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</td> </td>
<td align="right"> <td align="right">
<a href="shop.php?action=release&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Release Item" title="Release Item" src="images/unlock_co.gif" border="0" /></a>&nbsp;<a href="shop.php?action=purchase&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Purchase Item" title="Purchase Item" src="images/step_done.gif" border="0" /></a> <a href="shop.php?action=release&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Release Item" title="Release Item" src="images/unlock_co.gif" border="0" /></a>&nbsp;<a href="shop.php?action=purchase&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Purchase Item" title="Purchase Item" src="images/step_done.gif" border="0" /></a>
</td> {* </td> *}
{else} {else}
<td> <td>
{if $opt.anonymous_purchasing} {if $opt.anonymous_purchasing}
@ -159,7 +158,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<i>Reserved by {$row.rfullname|escape:'htmlall'}.</i> <i>Reserved by {$row.rfullname|escape:'htmlall'}.</i>
{/if} {/if}
</td> </td>
<td>&nbsp;</td> <td>
{* </td> *}
{/if} {/if}
{elseif $row.bfullname != ''} {elseif $row.bfullname != ''}
{if $row.boughtid == $userid} {if $row.boughtid == $userid}
@ -168,23 +168,25 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</td> </td>
<td align="right"> <td align="right">
<a href="shop.php?action=return&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Return Item" title="Return Item" src="images/run_exc.gif" border="0" /></a> <a href="shop.php?action=return&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="Return Item" title="Return Item" src="images/run_exc.gif" border="0" /></a>
</td> {* </td> *}
{else} {else}
{if $opt.anonymous_purchasing} {if $opt.anonymous_purchasing}
<td> <td>
<i>Bought.</i> <i>Bought.</i>
</td> </td>
<td>&nbsp;</td> <td>
{* </td> *}
{else} {else}
<td> <td>
<i>Bought by {$row.bfullname|escape:'htmlall'}.</i> <i>Bought by {$row.bfullname|escape:'htmlall'}.</i>
</td> </td>
<td>&nbsp;</td> <td>
{* </td> *}
{/if} {/if}
{/if} {/if}
{/if} {/if}
{/if} {/if}
<td> {* <td> *}
<a href="shop.php?action=copy&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="I Want This Too" title="I Want This Too" src="images/toolbar_replace.gif" border="0" /></a> <a href="shop.php?action=copy&itemid={$row.itemid}&shopfor={$shopfor}"><img alt="I Want This Too" title="I Want This Too" src="images/toolbar_replace.gif" border="0" /></a>
</td> </td>
</tr> </tr>