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

refactored out the navbar

Browse source
This commit is contained in:
Ryan Walberg 2012-11-15 03:52:25 +00:00
parent 7e15ef4712
commit 60aeb3ebcf
10 changed files with 80 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/item.php
View file

@ -253,5 +253,7 @@ $smarty->assign('image_filename', $image_filename);
$smarty->assign('comment', $comment); $smarty->assign('comment', $comment);
$smarty->assign('categories', $categories); $smarty->assign('categories', $categories);
$smarty->assign('ranks', $ranks); $smarty->assign('ranks', $ranks);
$smarty->assign('isadmin', $_SESSION["admin"]);
$smarty->assign('opt', $OPT); $smarty->assign('opt', $OPT);
$smarty->display('item.tpl'); $smarty->display('item.tpl');
?>

2
src/profile.php
View file

@ -81,5 +81,7 @@ $smarty->assign('fullname', $fullname);
$smarty->assign('email', $email); $smarty->assign('email', $email);
$smarty->assign('email_msgs', $email_msgs); $smarty->assign('email_msgs', $email_msgs);
$smarty->assign('comment', $comment); $smarty->assign('comment', $comment);
$smarty->assign('isadmin', $_SESSION["admin"]);
$smarty->assign('opt', $OPT); $smarty->assign('opt', $OPT);
$smarty->display('profile.tpl'); $smarty->display('profile.tpl');
?>

1
src/shop.php
View file

@ -210,6 +210,7 @@ $smarty->assign('ufullname', $ufullname);
$smarty->assign('shopfor', $shopfor); $smarty->assign('shopfor', $shopfor);
$smarty->assign('shoprows', $shoprows); $smarty->assign('shoprows', $shoprows);
$smarty->assign('userid', $userid); $smarty->assign('userid', $userid);
$smarty->assign('isadmin', $_SESSION["admin"]);
$smarty->assign('opt', $OPT); $smarty->assign('opt', $OPT);
$smarty->display('shop.tpl'); $smarty->display('shop.tpl');
?> ?>

8
src/templates/event.tpl
View file

@ -23,7 +23,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<link href="bootstrap/css/bootstrap-responsive.css" rel="stylesheet"> <link href="bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
</head> </head>
<body> <body>
<div class="container"> {include file='navbar.tpl' isadmin=$isadmin}
<div class="container" style="padding-top: 60px;">
{if isset($message)} {if isset($message)}
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
@ -98,7 +100,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<div class="control-group {if isset($description_error)}warning{/if}"> <div class="control-group {if isset($description_error)}warning{/if}">
<label class="control-label" for="description">Description</label> <label class="control-label" for="description">Description</label>
<div class="controls"> <div class="controls">
<input id="description" name="description" type="text" value="{$description|escape:'htmlall'}" class="input-xlarge" maxlength="255"> <input id="description" name="description" type="text" value="{$description|escape:'htmlall'}" class="input-xlarge" maxlength="255" placeholder="Description">
{if isset($description_error)} {if isset($description_error)}
<span class="help-inline">{$description_error}</span> <span class="help-inline">{$description_error}</span>
{/if} {/if}
@ -107,7 +109,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<div class="control-group {if isset($eventdate_error)}warning{/if}"> <div class="control-group {if isset($eventdate_error)}warning{/if}">
<label class="control-label" for="eventdate">Event date</label> <label class="control-label" for="eventdate">Event date</label>
<div class="controls"> <div class="controls">
<input id="eventdate" name="eventdate" type="text" value="{$eventdate|escape:'htmlall'}" class="input-xlarge"> <input id="eventdate" name="eventdate" type="text" value="{$eventdate|escape:'htmlall'}" class="input-xlarge" placeholder="mm/dd/yyyy">
<p class="help-block">mm/dd/yyyy</p> <p class="help-block">mm/dd/yyyy</p>
{if isset($eventdate_error)} {if isset($eventdate_error)}
<span class="help-inline">{$eventdate_error}</span> <span class="help-inline">{$eventdate_error}</span>

39
src/templates/home.tpl
View file

@ -31,43 +31,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</script> </script>
</head> </head>
<body> <body>
<div class="navbar navbar-fixed-top"> {include file='navbar.tpl'}
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="/">Gift Registry</a>
<div id="main-menu" class="nav-collapse">
<ul id="main-menu-left" class="nav">
<li><a href="shoplist.php">My Shopping List</a></li>
<li><a href="mylist.php">My Items (printable)</a></li>
</ul>
<ul id="main-menu-right" class="nav pull-right">
<li><a href="profile.php">Update Profile</a></li>
<li><a href="event.php">Manage Events</a></li>
{if $isadmin}
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown">
Admin
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="users.php">Manage Users</a></li>
<li><a href="families.php">Manage Families</a></li>
<li><a href="categories.php">Manage Categories</a></li>
<li><a href="ranks.php">Manage Ranks</a></li>
</ul>
</li>
{/if}
<li><a href="login.php?action=logout">Logout</a></li>
</ul>
</div>
</div>
</div>
</div>
<div class="container" style="padding-top: 60px;"> <div class="container" style="padding-top: 60px;">
{if isset($message)} {if isset($message)}
<div class="row"> <div class="row">

12
src/templates/item.tpl
View file

@ -23,7 +23,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<link href="bootstrap/css/bootstrap-responsive.css" rel="stylesheet"> <link href="bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
</head> </head>
<body> <body>
<div class="container"> {include file='navbar.tpl' isadmin=$isadmin}
<div class="container" style="padding-top: 60px;">
{if $opt.show_helptext} {if $opt.show_helptext}
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
@ -56,7 +58,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<div class="control-group {if isset($description_error)}warning{/if}"> <div class="control-group {if isset($description_error)}warning{/if}">
<label class="control-label" for="description">Description</label> <label class="control-label" for="description">Description</label>
<div class="controls"> <div class="controls">
<input id="description" name="description" type="text" value="{$description|escape:'htmlall'}" class="input-xlarge" placeholder="Description" maxlength="255" size="50"> <input id="description" name="description" type="text" value="{$description|escape:'htmlall'}" class="input-xlarge" placeholder="Description" maxlength="255">
{if isset($description_error)} {if isset($description_error)}
<span class="help-inline">{$description_error}</span> <span class="help-inline">{$description_error}</span>
{/if} {/if}
@ -88,7 +90,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<div class="control-group {if isset($source_error)}warning{/if}"> <div class="control-group {if isset($source_error)}warning{/if}">
<label class="control-label" for="source">Store/Retailer</label> <label class="control-label" for="source">Store/Retailer</label>
<div class="controls"> <div class="controls">
<input id="source" name="source" type="text" value="{$source|escape:'htmlall'}" class="input-xlarge" maxlength="255" size="50" placeholder="Source"> <input id="source" name="source" type="text" value="{$source|escape:'htmlall'}" class="input-xlarge" maxlength="255" placeholder="Source">
{if isset($source_error)} {if isset($source_error)}
<span class="help-inline">{$source_error}</span> <span class="help-inline">{$source_error}</span>
{/if} {/if}
@ -111,7 +113,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<div class="control-group {if isset($quantity_error)}warning{/if}"> <div class="control-group {if isset($quantity_error)}warning{/if}">
<label class="control-label" for="quantity">Quantity</label> <label class="control-label" for="quantity">Quantity</label>
<div class="controls"> <div class="controls">
<input id="quantity" name="quantity" type="text" value="{$quantity|escape:'htmlall'}" class="input-xlarge" maxlength="3" size="3"> <input id="quantity" name="quantity" type="text" value="{$quantity|escape:'htmlall'}" class="input-xlarge" maxlength="3">
{if isset($quantity_error)} {if isset($quantity_error)}
<span class="help-inline">{$quantity_error}</span> <span class="help-inline">{$quantity_error}</span>
{/if} {/if}
@ -123,7 +125,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<div class="control-group {if isset($url_error)}warning{/if}"> <div class="control-group {if isset($url_error)}warning{/if}">
<label class="control-label" for="url">URL (optional)</label> <label class="control-label" for="url">URL (optional)</label>
<div class="controls"> <div class="controls">
<input id="url" name="url" type="text" value="{$url|escape:'htmlall'}" class="input-xlarge" maxlength="255" size="50"> <input id="url" name="url" type="text" value="{$url|escape:'htmlall'}" class="input-xlarge" maxlength="255">
{if isset($url_error)} {if isset($url_error)}
<span class="help-inline">{$url_error}</span> <span class="help-inline">{$url_error}</span>
{/if} {/if}

53
src/templates/navbar.tpl Normal file
View file

@ -0,0 +1,53 @@
{*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*}
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="/">Gift Registry</a>
<div id="main-menu" class="nav-collapse">
<ul id="main-menu-left" class="nav">
<li><a href="shoplist.php">My Shopping List</a></li>
<li><a href="mylist.php">My Items (printable)</a></li>
</ul>
<ul id="main-menu-right" class="nav pull-right">
<li><a href="profile.php">Update Profile</a></li>
<li><a href="event.php">Manage Events</a></li>
{if $isadmin}
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown">
Admin
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="users.php">Manage Users</a></li>
<li><a href="families.php">Manage Families</a></li>
<li><a href="categories.php">Manage Categories</a></li>
<li><a href="ranks.php">Manage Ranks</a></li>
</ul>
</li>
{/if}
<li><a href="login.php?action=logout">Logout</a></li>
</ul>
</div>
</div>
</div>
</div>

4
src/templates/profile.tpl
View file

@ -48,7 +48,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</script> </script>
</head> </head>
<body> <body>
<div class="container"> {include file='navbar.tpl' isadmin=$isadmin}
<div class="container" style="padding-top: 60px;">
<div class="row"> <div class="row">
<div class="span8 offset2"> <div class="span8 offset2">
<form name="changepwd" action="profile.php" method="POST" onSubmit="return confirmPassword();" class="well form-horizontal"> <form name="changepwd" action="profile.php" method="POST" onSubmit="return confirmPassword();" class="well form-horizontal">

2
src/templates/receive.tpl
View file

@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<div class="control-group"> <div class="control-group">
<label class="control-label" for="quantity">Quantity received (maximum of {$quantity})</label> <label class="control-label" for="quantity">Quantity received (maximum of {$quantity})</label>
<div class="controls"> <div class="controls">
<input type="text" id="quantity" name="quantity" value="1" size="3" maxlength="3"> <input type="text" id="quantity" name="quantity" value="1" maxlength="3">
<p class="help-block">Once you have received all of an item, it will be deleted.</p> <p class="help-block">Once you have received all of an item, it will be deleted.</p>
</div> </div>
</div> </div>

6
src/templates/shop.tpl
View file

@ -28,7 +28,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</script> </script>
</head> </head>
<body> <body>
<div class="container"> {include file='navbar.tpl' isadmin=$isadmin}
<div class="container" style="padding-top: 60px;">
{if isset($message)} {if isset($message)}
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
@ -39,7 +41,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</div> </div>
{/if} {/if}
<div class="row"> <div class="row">
<h1>Gift Registry - Shopping List for {$ufullname|escape:'htmlall'}</h1> <h1>Shopping List for {$ufullname|escape:'htmlall'}</h1>
</div> </div>
{if $opt.show_helptext} {if $opt.show_helptext}
<div class="row"> <div class="row">