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:
	python_apps/show-recorder/install/recorder-daemontools.sh
This commit is contained in:
naomiaro 2011-03-24 23:10:04 -04:00
commit d5707c514b
13 changed files with 53 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/views/scripts/partialviews/header.phtml
View file

@ -14,7 +14,7 @@
<div class="now-playing-info show">
<div class="recording-show" style="display: none;"></div>
<span id="playlist"></span>
<span class="lenght">00:00</span>
<span id="show-length" class="show-length"></span>
</div>
<div class="progressbar">
<div class="progress-show" id='progress-show' style="width:0%;"></div>

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

@ -26,6 +26,7 @@
</div>
</div>
<div class="user-data simple-formblock" id="user_details">
<?php echo $this->successMessage ?>
<fieldset class="padded">
<?php echo $this->form ?>
</fieldset>