Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
Naomi 2011-02-09 16:29:27 -05:00
commit 86d60dda9e
8 changed files with 78 additions and 28 deletions

View file

@ -1,2 +1,5 @@
<input type="text" id="datepicker" class="input_text">
<div class="button-bar-top">
Date:<input type="text" id="datepicker" class="input_text">
<a href="javascript:void(0)" class="toggle-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button-active end-button" id="day_view">Day View</a>
</div>
<div id='demo'></div>

View file

@ -1 +1,4 @@
<div class="button-bar-top">
<a href="javascript:void(0)" class="toggle-button-active end-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button" id="day_view">Day View</a>
</div>
<div id='demo'></div>