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

Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x

This commit is contained in:
denise 2013-10-07 14:16:36 -04:00
parent ff46883c1b 5c74cabddb
commit ac8f1d73f3
37 changed files with 217 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CREDITS
View File

@ -5,6 +5,9 @@ CREDITS
Version 2.5.0 Version 2.5.0
------------- -------------
Albert Santoni (albert.santoni@sourcefabric.org)
Rold: Developer Team Lead
Denise Rigato (denise.rigato@sourcefabric.org) Denise Rigato (denise.rigato@sourcefabric.org)
Role: Software Developer Role: Software Developer

20
airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
View File

@ -20,26 +20,26 @@
<ul class="jp-controls"> <ul class="jp-controls">
<?php if ($this->type != "audioclip"): ?> <?php if ($this->type != "audioclip"): ?>
<li class="ui-state-default ui-corner-all jp-previous"> <li class="ui-state-default ui-corner-all jp-previous">
<span class="ui-icon ui-icon-seek-prev" tabindex="1"><? echo _("previous") ?></span> <span class="ui-icon ui-icon-seek-prev" tabindex="1"><?php echo _("previous") ?></span>
</li> </li>
<?php endif;?> <?php endif;?>
<li class="ui-state-default ui-corner-all jp-play"> <li class="ui-state-default ui-corner-all jp-play">
<span class="ui-icon ui-icon-play" tabindex="1"><? echo _("play") ?></span> <span class="ui-icon ui-icon-play" tabindex="1"><?php echo _("play") ?></span>
</li> </li>
<li class="ui-state-default ui-corner-all jp-pause"> <li class="ui-state-default ui-corner-all jp-pause">
<span class="ui-icon ui-icon-pause" tabindex="1"><? echo _("pause") ?></span> <span class="ui-icon ui-icon-pause" tabindex="1"><?php echo _("pause") ?></span>
</li> </li>
<?php if ($this->type != "audioclip"): ?> <?php if ($this->type != "audioclip"): ?>
<li class="ui-state-default ui-corner-all jp-next"> <li class="ui-state-default ui-corner-all jp-next">
<span class="ui-icon ui-icon-seek-next" tabindex="1"><? echo _("next") ?></span> <span class="ui-icon ui-icon-seek-next" tabindex="1"><?php echo _("next") ?></span>
</li> </li>
<?php endif;?> <?php endif;?>
<li class="ui-state-default ui-corner-all jp-stop"> <li class="ui-state-default ui-corner-all jp-stop">
<span class="ui-icon ui-icon-stop" tabindex="1"><? echo _("stop") ?></span> <span class="ui-icon ui-icon-stop" tabindex="1"><?php echo _("stop") ?></span>
</li> </li>
</ul> </ul>
<div class="jp-time-block"> <div class="jp-time-block">
@ -57,16 +57,16 @@
</div> </div>
<div class="jp-volume-block"> <div class="jp-volume-block">
<div class="jp-mute"> <div class="jp-mute">
<span class="ui-icon" tabindex="1" title="mute"><? echo _("mute") ?></span> <span class="ui-icon" tabindex="1" title="mute"><?php echo _("mute") ?></span>
</div> </div>
<div class="jp-unmute"> <div class="jp-unmute">
<span class="ui-icon" tabindex="1" title="unmute"><? echo _("unmute") ?></span> <span class="ui-icon" tabindex="1" title="unmute"><?php echo _("unmute") ?></span>
</div> </div>
<div class="jp-volume-bar"> <div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div> <div class="jp-volume-bar-value"></div>
</div> </div>
<div class="jp-volume-max"> <div class="jp-volume-max">
<span class="ui-icon" tabindex="1" title="max volume"><? echo _("max volume") ?></span> <span class="ui-icon" tabindex="1" title="max volume"><?php echo _("max volume") ?></span>
</div> </div>
</div> </div>
</div> </div>
@ -76,8 +76,8 @@
</ul> </ul>
</div> </div>
<div class="jp-no-solution"> <div class="jp-no-solution">
<span><? echo _("Update Required") ?></span> <span><?php echo _("Update Required") ?></span>
<? sprintf(_("To play the media you will need to either update your browser to a recent version or update your %sFlash plugin%s."), <?php sprintf(_("To play the media you will need to either update your browser to a recent version or update your %sFlash plugin%s."),
"<a href='http://get.adobe.com/flashplayer/' target='_blank'>", "<a href='http://get.adobe.com/flashplayer/' target='_blank'>",
"</a>") ?> "</a>") ?>
</div> </div>

2
airtime_mvc/application/views/scripts/dashboard/about.phtml
View File

@ -1,5 +1,5 @@
<div class="text-content"> <div class="text-content">
<h2><? echo _("About") ?></h2> <h2><?php echo _("About") ?></h2>
<p> <p>
<?php <?php
echo sprintf(_("%sAirtime%s %s, the open radio software for scheduling and remote station management. %s"), echo sprintf(_("%sAirtime%s %s, the open radio software for scheduling and remote station management. %s"),

8
airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
View File

@ -1,5 +1,5 @@
<div id="content" class="jp-container"> <div id="content" class="jp-container">
<h1><? echo _("Live stream") ?></h1> <h1><?php echo _("Live stream") ?></h1>
<a id="popup-link" href="#"><?php echo _("Share") ?></a> <a id="popup-link" href="#"><?php echo _("Share") ?></a>
<?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?> <?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?>
<script> <script>
@ -61,7 +61,7 @@ $(document).ready(function(){
<input id="popup-share-link" type="text" readonly="readonly"/> <input id="popup-share-link" type="text" readonly="readonly"/>
</div> </div>
<div class="jp-stream stream-player-label"> <div class="jp-stream stream-player-label">
<div class="jp-stream-text"><? echo _("Select stream:"); ?></div> <div class="jp-stream-text"><?php echo _("Select stream:"); ?></div>
<form id="form1" method="post" action=""> <form id="form1" method="post" action="">
<select id="combo-box"> <select id="combo-box">
@ -87,8 +87,8 @@ $(document).ready(function(){
<div class="jp-type-single"> <div class="jp-type-single">
<div id="jp_interface_1" class="jp-gui jp-interface"> <div id="jp_interface_1" class="jp-gui jp-interface">
<ul class="jp-controls"> <ul class="jp-controls">
<li><a title="mute" tabindex="1" class="jp-mute" href="javascript:;"><? echo _("mute") ?></a></li> <li><a title="mute" tabindex="1" class="jp-mute" href="javascript:;"><?php echo _("mute") ?></a></li>
<li><a title="unmute" tabindex="1" class="jp-unmute" href="javascript:;"><? echo _("unmute") ?></a></li> <li><a title="unmute" tabindex="1" class="jp-unmute" href="javascript:;"><?php echo _("unmute") ?></a></li>
</ul> </ul>
<div class="jp-volume-bar"> <div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div> <div class="jp-volume-bar-value"></div>

4
airtime_mvc/application/views/scripts/error/error.phtml
View File

@ -3,14 +3,14 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><? echo _("Zend Framework Default Application") ?></title> <title><?php echo _("Zend Framework Default Application") ?></title>
</head> </head>
<body> <body>
<div class="error-content"> <div class="error-content">
<h2><?php echo _("Page not found!")?></h2> <h2><?php echo _("Page not found!")?></h2>
<p><?php echo _("Looks like the page you were looking for doesn't exist!")?></p> <p><?php echo _("Looks like the page you were looking for doesn't exist!")?></p>
<div class="button-bar"> <div class="button-bar">
<a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><? echo _("Help") ?></a> <a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><?php echo _("Help") ?></a>
</div> </div>
</div> </div>
</body> </body>

2
airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
View File

@ -50,7 +50,7 @@
</dd> </dd>
</div> </div>
<dt id="Connection_URL-label"> <dt id="Connection_URL-label">
<label for="outputStreamURL"><? echo _("Connection URL: "); ?></label> <label for="outputStreamURL"><?php echo _("Connection URL: "); ?></label>
</dt> </dt>
<dd id="Connection_URL-element"> <dd id="Connection_URL-element">
<span id="stream_url" class="static_text"><?php echo $this->connection_url; ?></span> <span id="stream_url" class="static_text"><?php echo $this->connection_url; ?></span>

6
airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
View File

@ -1,7 +1,7 @@
<fieldset id="add_show_rebroadcast_absolute"> <fieldset id="add_show_rebroadcast_absolute">
<dl> <dl>
<dt id="add_show_hosts_rebroadcast_day-label" class="block-display"> <dt id="add_show_hosts_rebroadcast_day-label" class="block-display">
<label for="add_show_rebroadcast_day" class="optional"><? echo _("Choose Days:"); ?></label> <label for="add_show_rebroadcast_day" class="optional"><?php echo _("Choose Days:"); ?></label>
</dt> </dt>
<dd id="add_show_rebroadcast_day-element" class="block-display clearfix"> <dd id="add_show_rebroadcast_day-element" class="block-display clearfix">
<ul class="formrow-repeat"> <ul class="formrow-repeat">
@ -15,7 +15,7 @@
<?php if($i > 1): ?> <?php if($i > 1): ?>
<a class="ui-button ui-button-icon-only ui-widget ui-state-default" id="remove_rebroadcast_absolute_<?php echo $i ?>"> <a class="ui-button ui-button-icon-only ui-widget ui-state-default" id="remove_rebroadcast_absolute_<?php echo $i ?>">
<span class="ui-icon ui-icon-closethick"></span> <span class="ui-icon ui-icon-closethick"></span>
<span class="ui-button-text"><? echo _("Remove") ?></span> <span class="ui-button-text"><?php echo _("Remove") ?></span>
</a> </a>
<?php endif; ?> <?php endif; ?>
<?php if(($this->element->getElement('add_show_rebroadcast_date_absolute_'.$i)->hasErrors()) <?php if(($this->element->getElement('add_show_rebroadcast_date_absolute_'.$i)->hasErrors())
@ -37,7 +37,7 @@
</ul> </ul>
<a class="ui-button ui-button-icon-only ui-widget ui-state-default add_absolute_rebroadcast_day"> <a class="ui-button ui-button-icon-only ui-widget ui-state-default add_absolute_rebroadcast_day">
<span class="ui-icon ui-icon-plusthick"></span> <span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><? echo _("Add") ?></span> <span class="ui-button-text"><?php echo _("Add") ?></span>
</a> </a>
</dd> </dd>
</dl> </dl>

6
airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
View File

@ -1,7 +1,7 @@
<fieldset id="add_show_rebroadcast_relative"> <fieldset id="add_show_rebroadcast_relative">
<dl> <dl>
<dt id="add_show_hosts_rebroadcast_repeat_day-label" class="block-display"> <dt id="add_show_hosts_rebroadcast_repeat_day-label" class="block-display">
<label for="add_show_rebroadcast_repeat_day" class="optional"><? echo _("Repeat Days:"); ?></label> <label for="add_show_rebroadcast_repeat_day" class="optional"><?php echo _("Repeat Days:"); ?></label>
</dt> </dt>
<dd id="add_show_rebroadcast_repeat_day-element" class="block-display clearfix"> <dd id="add_show_rebroadcast_repeat_day-element" class="block-display clearfix">
<ul class="formrow-repeat"> <ul class="formrow-repeat">
@ -15,7 +15,7 @@
<?php if($i > 1): ?> <?php if($i > 1): ?>
<a class="ui-button ui-button-icon-only ui-widget ui-state-default" id="remove_rebroadcast_<?php echo $i ?>"> <a class="ui-button ui-button-icon-only ui-widget ui-state-default" id="remove_rebroadcast_<?php echo $i ?>">
<span class="ui-icon ui-icon-closethick"></span> <span class="ui-icon ui-icon-closethick"></span>
<span class="ui-button-text"><? echo _("Remove") ?></span> <span class="ui-button-text"><?php echo _("Remove") ?></span>
</a> </a>
<?php endif; ?> <?php endif; ?>
<?php if(($this->element->getElement('add_show_rebroadcast_date_'.$i)->hasErrors()) <?php if(($this->element->getElement('add_show_rebroadcast_date_'.$i)->hasErrors())
@ -38,7 +38,7 @@
</ul> </ul>
<a class="ui-button ui-button-icon-only ui-widget ui-state-default add_absolute_rebroadcast_day"> <a class="ui-button ui-button-icon-only ui-widget ui-state-default add_absolute_rebroadcast_day">
<span class="ui-icon ui-icon-plusthick"></span> <span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><? echo _("Add") ?></span> <span class="ui-button-text"><?php echo _("Add") ?></span>
</a> </a>
</dd> </dd>
</dl> </dl>

2
airtime_mvc/application/views/scripts/form/edit-user.phtml
View File

@ -1,4 +1,4 @@
<h2><? echo sprintf(_("%s's Settings"), $this->escape($this->currentUser)) ?></h2> <h2><?php echo sprintf(_("%s's Settings"), $this->escape($this->currentUser)) ?></h2>
<div id="current-user-container"> <div id="current-user-container">
<form id="current-user-form" class="edit-user-global" method="post" enctype="application/x-www-form-urlencoded"> <form id="current-user-form" class="edit-user-global" method="post" enctype="application/x-www-form-urlencoded">
<dl class="zend_form"> <dl class="zend_form">

2
airtime_mvc/application/views/scripts/form/login.phtml
View File

@ -31,7 +31,7 @@
<?php if (Application_Model_Preference::GetEnableSystemEmail()): ?> <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
<dt id="reset-label" class="hidden">&nbsp;</dt> <dt id="reset-label" class="hidden">&nbsp;</dt>
<dd id="reset-element" class="text-right"> <dd id="reset-element" class="text-right">
<a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><? echo _("Reset password") ?></a> <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><?php echo _("Reset password") ?></a>
</dd> </dd>
<?php endif; ?> <?php endif; ?>
<?php echo $this->element->getElement('captcha') ?> <?php echo $this->element->getElement('captcha') ?>

4
airtime_mvc/application/views/scripts/form/preferences.phtml
View File

@ -2,12 +2,12 @@
<?php echo $this->element->getSubform('preferences_general') ?> <?php echo $this->element->getSubform('preferences_general') ?>
<h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span><? echo _("Email / Mail Server Settings"); ?></h3> <h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span><?php echo _("Email / Mail Server Settings"); ?></h3>
<div class="collapsible-content" id="email-server-settings"> <div class="collapsible-content" id="email-server-settings">
<?php echo $this->element->getSubform('preferences_email_server') ?> <?php echo $this->element->getSubform('preferences_email_server') ?>
</div> </div>
<h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span><? echo _("SoundCloud Settings") ?></h3> <h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span><?php echo _("SoundCloud Settings") ?></h3>
<div class="collapsible-content" id="soundcloud-settings"> <div class="collapsible-content" id="soundcloud-settings">
<?php echo $this->element->getSubform('preferences_soundcloud') ?> <?php echo $this->element->getSubform('preferences_soundcloud') ?>

10
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
View File

@ -1,5 +1,5 @@
<fieldset class="padded stream-setting-global" style="margin-top: 15px"> <fieldset class="padded stream-setting-global" style="margin-top: 15px">
<legend><? echo _("Input Stream Settings") ?></legend> <legend><?php echo _("Input Stream Settings") ?></legend>
<dl class="zend_form"> <dl class="zend_form">
<dt id="auto_transition-label"> <dt id="auto_transition-label">
<label class="optional" for="auto_transition"><?php echo $this->element->getElement('auto_transition')->getLabel() ?> : <label class="optional" for="auto_transition"><?php echo $this->element->getElement('auto_transition')->getLabel() ?> :
@ -112,12 +112,12 @@
<dd id="master_dj_connection_url-element"> <dd id="master_dj_connection_url-element">
<span id="stream_url"><?php echo $this->element->getElement('master_dj_connection_url')->setValue($this->master_dj_connection_url) ?></span> <span id="stream_url"><?php echo $this->element->getElement('master_dj_connection_url')->setValue($this->master_dj_connection_url) ?></span>
<?php if(!$this->isDemo){?> <?php if(!$this->isDemo){?>
<a href=# id="connection_url_override" style="font-size: 12px;"><? echo _("Override") ?></a>&nbsp;&nbsp; <a href=# id="connection_url_override" style="font-size: 12px;"><?php echo _("Override") ?></a>&nbsp;&nbsp;
<span class="override_help_icon"> <span class="override_help_icon">
</span><br> </span><br>
<?php } ?> <?php } ?>
<div id="master_dj_connection_url_actions" style="display:none"> <div id="master_dj_connection_url_actions" style="display:none">
<a href=# id="ok" style="font-size: 12px;"><? echo _("OK") ?></a> <a href=# id="reset" style="font-size: 12px;"><? echo _("RESET"); ?></a> <a href=# id="ok" style="font-size: 12px;"><?php echo _("OK") ?></a> <a href=# id="reset" style="font-size: 12px;"><?php echo _("RESET"); ?></a>
</div> </div>
</dd> </dd>
<dt id="dj_harbor_input_port-label"> <dt id="dj_harbor_input_port-label">
@ -156,12 +156,12 @@
<dd id="live_dj_connection_url-element"> <dd id="live_dj_connection_url-element">
<span id="stream_url"><?php echo $this->element->getElement('live_dj_connection_url')->setValue($this->live_dj_connection_url) ?></span> <span id="stream_url"><?php echo $this->element->getElement('live_dj_connection_url')->setValue($this->live_dj_connection_url) ?></span>
<?php if( !$this->isDemo ){?> <?php if( !$this->isDemo ){?>
<a href=# id="connection_url_override" style="font-size: 12px;"><? echo _("Override") ?></a>&nbsp;&nbsp; <a href=# id="connection_url_override" style="font-size: 12px;"><?php echo _("Override") ?></a>&nbsp;&nbsp;
<span class="override_help_icon"> <span class="override_help_icon">
</span><br> </span><br>
<?php } ?> <?php } ?>
<div id="live_dj_connection_url_actions" style="display:none"> <div id="live_dj_connection_url_actions" style="display:none">
<a href=# id="ok" style="font-size: 12px;"><? echo _("OK") ?></a> <a href=# id="reset" style="font-size: 12px;"><? echo _("RESET"); ?></a> <a href=# id="ok" style="font-size: 12px;"><?php echo _("OK") ?></a> <a href=# id="reset" style="font-size: 12px;"><?php echo _("RESET"); ?></a>
</div> </div>
</dd> </dd>
</dl> </dl>

4
airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
View File

@ -16,7 +16,7 @@
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dd class="block-display selected-item"><strong><? echo _("Current Import Folder:"); ?></strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd> <dd class="block-display selected-item"><strong><?php echo _("Current Import Folder:"); ?></strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dt id="watchedFolder-label" class="block-display"> <dt id="watchedFolder-label" class="block-display">
<label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label> <label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>
@ -47,7 +47,7 @@
<?php endforeach; ?> <?php endforeach; ?>
<?php else: ?> <?php else: ?>
<dd class="block-display selected-item"> <dd class="block-display selected-item">
<span><? echo _("You are not watching any media folders."); ?></span> <span><?php echo _("You are not watching any media folders."); ?></span>
</dd> </dd>
<?php endif; ?> <?php endif; ?>

4
airtime_mvc/application/views/scripts/form/register-dialog.phtml
View File

@ -161,7 +161,7 @@
<div id="show_what_sending" style="display: block;"> <div id="show_what_sending" style="display: block;">
<fieldset class="display_field toggle closed"> <fieldset class="display_field toggle closed">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Show me what I am sending ") ?></legend> <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><?php echo _("Show me what I am sending ") ?></legend>
<dl> <dl>
<?php echo $this->element->getElement('SendInfo') ?> <?php echo $this->element->getElement('SendInfo') ?>
</dl> </dl>
@ -175,7 +175,7 @@
<?php echo $this->element->getElement('Privacy')->getLabel() ?> <?php echo $this->element->getElement('Privacy')->getLabel() ?>
</label> </label>
<?php }else{?> <?php }else{?>
<a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;"><? echo _("Terms and Conditions") ?></a> <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;"><?php echo _("Terms and Conditions") ?></a>
<?php }?> <?php }?>
</div> </div>
</form> </form>

2
airtime_mvc/application/views/scripts/form/showbuilder.phtml
View File

@ -4,7 +4,7 @@
<?php echo $this->element->getElement('sb_time_end'); ?> <?php echo $this->element->getElement('sb_time_end'); ?>
<a id="sb_submit" class="btn btn-small" href="#" title="Display shows in the specified date and time range"> <a id="sb_submit" class="btn btn-small" href="#" title="Display shows in the specified date and time range">
<i class="icon-white icon-search"></i><? echo " "._("Find Shows") ?></a> <i class="icon-white icon-search"></i><?php echo " "._("Find Shows") ?></a>
<div class="sb-advanced-options"> <div class="sb-advanced-options">
<fieldset class="padded display_field push-down-8 closed"> <fieldset class="padded display_field push-down-8 closed">
<legend style="cursor: pointer;"> <legend style="cursor: pointer;">

4
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View File

@ -1,6 +1,6 @@
<form id="smart-block-form" method="post" action=""> <form id="smart-block-form" method="post" action="">
<fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?> sb-criteria-fieldset' id='smart_block_options'> <fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?> sb-criteria-fieldset' id='smart_block_options'>
<legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span><? echo _("Smart Block Options") ?></legend> <legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span><?php echo _("Smart Block Options") ?></legend>
<dl class='zend_form search-criteria'> <dl class='zend_form search-criteria'>
<div class='btn-toolbar clearfix'> <div class='btn-toolbar clearfix'>
@ -60,7 +60,7 @@
</a> </a>
<?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) ?> <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) ?>
<?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?> <?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>
<span class='sp_text_font' id="extra_criteria" <?php echo $this->element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><? echo _(" to "); ?><?php echo $this->element->getElement('sp_criteria_extra_'.$i."_".$j) ?></span> <span class='sp_text_font' id="extra_criteria" <?php echo $this->element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo _(" to "); ?><?php echo $this->element->getElement('sp_criteria_extra_'.$i."_".$j) ?></span>
<a style='margin-right:3px' class='btn btn-small btn-danger' id='criteria_remove_<?php echo $i ?>'> <a style='margin-right:3px' class='btn btn-small btn-danger' id='criteria_remove_<?php echo $i ?>'>
<i class='icon-white icon-remove'></i> <i class='icon-white icon-remove'></i>

4
airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
View File

@ -1,7 +1,7 @@
<?php <?php
$s_name = "s".$this->stream_number; $s_name = "s".$this->stream_number;
?> ?>
<h3 class="collapsible-header <?php echo $this->stream_number == '1'?"closed":""?>"><span class="arrow-icon"></span><? echo _("Stream "); ?><?php echo $this->stream_number?></h3> <h3 class="collapsible-header <?php echo $this->stream_number == '1'?"closed":""?>"><span class="arrow-icon"></span><?php echo _("Stream "); ?><?php echo $this->stream_number?></h3>
<div class="stream-setting-content" <?php echo $this->enabled == 0?'style="display: none;':''?> id="<?php echo $s_name?>-config"> <div class="stream-setting-content" <?php echo $this->enabled == 0?'style="display: none;':''?> id="<?php echo $s_name?>-config">
<fieldset class="padded"> <fieldset class="padded">
<dl class="zend_form clearfix"> <dl class="zend_form clearfix">
@ -205,7 +205,7 @@
</dl> </dl>
</fieldset> </fieldset>
<dt id="outputStreamURL-label"> <dt id="outputStreamURL-label">
<label for="outputStreamURL"><? echo _("Stream URL: "); ?></label> <label for="outputStreamURL"><?php echo _("Stream URL: "); ?></label>
</dt> </dt>
<dd id="outputStreamURL-element"> <dd id="outputStreamURL-element">
<span id="stream_url" class="static_text"></span> <span id="stream_url" class="static_text"></span>

4
airtime_mvc/application/views/scripts/form/support-setting.phtml
View File

@ -161,7 +161,7 @@
</dl> </dl>
<div id="show_what_sending" style="display: block;"> <div id="show_what_sending" style="display: block;">
<fieldset class="display_field toggle closed"> <fieldset class="display_field toggle closed">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Show me what I am sending ") ?></legend> <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><?php echo _("Show me what I am sending ") ?></legend>
<dl> <dl>
<?php echo $this->element->getElement('SendInfo') ?> <?php echo $this->element->getElement('SendInfo') ?>
</dl> </dl>
@ -183,7 +183,7 @@
</ul> </ul>
<?php endif; ?> <?php endif; ?>
<?php }else{?> <?php }else{?>
<a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;"><? echo _("Sourcefabric Privacy Policy") ?></a> <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;"><?php echo _("Sourcefabric Privacy Policy") ?></a>
<?php }?> <?php }?>
</div> </div>
</fieldset> </fieldset>

74
airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
View File

@ -6,46 +6,46 @@ foreach ($this->md as $key => &$value) {
?> ?>
<?php if($this->type == "audioclip") : ?> <?php if($this->type == "audioclip") : ?>
<table class='library-track-md'> <table class='library-track-md'>
<tr><td><? echo _("Title:"); ?></td><td><?php echo ($this->md["MDATA_KEY_TITLE"]);?></td></tr> <tr><td><?php echo _("Title:"); ?></td><td><?php echo ($this->md["MDATA_KEY_TITLE"]);?></td></tr>
<tr><td><? echo _("Creator:"); ?></td><td><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></td></tr> <tr><td><?php echo _("Creator:"); ?></td><td><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></td></tr>
<tr><td><? echo _("Album:"); ?></td><td><?php echo ($this->md["MDATA_KEY_SOURCE"]);?></td></tr> <tr><td><?php echo _("Album:"); ?></td><td><?php echo ($this->md["MDATA_KEY_SOURCE"]);?></td></tr>
<tr><td><? echo _("Track:"); ?></td><td><?php echo ($this->md["MDATA_KEY_TRACKNUMBER"]);?></td></tr> <tr><td><?php echo _("Track:"); ?></td><td><?php echo ($this->md["MDATA_KEY_TRACKNUMBER"]);?></td></tr>
<tr><td><? echo _("Length:"); ?></td><td><?php echo ($this->md["MDATA_KEY_DURATION"]);?></td></tr> <tr><td><?php echo _("Length:"); ?></td><td><?php echo ($this->md["MDATA_KEY_DURATION"]);?></td></tr>
<tr><td class='file-md-qtip-nowrap'><? echo _("Sample Rate:"); ?></td><td><?php echo ($this->md["MDATA_KEY_SAMPLERATE"]);?></td></tr> <tr><td class='file-md-qtip-nowrap'><?php echo _("Sample Rate:"); ?></td><td><?php echo ($this->md["MDATA_KEY_SAMPLERATE"]);?></td></tr>
<tr><td><? echo _("Bit Rate:"); ?></td><td><?php echo ($this->md["MDATA_KEY_BITRATE"]);?></td></tr> <tr><td><?php echo _("Bit Rate:"); ?></td><td><?php echo ($this->md["MDATA_KEY_BITRATE"]);?></td></tr>
<tr><td><? echo _("Mood:"); ?></td><td><?php echo ($this->md["MDATA_KEY_MOOD"]);?></td></tr> <tr><td><?php echo _("Mood:"); ?></td><td><?php echo ($this->md["MDATA_KEY_MOOD"]);?></td></tr>
<tr><td><? echo _("Genre:"); ?></td><td><?php echo ($this->md["MDATA_KEY_GENRE"]);?></td></tr> <tr><td><?php echo _("Genre:"); ?></td><td><?php echo ($this->md["MDATA_KEY_GENRE"]);?></td></tr>
<tr><td><? echo _("Year:"); ?></td><td><?php echo ($this->md["MDATA_KEY_YEAR"]);?></td></tr> <tr><td><?php echo _("Year:"); ?></td><td><?php echo ($this->md["MDATA_KEY_YEAR"]);?></td></tr>
<tr><td><? echo _("Label:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LABEL"]);?></td></tr> <tr><td><?php echo _("Label:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LABEL"]);?></td></tr>
<tr><td><? echo _("BPM:"); ?></td><td><?php echo ($this->md["MDATA_KEY_BPM"]);?></td></tr> <tr><td><?php echo _("BPM:"); ?></td><td><?php echo ($this->md["MDATA_KEY_BPM"]);?></td></tr>
<tr><td><? echo _("Composer:"); ?></td><td><?php echo ($this->md["MDATA_KEY_COMPOSER"]);?></td></tr> <tr><td><?php echo _("Composer:"); ?></td><td><?php echo ($this->md["MDATA_KEY_COMPOSER"]);?></td></tr>
<tr><td><? echo _("Conductor:"); ?></td><td><?php echo ($this->md["MDATA_KEY_CONDUCTOR"]);?></td></tr> <tr><td><?php echo _("Conductor:"); ?></td><td><?php echo ($this->md["MDATA_KEY_CONDUCTOR"]);?></td></tr>
<tr><td><? echo _("Copyright:"); ?></td><td><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></td></tr> <tr><td><?php echo _("Copyright:"); ?></td><td><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></td></tr>
<tr><td><? echo _("Isrc Number:"); ?></td><td><?php echo ($this->md["MDATA_KEY_ISRC"]);?></td></tr> <tr><td><?php echo _("Isrc Number:"); ?></td><td><?php echo ($this->md["MDATA_KEY_ISRC"]);?></td></tr>
<tr><td><? echo _("Website:"); ?></td><td><?php echo ($this->md["MDATA_KEY_URL"]);?></td></tr> <tr><td><?php echo _("Website:"); ?></td><td><?php echo ($this->md["MDATA_KEY_URL"]);?></td></tr>
<tr><td><? echo _("Language:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></td></tr> <tr><td><?php echo _("Language:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></td></tr>
<tr><td class='file-md-qtip-nowrap'><? echo _("File Path:"); ?></td><td><?php echo ($this->md["MDATA_KEY_FILEPATH"]);?></td></tr> <tr><td class='file-md-qtip-nowrap'><?php echo _("File Path:"); ?></td><td><?php echo ($this->md["MDATA_KEY_FILEPATH"]);?></td></tr>
</table> </table>
<?php endif; ?> <?php endif; ?>
<?php if($this->type == "playlist" || $this->type == "block") : ?> <?php if($this->type == "playlist" || $this->type == "block") : ?>
<div class='file-md-qtip-left'> <div class='file-md-qtip-left'>
<span><? echo _("Name:"); ?></span><span><?php echo ($this->md["dc:title"]);?></span><br /> <span><?php echo _("Name:"); ?></span><span><?php echo ($this->md["dc:title"]);?></span><br />
<span><? echo _("Creator:"); ?></span><span><?php echo ($this->md["dc:creator"]);?></span><br /> <span><?php echo _("Creator:"); ?></span><span><?php echo ($this->md["dc:creator"]);?></span><br />
<?php if ($this->type == "block" && $this->blType == "Dynamic") { ?> <?php if ($this->type == "block" && $this->blType == "Dynamic") { ?>
<span><? echo _("Length:"); ?></span><span><?php echo $this->block->getLength();?></span><br /> <span><?php echo _("Length:"); ?></span><span><?php echo $this->block->getLength();?></span><br />
<?php } else { ?> <?php } else { ?>
<span><? echo _("Length:"); ?></span><span><?php echo ($this->md["dcterms:extent"]);?></span><br /> <span><?php echo _("Length:"); ?></span><span><?php echo ($this->md["dcterms:extent"]);?></span><br />
<?php } ?> <?php } ?>
<span><? echo _("Description:"); ?></span><span><?php echo ($this->md["dc:description"]);?></span> <span><?php echo _("Description:"); ?></span><span><?php echo ($this->md["dc:description"]);?></span>
</div> </div>
<?php if ($this->type == "playlist") { ?> <?php if ($this->type == "playlist") { ?>
<div class='file-md-qtip-legend'> <div class='file-md-qtip-legend'>
<span class='webstream'>o</span> <span><? echo _("Web Stream"); ?></span><br /> <span class='webstream'>o</span> <span><?php echo _("Web Stream"); ?></span><br />
<span class='dynamic'>o</span> <span><? echo _("Dynamic Smart Block"); ?></span><br /> <span class='dynamic'>o</span> <span><?php echo _("Dynamic Smart Block"); ?></span><br />
<span class='static'>o</span> <span><? echo _("Static Smart Block"); ?></span><br /> <span class='static'>o</span> <span><?php echo _("Static Smart Block"); ?></span><br />
<span>o</span> <span><? echo _("Audio Track"); ?></span> <span>o</span> <span><?php echo _("Audio Track"); ?></span>
</div> </div>
<?php } ?> <?php } ?>
@ -60,9 +60,9 @@ foreach ($this->md as $key => &$value) {
}*/ }*/
?> ?>
<?php if ($this->type == "playlist") { ?> <?php if ($this->type == "playlist") { ?>
<div class='file-md-qtip-left'><span><? echo _("Playlist Contents: "); ?></span></div> <div class='file-md-qtip-left'><span><?php echo _("Playlist Contents: "); ?></span></div>
<?php } else { ?> <?php } else { ?>
<div class='file-md-qtip-left'><span><? echo _("Static Smart Block Contents: "); ?></span></div> <div class='file-md-qtip-left'><span><?php echo _("Static Smart Block Contents: "); ?></span></div>
<?php } ?> <?php } ?>
<table class='library-get-file-md'> <table class='library-get-file-md'>
<?php foreach($this->contents as $row) : ?> <?php foreach($this->contents as $row) : ?>
@ -101,7 +101,7 @@ foreach ($this->md as $key => &$value) {
</table> </table>
<?php } elseif ($this->blType == "Dynamic") { ?> <?php } elseif ($this->blType == "Dynamic") { ?>
<div class='file-md-qtip-left'><span><? echo _("Dynamic Smart Block Criteria: "); ?></span></div> <div class='file-md-qtip-left'><span><?php echo _("Dynamic Smart Block Criteria: "); ?></span></div>
<table class='library-get-file-md table-small'> <table class='library-get-file-md table-small'>
<?php foreach ($this->contents["crit"] as &$criterias) : ?> <?php foreach ($this->contents["crit"] as &$criterias) : ?>
<?php foreach ($criterias as &$crit ) : ?> <?php foreach ($criterias as &$crit ) : ?>
@ -134,7 +134,7 @@ foreach ($this->md as $key => &$value) {
<?php endforeach; ?> <?php endforeach; ?>
<?php endforeach; ?> <?php endforeach; ?>
<tr> <tr>
<td><? echo _("Limit to ") ?></td> <td><?php echo _("Limit to ") ?></td>
<td><?php echo $this->contents["limit"]["value"] ?> <?php echo $this->contents["limit"]["modifier"] ?></td> <td><?php echo $this->contents["limit"]["value"] ?> <?php echo $this->contents["limit"]["modifier"] ?></td>
</tr> </tr>
</table> </table>
@ -143,11 +143,11 @@ foreach ($this->md as $key => &$value) {
<?php if ($this->type == "stream") : ?> <?php if ($this->type == "stream") : ?>
<div><span><? echo _("Name:"); ?></span><span><?php echo ($this->md["name"]);?></span></div> <div><span><?php echo _("Name:"); ?></span><span><?php echo ($this->md["name"]);?></span></div>
<div><span><? echo _("Length:"); ?></span><span><?php echo ($this->md["length"]);?></span></div> <div><span><?php echo _("Length:"); ?></span><span><?php echo ($this->md["length"]);?></span></div>
<div><span><? echo _("Creator:"); ?></span><span><?php echo ($this->md["login"]);?></span></div> <div><span><?php echo _("Creator:"); ?></span><span><?php echo ($this->md["login"]);?></span></div>
<div><span><? echo _("Description:"); ?></span><span><?php echo ($this->md["description"]);?></span></div> <div><span><?php echo _("Description:"); ?></span><span><?php echo ($this->md["description"]);?></span></div>
<div><span><? echo _("URL:"); ?></span><span><?php echo ($this->md["url"]);?></span></div> <div><span><?php echo _("URL:"); ?></span><span><?php echo ($this->md["url"]);?></span></div>
<?php endif; ?> <?php endif; ?>

2
airtime_mvc/application/views/scripts/login/index.phtml
View File

@ -1,6 +1,6 @@
<div class="login_box"> <div class="login_box">
<div class="logobox">&nbsp;</div> <div class="logobox">&nbsp;</div>
<h2><? echo _("Login") ?></h2> <h2><?php echo _("Login") ?></h2>
<div id="login" class="login-content clearfix"> <div id="login" class="login-content clearfix">
<?php if(isset($this->demo) && $this->demo == 1){?> <?php if(isset($this->demo) && $this->demo == 1){?>
<p style="font-weight:bold"> <p style="font-weight:bold">

4
airtime_mvc/application/views/scripts/login/password-change.phtml
View File

@ -1,9 +1,9 @@
<div class="login_box"> <div class="login_box">
<div class="logobox">&nbsp;</div> <div class="logobox">&nbsp;</div>
<h2><? echo _("New password") ?></h2> <h2><?php echo _("New password") ?></h2>
<div id="login" class="login-content clearfix"> <div id="login" class="login-content clearfix">
<p class="light"><? echo _("Please enter and confirm your new password in the fields below."); ?></p> <p class="light"><?php echo _("Please enter and confirm your new password in the fields below."); ?></p>
<?php echo $this->form; ?> <?php echo $this->form; ?>
</div> </div>
</div> </div>

6
airtime_mvc/application/views/scripts/login/password-restore-after.phtml
View File

@ -1,9 +1,9 @@
<div class="login_box"> <div class="login_box">
<div class="logobox">&nbsp;</div> <div class="logobox">&nbsp;</div>
<h2><? echo _("Email sent") ?></h2> <h2><?php echo _("Email sent") ?></h2>
<div id="login" class="login-content clearfix"> <div id="login" class="login-content clearfix">
<p class="light"><? echo _("An email has been sent") ?></p> <p class="light"><?php echo _("An email has been sent") ?></p>
<p><a class="link" href="<?php echo $this->baseUrl('login'); ?>"><? echo _("Back to login screen") ?></a></p> <p><a class="link" href="<?php echo $this->baseUrl('login'); ?>"><?php echo _("Back to login screen") ?></a></p>
</div> </div>
</div> </div>

2
airtime_mvc/application/views/scripts/login/password-restore.phtml
View File

@ -1,6 +1,6 @@
<div class="login_box"> <div class="login_box">
<div class="logobox">&nbsp;</div> <div class="logobox">&nbsp;</div>
<h2><? echo _("Reset password") ?></h2> <h2><?php echo _("Reset password") ?></h2>
<div id="login" class="login-content clearfix"> <div id="login" class="login-content clearfix">
<p class="light"> <p class="light">

18
airtime_mvc/application/views/scripts/partialviews/header.phtml
View File

@ -1,13 +1,13 @@
<div id="master-panel"> <div id="master-panel">
<div class="now-playing-block"> <div class="now-playing-block">
<div class="text-row"><strong><? echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div> <div class="text-row"><strong><?php echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
<div class="now-playing-info song"> <div class="now-playing-info song">
<div class="time-flow"><span class="song-length" id="song-length"></span><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div> <div class="time-flow"><span class="song-length" id="song-length"></span><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div>
<span id='current'></span></div> <span id='current'></span></div>
<div class="progressbar"> <div class="progressbar">
<div class="progress-song" id="progress-bar" style="width:0%;"></div> <div class="progress-song" id="progress-bar" style="width:0%;"></div>
</div> </div>
<div class="text-row next-song"><strong><? echo _("Next:"); ?></strong> <span id='next'></span> <span id='next-length'></span></div> <div class="text-row next-song"><strong><?php echo _("Next:"); ?></strong> <span id='next'></span> <span id='next-length'></span></div>
</div> </div>
<div class="show-block"> <div class="show-block">
<div class="text-row">&nbsp;</div> <div class="text-row">&nbsp;</div>
@ -21,12 +21,12 @@
</div> </div>
</div> </div>
<div class="source-info-block"> <div class="source-info-block">
<h3><? echo _("Source Streams") ?></h3> <h3><?php echo _("Source Streams") ?></h3>
<ul> <ul>
<li> <li>
<div id="master_dj_div" class="source-label"> <div id="master_dj_div" class="source-label">
<a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a> <a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a>
<? echo _("Master Source") ?> <?php echo _("Master Source") ?>
</div> </div>
<div class="line-to-switch"></div> <div class="line-to-switch"></div>
<a href="#" id="master_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->master_dj_switch?></span></a> <a href="#" id="master_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->master_dj_switch?></span></a>
@ -35,14 +35,14 @@
<li> <li>
<div id="live_dj_div" class="source-label"> <div id="live_dj_div" class="source-label">
<a id="live_dj" class="source-kick-button" onclick="kickSource(this)"></a> <a id="live_dj" class="source-kick-button" onclick="kickSource(this)"></a>
<? echo _("Show Source")?> <?php echo _("Show Source")?>
</div> </div>
<div class="line-to-switch"></div> <div class="line-to-switch"></div>
<a href="#" id="live_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->live_dj_switch?></span></a> <a href="#" id="live_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->live_dj_switch?></span></a>
<div class="line-to-on-air"></div> <div class="line-to-on-air"></div>
</li> </li>
<li> <li>
<div id="scheduled_play_div" class="source-label"><? echo " "._("Scheduled Play") ?></div> <div id="scheduled_play_div" class="source-label"><?php echo " "._("Scheduled Play") ?></div>
<div class="line-to-switch"></div> <div class="line-to-switch"></div>
<a href="#" id="scheduled_play" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->scheduled_play_switch?></span></a> <a href="#" id="scheduled_play" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->scheduled_play_switch?></span></a>
<div class="line-to-on-air"></div> <div class="line-to-on-air"></div>
@ -51,12 +51,12 @@
</div> </div>
<div class="on-air-block"> <div class="on-air-block">
<h3>&nbsp;</h3> <h3>&nbsp;</h3>
<div class="on-air-info off" id="on-air-info"><? echo _("ON AIR") ?></div> <div class="on-air-info off" id="on-air-info"><?php echo _("ON AIR") ?></div>
<a href="#" class="listen-control-button"><span><? echo _("Listen") ?></span></a> <a href="#" class="listen-control-button"><span><?php echo _("Listen") ?></span></a>
</div> </div>
<div class="time-info-block pull-right"> <div class="time-info-block pull-right">
<ul> <ul>
<li><? echo _("Station time") ?></li> <li><?php echo _("Station time") ?></li>
<li class="time" id="time"></li> <li class="time" id="time"></li>
<li class="time-zone"><span id="time-zone"></span></li> <li class="time-zone"><span id="time-zone"></span></li>
</ul> </ul>

6
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
View File

@ -1,12 +1,12 @@
<?php if($this->trial_remain != '' && $this->trial_remain != "Trial expired."){?> <?php if($this->trial_remain != '' && $this->trial_remain != "Trial expired."){?>
<div class="trial-box"> <div class="trial-box">
<p><? echo _("Your trial expires in") ?></p> <p><?php echo _("Your trial expires in") ?></p>
<div class="trial-box-calendar"> <div class="trial-box-calendar">
<span class="trial-box-calendar-white"><?php echo $this->trial_remain?></span> <span class="trial-box-calendar-white"><?php echo $this->trial_remain?></span>
<div class="trial-box-calendar-gray"><? echo _("days") ?></div> <div class="trial-box-calendar-gray"><?php echo _("days") ?></div>
</div> </div>
<div class="trial-box-button"> <div class="trial-box-button">
<a title="<?php echo _("Purchase your copy of Airtime")?> href="https://account.sourcefabric.com/clientarea.php" target="_blank"><? echo _("My Account") ?></a> <a title="<?php echo _("Purchase your copy of Airtime")?> href="https://account.sourcefabric.com/clientarea.php" target="_blank"><?php echo _("My Account") ?></a>
</div> </div>
</div> </div>
<?php }?> <?php }?>

28
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View File

@ -8,30 +8,30 @@ if (isset($this->obj)) {
<div class="btn-toolbar spl-no-top-margin clearfix"> <div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left"> <div class="btn-group pull-left">
<button id="spl_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false"> <button id="spl_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
<? echo _("New")?> <span class="caret"></span> <?php echo _("New")?> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li> <li id='lib-new-pl'><a href="#"><?php echo _("New Playlist") ?></a></li>
<li id='lib-new-bl'><a href="#"><? echo _("New Smart Block") ?></a></li> <li id='lib-new-bl'><a href="#"><?php echo _("New Smart Block") ?></a></li>
<li id='lib-new-ws'><a href="#"><? echo _("New Webstream") ?></a></li> <li id='lib-new-ws'><a href="#"><?php echo _("New Webstream") ?></a></li>
</ul> </ul>
</div> </div>
<?php if (isset($this->obj)) : ?> <?php if (isset($this->obj)) : ?>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='<?php echo _("Empty playlist content") ?>' type="button" id="pl-bl-clear-content"><? echo _("Clear") ?></button> <button class="btn btn-inverse" title='<?php echo _("Empty playlist content") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>
</div> </div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='<?php echo _("Shuffle playlist") ?>' type="button" id="playlist_shuffle_button"><? echo _("Shuffle") ?></button> <button class="btn btn-inverse" title='<?php echo _("Shuffle playlist") ?>' type="button" id="playlist_shuffle_button"><?php echo _("Shuffle") ?></button>
</div> </div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><? echo _("Save") ?></button> <button class="btn btn-inverse" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button>
</div> </div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button id="spl_delete" class="btn" role="button" aria-disabled="false"><? echo _("Delete") ?></button> <button id="spl_delete" class="btn" role="button" aria-disabled="false"><?php echo _("Delete") ?></button>
</div> </div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo $count > 0 ?"block;":"none;"?>"> <a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo $count > 0 ?"block;":"none;"?>">
<i class='crossfade-main-icon'></i><span class="ui-button-text"><? echo _("Playlist crossfade") ?></span> <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
</a> </a>
</div> </div>
<?php endif; ?> <?php endif; ?>
@ -50,9 +50,9 @@ if (isset($this->obj)) {
<div id='sp-success' class='success' style='display:none'></div> <div id='sp-success' class='success' style='display:none'></div>
<fieldset class="toggle closed" id="fieldset-metadate_change"> <fieldset class="toggle closed" id="fieldset-metadate_change">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("View / edit description"); ?></legend> <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><?php echo _("View / edit description"); ?></legend>
<dl class="zend_form"> <dl class="zend_form">
<dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt> <dt id="description-label"><label for="description"><?php echo _("Description") ?></label></dt>
<dd id="description-element"> <dd id="description-element">
<textarea cols="80" rows="24" id="description" name="description"><?php echo $this->obj->getDescription(); ?></textarea> <textarea cols="80" rows="24" id="description" name="description"><?php echo $this->obj->getDescription(); ?></textarea>
</dd> </dd>
@ -64,10 +64,10 @@ if (isset($this->obj)) {
<div id="crossfade_main" class="crossfade-main clearfix" style="display:none;"> <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
<span class="ui-icon ui-icon-closethick sp-closethick-center"></span> <span class="ui-icon ui-icon-closethick sp-closethick-center"></span>
<dl id="spl_editor-main" class="inline-list"> <dl id="spl_editor-main" class="inline-list">
<dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt> <dt><?php echo _("Fade in: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd> <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
<dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt> <dt><?php echo _("Fade out: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd> <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
</dl> </dl>
@ -82,5 +82,5 @@ if (isset($this->obj)) {
</div> </div>
<?php else : ?> <?php else : ?>
<div><? echo _("No open playlist") ?></div> <div><?php echo _("No open playlist") ?></div>
<?php endif; ?> <?php endif; ?>

26
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View File

@ -8,27 +8,27 @@ if (isset($this->obj)) {
<div class="btn-toolbar spl-no-top-margin clearfix"> <div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left"> <div class="btn-group pull-left">
<button id="spl_new" class="btn dropdown-toggle" data-toggle='dropdown' aria-disabled="false"> <button id="spl_new" class="btn dropdown-toggle" data-toggle='dropdown' aria-disabled="false">
<? echo _("New")?> <span class="caret"></span> <?php echo _("New")?> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li> <li id='lib-new-pl'><a href="#"><?php echo _("New Playlist") ?></a></li>
<li id='lib-new-bl'><a href="#"><? echo _("New Smart Block") ?></a></li> <li id='lib-new-bl'><a href="#"><?php echo _("New Smart Block") ?></a></li>
<li id='lib-new-ws'><a href="#"><? echo _("New Webstream") ?></a></li> <li id='lib-new-ws'><a href="#"><?php echo _("New Webstream") ?></a></li>
</ul> </ul>
</div> </div>
<?php if (isset($this->obj)) : ?> <?php if (isset($this->obj)) : ?>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='<?php echo _("Empty smart block content") ?>' type="button" id="pl-bl-clear-content"><? echo _("Clear") ?></button> <button class="btn btn-inverse" title='<?php echo _("Empty smart block content") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>
</div> </div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><? echo _("Save") ?></button> <button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button>
</div> </div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button id="spl_delete" class="btn" role="button" aria-disabled="false"><? echo _("Delete") ?></button> <button id="spl_delete" class="btn" role="button" aria-disabled="false"><?php echo _("Delete") ?></button>
</div> </div>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"block;":"none;"?>"> <a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"block;":"none;"?>">
<i class='crossfade-main-icon'></i><span class="ui-button-text"><? echo _("Playlist crossfade") ?></span> <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
</a> </a>
</div> </div>
<?php endif; ?> <?php endif; ?>
@ -52,9 +52,9 @@ if (isset($this->obj)) {
<div id='sp-success-saved' class='success' style='display:none'></div> <div id='sp-success-saved' class='success' style='display:none'></div>
<fieldset class="toggle closed" id="fieldset-metadate_change"> <fieldset class="toggle closed" id="fieldset-metadate_change">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("View / edit description"); ?></legend> <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><?php echo _("View / edit description"); ?></legend>
<dl class="zend_form"> <dl class="zend_form">
<dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt> <dt id="description-label"><label for="description"><?php echo _("Description") ?></label></dt>
<dd id="description-element"> <dd id="description-element">
<textarea cols="80" rows="24" id="description" name="description"><?php <textarea cols="80" rows="24" id="description" name="description"><?php
if (isset($this->unsavedDesc)) echo $this->unsavedDesc; if (isset($this->unsavedDesc)) echo $this->unsavedDesc;
@ -69,10 +69,10 @@ if (isset($this->obj)) {
<div id="crossfade_main" class="crossfade-main clearfix" style="display:none;"> <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
<span class="ui-icon ui-icon-closethick"></span> <span class="ui-icon ui-icon-closethick"></span>
<dl id="spl_editor-main" class="inline-list"> <dl id="spl_editor-main" class="inline-list">
<dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt> <dt><?php echo _("Fade in: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd> <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
<dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt> <dt><?php echo _("Fade out: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd> <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
<dd class="edit-error"></dd> <dd class="edit-error"></dd>
</dl> </dl>
@ -87,5 +87,5 @@ if (isset($this->obj)) {
</div> </div>
<?php else : ?> <?php else : ?>
<div><? echo _("No open smart block") ?></div> <div><?php echo _("No open smart block") ?></div>
<?php endif; ?> <?php endif; ?>

2
airtime_mvc/application/views/scripts/preference/directory-config.phtml
View File

@ -1,4 +1,4 @@
<div id="watched-folder-section" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong manage-folders"> <div id="watched-folder-section" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong manage-folders">
<h2><? echo _("Manage Media Folders") ?></h2> <h2><?php echo _("Manage Media Folders") ?></h2>
<?php echo $this->form; ?> <?php echo $this->form; ?>
</div> </div>

6
airtime_mvc/application/views/scripts/preference/index.phtml
View File

@ -1,9 +1,9 @@
<div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences"> <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
<h2 style="float:left"><? echo _("Preferences") ?></h2> <h2 style="float:left"><?php echo _("Preferences") ?></h2>
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?> <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<form method="post" id="pref_form" enctype="application/x-www-form-urlencoded"> <form method="post" id="pref_form" enctype="application/x-www-form-urlencoded">
<button name="pref_save" id="pref_save" type="button" class="btn right-floated"><? echo _("Save") ?></button> <button name="pref_save" id="pref_save" type="button" class="btn right-floated"><?php echo _("Save") ?></button>
<div style="clear:both"></div> <div style="clear:both"></div>
<?php <?php
@ -11,6 +11,6 @@
echo $this->form; echo $this->form;
?> ?>
<br /> <br />
<button name="pref_save" id="pref_save" type="button" class="btn right-floated"><? echo _("Save") ?></button> <button name="pref_save" id="pref_save" type="button" class="btn right-floated"><?php echo _("Save") ?></button>
</form> </form>
</div> </div>

14
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View File

@ -1,36 +1,36 @@
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded"> <div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div class="button-bar"> <div class="button-bar">
<a href="#" id="add-show-close" class="icon-link add-show-close"><span class="ui-icon ui-icon-circle-close"></span><? echo _("Close") ?></a> <a href="#" id="add-show-close" class="icon-link add-show-close"><span class="ui-icon ui-icon-circle-close"></span><?php echo _("Close") ?></a>
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> <button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
<span class="ui-icon ui-icon-plusthick"></span> <span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span> <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
</button> </button>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("What") ?></h3> <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("What") ?></h3>
<div id="schedule-show-what" class="collapsible-content"> <div id="schedule-show-what" class="collapsible-content">
<?php echo $this->what; ?> <?php echo $this->what; ?>
</div> </div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("When") ?></h3> <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("When") ?></h3>
<div id="schedule-show-when" class="collapsible-content"> <div id="schedule-show-when" class="collapsible-content">
<?php echo $this->when; ?> <?php echo $this->when; ?>
<?php echo $this->repeats; ?> <?php echo $this->repeats; ?>
</div> </div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Live Stream Input") ?></h3> <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("Live Stream Input") ?></h3>
<div id="live-stream-override" class="collapsible-content"> <div id="live-stream-override" class="collapsible-content">
<?php echo $this->live; ?> <?php echo $this->live; ?>
</div> </div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Record & Rebroadcast")?></h3> <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("Record & Rebroadcast")?></h3>
<div id="schedule-record-rebroadcast" class="collapsible-content"> <div id="schedule-record-rebroadcast" class="collapsible-content">
<?php echo $this->rr; ?> <?php echo $this->rr; ?>
<?php echo $this->absoluteRebroadcast; ?> <?php echo $this->absoluteRebroadcast; ?>
<?php echo $this->rebroadcast; ?> <?php echo $this->rebroadcast; ?>
</div> </div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Who") ?></h3> <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("Who") ?></h3>
<div id="schedule-show-who" class="collapsible-content"> <div id="schedule-show-who" class="collapsible-content">
<?php echo $this->who; ?> <?php echo $this->who; ?>
</div> </div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Style") ?></h3> <h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("Style") ?></h3>
<div id="schedule-show-style" class="collapsible-content"> <div id="schedule-show-style" class="collapsible-content">
<?php echo $this->style; ?> <?php echo $this->style; ?>
</div> </div>

12
airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
View File

@ -2,12 +2,12 @@
<div><?php echo $this->additionalShowInfo; ?></div> <div><?php echo $this->additionalShowInfo; ?></div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="datatable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="datatable">
<tr> <tr>
<th><? echo _("Start") ?></th> <th><?php echo _("Start") ?></th>
<th><? echo _("Title") ?></th> <th><?php echo _("Title") ?></th>
<th><? echo _("Creator") ?></th> <th><?php echo _("Creator") ?></th>
<th><? echo _("Album") ?></th> <th><?php echo _("Album") ?></th>
<th><? echo _("Length") ?></th> <th><?php echo _("Length") ?></th>
<th><? echo _("Genre") ?></th> <th><?php echo _("Genre") ?></th>
</tr> </tr>
<?php $i=0; ?> <?php $i=0; ?>
<?php foreach($this->showContent as $row): ?> <?php foreach($this->showContent as $row): ?>

4
airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
View File

@ -1,8 +1,8 @@
<div class="wrapper"> <div class="wrapper">
<div id="library_content" class="lib-content tabs ui-widget ui-widget-content block-shadow alpha-block padded"> <div id="library_content" class="lib-content tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div id="import_status" style="display:none"><? echo _("File import in progress..."); ?></div> <div id="import_status" style="display:none"><?php echo _("File import in progress..."); ?></div>
<fieldset class="toggle closed" id="filter_options"> <fieldset class="toggle closed" id="filter_options">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Advanced Search Options") ?></legend> <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><?php echo _("Advanced Search Options") ?></legend>
<div id="advanced_search" class="advanced_search form-horizontal"></div> <div id="advanced_search" class="advanced_search form-horizontal"></div>
</fieldset> </fieldset>
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table> <table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table>

14
airtime_mvc/application/views/scripts/systemstatus/index.phtml
View File

@ -1,17 +1,17 @@
<table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable"> <table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable">
<thead> <thead>
<tr class="ui-state-default strong"> <tr class="ui-state-default strong">
<td><? echo _("Service") ?></td> <td><?php echo _("Service") ?></td>
<td><? echo _("Status") ?></td> <td><?php echo _("Status") ?></td>
<td><? echo _("Uptime") ?></td> <td><?php echo _("Uptime") ?></td>
<td><? echo _("CPU") ?></td> <td><?php echo _("CPU") ?></td>
<td><? echo _("Memory") ?></td> <td><?php echo _("Memory") ?></td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<!-- <!--
<tr class="odd"> <tr class="odd">
<td><? echo _("Airtime Version") ?></td> <td><?php echo _("Airtime Version") ?></td>
<td>1.9.3</td> <td>1.9.3</td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
@ -27,7 +27,7 @@
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<tr id="partitions" class="even"> <tr id="partitions" class="even">
<th colspan="5"><? echo _("Disk Space") ?></th> <th colspan="5"><?php echo _("Disk Space") ?></th>
</tr> </tr>
</tbody> </tbody>
</table> </table>

14
airtime_mvc/application/views/scripts/user/add-user.phtml
View File

@ -1,24 +1,24 @@
<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong user-management"> <div class="ui-widget ui-widget-content block-shadow clearfix padded-strong user-management">
<h2><? echo _("Manage Users") ?></h2> <h2><?php echo _("Manage Users") ?></h2>
<div class="user-list-wrapper"> <div class="user-list-wrapper">
<div id="users_wrapper" class="dataTables_wrapper"> <div id="users_wrapper" class="dataTables_wrapper">
<div class="button-holder"> <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"> <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-icon ui-icon-plusthick"></span> <span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><? echo _("New User")?></span> <span class="ui-button-text"><?php echo _("New User")?></span>
</button> </button>
</div> </div>
<table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable"> <table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable">
<thead> <thead>
<tr> <tr>
<th><? echo _("id") ?></th> <th><?php echo _("id") ?></th>
<th><? echo _("Username") ?></th> <th><?php echo _("Username") ?></th>
<th><? echo _("First Name")?></th> <th><?php echo _("First Name")?></th>
<th><? echo _("Last Name")?></th> <th><?php echo _("Last Name")?></th>
<th><? echo _("User Type")?></th> <th><?php echo _("User Type")?></th>
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
</thead> </thead>

22
airtime_mvc/application/views/scripts/webstream/webstream.phtml
View File

@ -2,21 +2,21 @@
<div class="btn-toolbar spl-no-top-margin clearfix"> <div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left"> <div class="btn-group pull-left">
<button id="ws_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false"> <button id="ws_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
<? echo _("New")?> <span class="caret"></span> <?php echo _("New")?> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li> <li id='lib-new-pl'><a href="#"><?php echo _("New Playlist") ?></a></li>
<li id='lib-new-bl'><a href="#"><? echo _("New Smart Block") ?></a></li> <li id='lib-new-bl'><a href="#"><?php echo _("New Smart Block") ?></a></li>
<li id='lib-new-ws'><a href="#"><? echo _("New Webstream") ?></a></li> <li id='lib-new-ws'><a href="#"><?php echo _("New Webstream") ?></a></li>
</ul> </ul>
</div> </div>
<?php if (isset($this->obj)) : ?> <?php if (isset($this->obj)) : ?>
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<button class="btn btn-inverse" type="submit" id="webstream_save" name="submit"><? echo _("Save") ?></button> <button class="btn btn-inverse" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button>
</div> </div>
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<button id="ws_delete" class="btn" <?php if ($this->action == "new"): ?>style="display:none;"<?php endif; ?>aria-disabled="false"><? echo _("Delete") ?></button> <button id="ws_delete" class="btn" <?php if ($this->action == "new"): ?>style="display:none;"<?php endif; ?>aria-disabled="false"><?php echo _("Delete") ?></button>
</div> </div>
<?php endif; ?> <?php endif; ?>
</div> </div>
@ -36,9 +36,9 @@
</div> </div>
<fieldset class="toggle" id="fieldset-metadate_change"> <fieldset class="toggle" id="fieldset-metadate_change">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("View / edit description"); ?></legend> <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><?php echo _("View / edit description"); ?></legend>
<dl class="zend_form"> <dl class="zend_form">
<dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt> <dt id="description-label"><label for="description"><?php echo _("Description") ?></label></dt>
<dd id="description-element"> <dd id="description-element">
<textarea cols="80" rows="24" id="description" name="description"><?php echo $this->obj->getDescription(); ?></textarea> <textarea cols="80" rows="24" id="description" name="description"><?php echo $this->obj->getDescription(); ?></textarea>
</dd> </dd>
@ -49,17 +49,17 @@
<dl class="zend_form"> <dl class="zend_form">
<dt id="submit-label" style="display: none;">&nbsp;</dt> <dt id="submit-label" style="display: none;">&nbsp;</dt>
<div id="url-error" class="errors" style="display:none;"></div> <div id="url-error" class="errors" style="display:none;"></div>
<dt id="streamurl-label"><label for="streamurl"><? echo _("Stream URL:"); ?></label></dt> <dt id="streamurl-label"><label for="streamurl"><?php echo _("Stream URL:"); ?></label></dt>
<dd id="streamurl-element"> <dd id="streamurl-element">
<input type="text" value="<?php echo $this->obj->getUrl(); ?>" size="40"/> <input type="text" value="<?php echo $this->obj->getUrl(); ?>" size="40"/>
</dd> </dd>
<div id="length-error" class="errors" style="display:none;"></div> <div id="length-error" class="errors" style="display:none;"></div>
<dt id="streamlength-label"><label for="streamlength"><? echo _("Default Length:"); ?></label></dt> <dt id="streamlength-label"><label for="streamlength"><?php echo _("Default Length:"); ?></label></dt>
<dd id="streamlength-element"> <dd id="streamlength-element">
<input type="text" value="<?php echo $this->obj->getDefaultLength() ?>"/> <input type="text" value="<?php echo $this->obj->getDefaultLength() ?>"/>
</dd> </dd>
</dl> </dl>
<?php else : ?> <?php else : ?>
<div><? echo _("No webstream") ?></div> <div><?php echo _("No webstream") ?></div>
<?php endif; ?> <?php endif; ?>

68
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View File

@ -217,7 +217,7 @@ function viewDisplay( view ) {
} }
function eventRender(event, element, view) { function eventRender(event, element, view) {
$(element).attr("id", "fc-show-instance-"+event.id); $(element).addClass("fc-show-instance-"+event.id);
$(element).attr("data-show-id", event.showId); $(element).attr("data-show-id", event.showId);
$(element).attr("data-show-linked", event.linked); $(element).attr("data-show-linked", event.linked);
$(element).data("event", event); $(element).data("event", event);
@ -412,13 +412,13 @@ function checkSCUploadStatus(){
$.post(url, {format: "json", id: id, type:"show"}, function(json){ $.post(url, {format: "json", id: id, type:"show"}, function(json){
if (json.sc_id > 0){ if (json.sc_id > 0){
$("#fc-show-instance-"+id) $(".fc-show-instance-"+id)
.find(".progress") .find(".progress")
.removeClass("progress") .removeClass("progress")
.addClass("soundcloud"); .addClass("soundcloud");
} }
else if (json.sc_id == "-3"){ else if (json.sc_id == "-3"){
$("#fc-show-instance-"+id) $(".fc-show-instance-"+id)
.find(".progress") .find(".progress")
.removeClass("progress") .removeClass("progress")
.addClass("sc-error"); .addClass("sc-error");
@ -428,59 +428,39 @@ function checkSCUploadStatus(){
}); });
}); });
} }
/** This function adds and removes the current /** This function adds and removes the current
* show icon * show icon
*/ */
function getCurrentShow() { function getCurrentShow() {
var url = baseUrl+'Schedule/get-current-show/format/json',
id, var url = baseUrl+'Schedule/get-current-show/format/json';
$el;
$.post(url, {format: "json"}, function(json) { function addNowPlaying(json) {
var $el,
span = '<span class="small-icon now-playing"></span>';
$(".now-playing").remove();
if (json.current_show === true) { if (json.current_show === true) {
$el = $("div[class*=fc-event-time]");
$el = $(".fc-show-instance-"+json.si_id);
if (view_name === 'agendaDay' || view_name === 'agendaWeek') { if (view_name === 'agendaDay' || view_name === 'agendaWeek') {
/* Need to remove now-playing class because if user $el.find(".fc-event-time").before(span);
* is switching from week view to day view (and vice versa) }
* the icon may already be there from previous view else if (view_name === 'month') {
*/
$el.siblings().remove("span.now-playing");
if (!$el.siblings().hasClass("small-icon now-playing")) {
if ($el.siblings().hasClass("small-icon recording")) {
/* Without removing recording icon, the now playing $el.find(".fc-event-title").after(span);
* icon will overwrite it.
*/
$el.siblings().remove("span.recording");
$el.before('<span class="small-icon now-playing"></span><span class="small-icon recording"></span>');
} else if ($el.siblings().hasClass("small-icon rebroadcast")) {
/* Without removing rebroadcast icon, the now playing
* icon will overwrite it.
*/
$el.siblings().remove("span.rebroadcast");
$el.before('<span class="small-icon now-playing"></span><span class="small-icon rebroadcast"></span>');
} else {
$el.before('<span class="small-icon now-playing"></span>');
} }
} }
} else if (view_name === 'month') {
if (!$("span[class*=fc-event-title]").siblings().hasClass("now-playing")) {
$("span[class*=fc-event-title]").after('<span class="small-icon now-playing"></span>');
}
}
}
//remove icon from shows that have ended
$(".now-playing").each(function(){
id = $(this).parents("div.fc-event").data("event").id;
if (id != json.si_id) {
$(this).remove("span.now-playing");
}
});
setTimeout(getCurrentShow, 5000); setTimeout(getCurrentShow, 5000);
}); }
$.post(url, {format: "json"}, addNowPlaying);
} }
function addQtipsToIcons(ele, id){ function addQtipsToIcons(ele, id){

11
install_full/ubuntu/airtime-full-install
View File

@ -87,6 +87,11 @@ if [ "$code" != "squeeze" -a "$code" != "lucid" ]; then
apt-get -y --force-yes install libvo-aacenc0 apt-get -y --force-yes install libvo-aacenc0
fi fi
#Install php5-json on Ubuntu Saucy.
if [ "$dist" = "Ubuntu" -a "$code" = "saucy" ]; then
apt-get -y --force-yes install php5-json
fi
#Install packages back-ported by Sourcefabric #Install packages back-ported by Sourcefabric
apt-get -y --force-yes install sourcefabric-keyring apt-get -y --force-yes install sourcefabric-keyring
apt-get -y --force-yes install liquidsoap apt-get -y --force-yes install liquidsoap
@ -125,8 +130,14 @@ else
echo "----------------------------------------------------" echo "----------------------------------------------------"
if [ ! -f /etc/apache2/sites-available/airtime ]; then if [ ! -f /etc/apache2/sites-available/airtime ]; then
echo "Creating Apache config for Airtime..." echo "Creating Apache config for Airtime..."
if [ "$dist" = "Ubuntu" -a "$code" = "saucy" ]; then
cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime.conf
a2dissite 000-default
else
cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime
a2dissite default a2dissite default
fi
a2ensite airtime a2ensite airtime
else else
echo "Apache config for Airtime already exists..." echo "Apache config for Airtime already exists..."