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

SAAS-1195 - fix calendar error; use baseurl in all internal links; css tweaks

This commit is contained in:
Duncan Sommerville 2015-11-17 16:39:29 -05:00
parent ef1a57459c
commit f2fae3c67e
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/forms/SoundCloudPreferences.php
View File

@ -40,7 +40,6 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
$this->addElement('image', 'SoundCloudConnect', array(
'src' => 'http://connect.soundcloud.com/2/btn-connect-sc-l.png',
'target' => '_blank',
'decorators' => array(
'ViewHelper'
)
@ -48,7 +47,6 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
$this->addElement('image', 'SoundCloudDisconnect', array(
'src' => 'http://connect.soundcloud.com/2/btn-disconnect-l.png',
'target' => '_blank',
'decorators' => array(
'ViewHelper'
)

4
airtime_mvc/application/layouts/scripts/layout.phtml
View File

@ -66,7 +66,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<a href="#"><?php echo _("Webstream") ?></a>
</li>
</ul>
<a href="/plupload">
<a href="<?php echo Application_Common_OsPath::getBaseDir() . 'plupload' ?>">
<button id="add_media_btn" class="btn btn-small dashboard-btn btn-new">
<span><?php echo _("Upload") ?></span>
</button>
@ -74,7 +74,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
</div>
<div class="media_type_selector top-link" data-selection-id="<?php echo MediaType::getDefault(); ?>">
<a href="/showbuilder#">
<a href="<?php echo Application_Common_OsPath::getBaseDir() . 'showbuilder#' ?>">
<i class='icon-home icon-white'></i>
<?php echo _("Dashboard") ?>
</a>

2
airtime_mvc/application/views/scripts/library/publish-dialog.phtml
View File

@ -21,7 +21,7 @@
<div class="publish-sources" ng-repeat="source in sources.toPublish">
<input ng-disabled="{{source.status == 2}}" ng-model="publishData[source.source]" type="checkbox" name="publish_sources" id="{{source.source}}">
<label class="source-name" for="{{source.source}}">{{source.label}}</label>
<span ng-if="source.status == 2" style="margin: auto"><a href="/preference#{{source.source}}-heading"><?php echo _("You aren't connected to this source.") ?></a></span>
<span ng-if="source.status == 2" style="margin: auto"><a href="<?php echo Application_Common_OsPath::getBaseDir() . 'preference#{{source.source}}-heading' ?>"><?php echo _("You aren't connected to this source.") ?></a></span>
</div>
<div ng-if="sources.toPublish.length == 0">
<?php echo _("You have already published this track to all available sources!") . "<br/>"

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

@ -6,7 +6,7 @@
<div class="trial-box-calendar-gray"><?php echo _("days") ?></div>
</div>
<div class="trial-box-button">
<a title="<?php echo sprintf(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="/billing/upgrade"><?php echo _pro("My Account") ?></a>
<a title="<?php echo sprintf(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="<?php echo Application_Common_OsPath::getBaseDir() . 'billing/upgrade' ?>"><?php echo _pro("My Account") ?></a>
</div>
</div>
<?php }?>

4
airtime_mvc/public/css/station_podcast.css
View File

@ -13,6 +13,10 @@
margin: 0;
}
#station_podcast .inner_editor_title button {
margin: 0 0 0 4px;
}
#station_podcast .collapsible-header {
margin: 0 0 20px;
top: 20px;

5
airtime_mvc/public/js/airtime/library/library.js
View File

@ -1301,8 +1301,8 @@ var AIRTIME = (function(AIRTIME) {
}
var dt = $datatables[table],
wrapper = $(dt).closest(".dataTables_wrapper");
if (oTable && typeof oTable.fnClearTable === 'function') {
oTable.fnClearTable(false);
if (dt && typeof dt.fnClearTable === 'function') {
dt.fnClearTable(false);
}
// Don't redraw if we're switching to another hash for the library table
$.when(redraw ? dt.fnDraw() : function () {}).done(function () {
@ -1489,6 +1489,7 @@ var AIRTIME = (function(AIRTIME) {
click: function () {
var episodes = mod.podcastEpisodeTableWidget.getSelectedRows();
AIRTIME.podcast.importSelectedEpisodes(episodes, mod.podcastEpisodeTableWidget);
mod.podcastEpisodeTableWidget.clearSelection();
}
},
validateConstraints: function () {