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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
denise 2012-05-17 18:27:06 -04:00
commit 8ed2efe770
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
View file

@ -155,7 +155,7 @@
<label for="outputStreamURL">Stream URL: </label> <label for="outputStreamURL">Stream URL: </label>
</dt> </dt>
<dd id="outputStreamURL-element"> <dd id="outputStreamURL-element">
<span id="stream_url"></span> <span id="stream_url" class="static_text"></span>
</dd> </dd>
</dl> </dl>
</fieldset> </fieldset>

2
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View file

@ -17,7 +17,7 @@
<?php echo $this->repeats; ?> <?php echo $this->repeats; ?>
</div> </div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Live Stream</h3> <h3 class="collapsible-header"><span class="arrow-icon"></span>Live Stream</h3>
<div id="live-stream-override" class="collapsible-content" style="overflow: auto"> <div id="live-stream-override" class="collapsible-content">
<?php echo $this->live; ?> <?php echo $this->live; ?>
</div> </div>
<?php if(!$this->isSaas()){?> <?php if(!$this->isSaas()){?>

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

@ -134,7 +134,7 @@ select {
.info-tooltip:hover span { .info-tooltip:hover span {
box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -moz-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -moz-box-shadow: 5px 5px rgba(0, 0, 0, 0.1);
position: absolute; left: 25px; top: -18px; z-index: 99; position: absolute; left: 25px; top: -18px; z-index: 99;
margin-left: 0; width: 250px; margin-left: 0; width: 200px;
} }
/* Info Tooltip Ends */ /* Info Tooltip Ends */