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

-UI changes.

Browse source 
-Blank row now displays start and end time
-Changed default playlist name
This commit is contained in:
mkonecny 2011-02-09 17:02:32 -05:00
parent a43da4e887
commit a447839745
5 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/controllers/PlaylistController.php
View file

@ -88,7 +88,7 @@ class PlaylistController extends Zend_Controller_Action
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$pl = new Playlist();
$pl_id = $pl->create("Test Zend Auth");
$pl_id = $pl->create("Untitled Playlist");
$pl->setPLMetaData('dc:creator', $userInfo->login);
$this->changePlaylist($pl_id);

9
application/models/Nowplaying.php
View file

@ -4,8 +4,11 @@ class Application_Model_Nowplaying
{
public static function InsertBlankRow($i, $rows){
$startDate = explode(".", $rows[$i-1][3]);
$endDate = explode(".", $rows[$i][2]);
$startDateFull = $rows[$i-1][3];
$endDateFull = $rows[$i][2];
$startDate = explode(".", $startDateFull);
$endDate = explode(".", $endDateFull);
$epochStartMS = strtotime($startDate[0])*1000;
$epochEndMS = strtotime($endDate[0])*1000;
@ -15,7 +18,7 @@ class Application_Model_Nowplaying
if (count($endDate) > 1)
$epochEndMS += $endDate[1];
$blankRow = array(array("b", "-", "-", "-", Application_Model_DateHelper::ConvertMSToHHMMSSmm($epochEndMS - $epochStartMS), "-", "-", "-", "-" , "-", "", ""));
$blankRow = array(array("b", $startDateFull, $startDateFull, $endDate, Application_Model_DateHelper::ConvertMSToHHMMSSmm($epochEndMS - $epochStartMS), "-", "-", "-", "-" , "-", "", ""));
array_splice($rows, $i, 0, $blankRow);
return $rows;
}

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

@ -6,13 +6,11 @@
<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>
<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>