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

Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing

Browse source
This commit is contained in:
Duncan Sommerville 2015-11-10 15:10:44 -05:00
commit b88bcfaa92
4 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
airtime_mvc/application/views/scripts/podcast/podcast_url_dialog.phtml
View file

@ -1,12 +1,21 @@
<div id="podcast_url_dialog"> <div id="podcast_url_dialog">
<form name="podcast_url_form"> <form name="podcast_url_form" style="margin-top: 10px;">
<?php echo $this->csrf ?> <?php echo $this->csrf ?>
<label> <table style="padding: 0;">
<?php echo _("Podcast URL"); ?> <tr>
<input type="text" name="url" /> <td style="padding-top: 7px; vertical-align: top">
</label> <label for="podcast_url_field">
<?php echo _("RSS Feed URL:"); ?>
</label>
</td>
<td style="text-align: right">
<input type="text" name="podcast_url_field" name="url" size="40" style="margin-left: 10px; margin-bottom: 10px;" placeholder="http://example.com/podcast.xml"/>
</td>
</tr>
</table>
<button class="btn btn-new right-floated" type="button" onclick="AIRTIME.podcast.addPodcast()"> <button class="btn btn-new right-floated" type="button" onclick="AIRTIME.podcast.addPodcast()">
<?php echo _("Subscribe"); ?> <?php echo _("Subscribe"); ?>
</button> </button>
</form> </form>
<!-- <p style="clear: both; text-align: center; opacity: 0.7; margin-top: 20px;">Paste the URL of a podcast RSS feed above.</p> -->
</div> </div>

4
airtime_mvc/public/css/styles.css
View file

@ -4164,3 +4164,7 @@ li .ui-state-hover {
.publish-edit-md { .publish-edit-md {
float: right; float: right;
} }
#podcast_url_dialog table tr td {
padding: 0px;
}

4
airtime_mvc/public/js/airtime/library/library.js
View file

@ -1331,8 +1331,8 @@ var AIRTIME = (function(AIRTIME) {
return this.getSelectedRows().length >= 1; return this.getSelectedRows().length >= 1;
} }
}); });
podcastToolbarButtons["ViewPodcast"] = { podcastToolbarButtons["ViewEpisodes"] = {
title : $.i18n._("View Podcast"), title : $.i18n._("View Episodes"),
iconClass : "icon-chevron-right", iconClass : "icon-chevron-right",
extraBtnClass : "btn-small", extraBtnClass : "btn-small",
elementId : "", elementId : "",

4
airtime_mvc/public/js/airtime/library/podcast.js
View file

@ -506,8 +506,8 @@ var AIRTIME = (function (AIRTIME) {
title: $.i18n._("Add New Podcast"), title: $.i18n._("Add New Podcast"),
resizable: false, resizable: false,
modal: true, modal: true,
width: 'auto', width: '450px',
height: 'auto' height: 129
}); });
}); });
}; };