Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	application/controllers/ScheduleController.php
This commit is contained in:
Naomi 2011-02-09 14:15:18 -05:00
commit 108bf65930
33 changed files with 787 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/views/scripts/nowplaying/day-view.phtml Normal file
View file

@ -0,0 +1,2 @@
<input type="text" id="datepicker" class="input_text">
<div id='demo'></div>

1
application/views/scripts/nowplaying/index.phtml
View file

@ -1,2 +1 @@
<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 id='demo'></div>

15
application/views/scripts/schedule/edit-show.phtml Normal file
View file

@ -0,0 +1,15 @@
<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>

38
application/views/scripts/user/add-user.phtml
View file

@ -1,3 +1,35 @@
<?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="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix">
<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>
</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>

1
application/views/scripts/user/get-user-data-table-info.phtml Normal file
View file

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

3
application/views/scripts/user/get-user-data.phtml Normal file
View file

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

3
application/views/scripts/user/remove-user.phtml Normal file
View file

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