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

various bugfixes

Browse source
This commit is contained in:
Ryan Walberg 2012-11-27 16:14:02 +00:00
parent b9b3367865
commit 1d957cba54
3 changed files with 52 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/templates/home.tpl
View file

@ -114,7 +114,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<td nowrap>{$row.rendered}</td> <td nowrap>{$row.rendered}</td>
<td>{$row.category|default:"&nbsp;"}</td> <td>{$row.category|default:"&nbsp;"}</td>
<td align="right">{$row.price}</td> <td align="right">{$row.price}</td>
<td align="right"> <td align="right" nowrap>
<a href="receive.php?itemid={$row.itemid}"><img alt="Mark Item Received" src="images/return.png" border="0" title="Mark Item Received" /></a>&nbsp; <a href="receive.php?itemid={$row.itemid}"><img alt="Mark Item Received" src="images/return.png" border="0" title="Mark Item Received" /></a>&nbsp;
<a href="item.php?action=edit&itemid={$row.itemid}"><img alt="Edit Item" src="images/pencil.png" border="0" title="Edit Item" /></a>&nbsp; <a href="item.php?action=edit&itemid={$row.itemid}"><img alt="Edit Item" src="images/pencil.png" border="0" title="Edit Item" /></a>&nbsp;
<a rel="confirmitemdelete" data-content="{$row.description|escape:'htmlall'}" href="item.php?action=delete&itemid={$row.itemid}"><img alt="Delete Item" src="images/bin.png" border="0" alt="Delete" title="Delete Item" /></a> <a rel="confirmitemdelete" data-content="{$row.description|escape:'htmlall'}" href="item.php?action=delete&itemid={$row.itemid}"><img alt="Delete Item" src="images/bin.png" border="0" alt="Delete" title="Delete Item" /></a>
@ -166,7 +166,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</td> </td>
<td align="right">{$row.list_stamp}</td> <td align="right">{$row.list_stamp}</td>
<td align="right">{$row.itemcount}</td> <td align="right">{$row.itemcount}</td>
<td align="right"> <td align="right" nowrap>
{if $row.itemcount > 0} {if $row.itemcount > 0}
<a href="shop.php?shopfor={$row.userid}"><img alt="Shop for {$row.fullname|escape:'htmlall'}" src="images/store.png" border="0" alt="Shop" title="Shop"></a>&nbsp; <a href="shop.php?shopfor={$row.userid}"><img alt="Shop for {$row.fullname|escape:'htmlall'}" src="images/store.png" border="0" alt="Shop" title="Shop"></a>&nbsp;
{/if} {/if}
@ -192,7 +192,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{foreach from=$prospects item=row} {foreach from=$prospects item=row}
<tr> <tr>
<td>{$row.fullname|escape:'htmlall'}</td> <td>{$row.fullname|escape:'htmlall'}</td>
<td align="right"> <td align="right" nowrap>
{if $row.pending} {if $row.pending}
<a href="index.php?action=cancel&shopfor={$row.userid}"><img src="images/delete.png" border="0" alt="Cancel" title="Cancel" /></a> <a href="index.php?action=cancel&shopfor={$row.userid}"><img src="images/delete.png" border="0" alt="Cancel" title="Cancel" /></a>
{else} {else}

8
src/templates/item.tpl
View file

@ -40,9 +40,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
required: true, required: true,
maxlength: 255 maxlength: 255
}, },
category: { /*category: {
required: true required: true
}, },*/
price: { price: {
required: true, required: true,
min: 0, min: 0,
@ -69,9 +69,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
required: "The item's description is required.", required: "The item's description is required.",
maxlength: "The item's description must be 255 characters or less." maxlength: "The item's description must be 255 characters or less."
}, },
category: { /*category: {
required: "A category must be selected." required: "A category must be selected."
}, },*/
price: { price: {
required: "The item's price is required.", required: "The item's price is required.",
min: "Price can't be a negative number.", min: "Price can't be a negative number.",

71
src/templates/signup.tpl
View file

@ -21,31 +21,48 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="bootstrap/css/bootstrap-responsive.css" rel="stylesheet"> <link href="bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="bootstrap/js/bootstrap.min.js"></script>
<script src="js/jquery.validate.min.js"></script>
<script src="js/giftreg.js"></script>
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
function validateSignup() { $(document).ready(function() {
field = document.signup.username; $("#signupform").validate({
if (field == null || field == undefined || !field.value.match("\\S")) { highlight: validate_highlight,
alert("You must supply a username."); success: validate_success,
field.focus(); rules: {
return false; username: {
required: true,
maxlength: 20
},
fullname: {
required: true,
maxlength: 50
},
email: {
required: true,
email: true,
maxlength: 255
},
familyid: {
required: true
} }
},
field = document.signup.fullname; messages: {
if (field == null || field == undefined || !field.value.match("\\S")) { username: {
alert("You must supply your full name."); required: "A username is required.",
field.focus(); maxlength: "Username must be 20 characters or less."
return false; },
} fullname: {
required: "Your full name is required.",
field = document.signup.email; maxlength: "Your full name must be 50 characteres or less."
if (!field.value.match("\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*")) { },
alert("The e-mail address '" + field.value + "' is not a valid address."); email: "A valid e-mail address is required.",
field.focus(); familyid: "Please select a family."
return false;
}
return true;
} }
});
});
</script> </script>
</head> </head>
<body> <body>
@ -74,7 +91,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{else} {else}
<div class="row"> <div class="row">
<div class="span8 offset2"> <div class="span8 offset2">
<div class="well"> <div class="alert alert-info">
<p>Complete the form below and click Submit.</p> <p>Complete the form below and click Submit.</p>
{if $opt.newuser_requires_approval} {if $opt.newuser_requires_approval}
<p>The list administrators will be notified of your request by e-mail and will approve or decline your request. <p>The list administrators will be notified of your request by e-mail and will approve or decline your request.
@ -89,7 +106,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<div class="row"> <div class="row">
<div class="span8 offset2"> <div class="span8 offset2">
<form name="signup" method="post" action="signup.php" class="well form-horizontal"> <form name="signupform" id="signupform" method="post" action="signup.php" class="well form-horizontal">
<input type="hidden" name="action" value="signup"> <input type="hidden" name="action" value="signup">
<fieldset> <fieldset>
<legend>Sign Up for the Gift Registry</legend> <legend>Sign Up for the Gift Registry</legend>
@ -115,6 +132,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<label class="control-label" for="familyid">Family</label> <label class="control-label" for="familyid">Family</label>
<div class="controls"> <div class="controls">
<select name="familyid"> <select name="familyid">
<option value="">(select one)</option>
{foreach from=$families item=row} {foreach from=$families item=row}
<option value="{$row.familyid}">{$row.familyname|escape:'htmlall'}</option> <option value="{$row.familyid}">{$row.familyname|escape:'htmlall'}</option>
{/foreach} {/foreach}
@ -122,7 +140,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<button type="submit" class="btn btn-primary" onClick="return validateSignup();">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
<button type="button" class="btn" onClick="document.location.href='login.php';">Cancel</button> <button type="button" class="btn" onClick="document.location.href='login.php';">Cancel</button>
</div> </div>
</fieldset> </fieldset>
@ -131,8 +149,5 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</div> </div>
{/if} {/if}
</div> </div>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="bootstrap/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>