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

This commit is contained in:
naomiaro 2011-02-09 22:37:26 -05:00
commit d5efcac452
56 changed files with 1166 additions and 510 deletions

View file

@ -10,5 +10,5 @@
</label>
<?php $i=$i+1 ?>
<?php endforeach; ?>
<?php echo $this->formErrors($this->element->getMessages()) ?>
<?php if($this->element->hasErrors()) { echo $this->formErrors($this->element->getMessages());} ?>
</dd>

View file

@ -9,8 +9,5 @@
$this->element->getAttribs()
) ?>
<?php if($this->element->hasErrors()) {
echo $this->formErrors($this->element->getMessages());
}
?>
<?php if($this->element->hasErrors()) { echo $this->formErrors($this->element->getMessages());} ?>
</dd>

View file

@ -0,0 +1,5 @@
<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,2 +1,4 @@
<div style="text-align:right;"><a href="javascript:void(0);" onclick="setViewType(0)">Now View</a> | <a href="javascript:void(0);" onclick="setViewType(1)">Day View</a></div>
<div class="button-bar-top">
<a href="javascript:void(0)" class="toggle-button-active" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button end-button" id="day_view">Day View</a>
</div>
<div id='demo'></div>

View file

@ -1,4 +1 @@
<?php
$this->form->setAction($this->url());
echo $this->form;
<?php echo $this->form; ?>

View file

@ -1,38 +1,28 @@
<div class="wrapper" id="content">
<form method="post" action="">
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<ul>
<li><a href="#schedule-show-what"><span>What</span></a></li>
<li><a href="#schedule-show-when"><span>When</span></a></li>
<li><a href="#schedule-show-who"><span>Who</span></a></li>
<li><a href="#schedule-show-style"><span>Style</span></a></li>
</ul>
<div class="button-bar">
<button id="add-show-submit" class="right-floated">Add this show</button></div>
<div class="clear"></div>
<form id="add-show-form" method="post" action="">
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div class="button-bar">
<button id="add-show-submit" class="right-floated">Add this show</button>
<button id="add-show-close" class="right-floated">Close</button>
</div>
<div class="clear"></div>
<div id="schedule-show-what">
<?php echo $this->what ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>When</h3>
<div id="schedule-show-when" class="collapsible-content">
<?php echo $this->when ?>
<?php echo $this->repeats ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Who</h3>
<div id="schedule-show-who" class="collapsible-content">
<?php echo $this->who ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Style</h3>
<div id="schedule-show-style" class="collapsible-content">
<?php echo $this->style ?>
</div>
</div>
</form>
<?php if(isset($this->overlap)) : ?>
<div id="schedule-add-show-overlap" style="display:block;">
<div>Overlap</div>
<?php echo $this->partialLoop('schedule/show-overlap.phtml', $this->overlap); ?>
</div>
<?php endif;?>
<div id="fullcalendar_show_display" class="ui-widget-content block-shadow omega-block padded"></div>
<div id="schedule-show-what">
<?php echo $this->what ?>
</div>
<div id="schedule-show-when">
<?php echo $this->when ?>
<?php echo $this->repeats ?>
</div>
<div id="schedule-show-who">
<?php echo $this->who ?>
</div>
<div id="schedule-show-style">
<?php echo $this->style ?>
</div>
</div>
</form>
<div id="fullcalendar_show_display" class="ui-widget-content block-shadow omega-block padded"></div>
</div>

View file

@ -0,0 +1,11 @@
<div>
<div id="schedule-show-what">
<?php echo $this->what ?>
</div>
<div id="schedule-show-who">
<?php echo $this->who ?>
</div>
<div id="schedule-show-style">
<?php echo $this->style ?>
</div>
</div>

View file

@ -1,4 +0,0 @@
<div>
<span><?php echo $this->name ?></span>
<span><?php echo $this->start_time ?></span>-<span><?php echo $this->end_time ?></span>
</div>

View file

@ -1,3 +1,33 @@
<?php
echo $this->form;
<div class=
"ui-widget ui-widget-content block-shadow clearfix padded-strong user-management">
<h2>
Manage users
</h2>
<div class="user-list-wrapper">
<div id="users_wrapper" class="dataTables_wrapper">
<div class="button-holder">
<button type="button" id="add_user_button" name=
"search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
<span class="ui-button-text">Add user</span></button>
</div>
<table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable">
<thead>
<tr>
<th>id</th>
<th>Name</th>
<th>Role</th>
<th>Delete</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
</div>
<div class="user-data simple-formblock" id="user_details">
<fieldset class="padded">
<?php echo $this->form ?>
</fieldset>
</div>
</div>

View file

@ -0,0 +1 @@
<br /><br /><center>View script for controller <b>User</b> and script/action name <b>getUserDataTableInfo</b></center>

View file

@ -0,0 +1,3 @@
<?php
echo $this->entries;
?>

View file

@ -0,0 +1,3 @@
<?php
echo this->entries;
?>