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

CC-4725: Have a "share" button on the popup player 

-done
This commit is contained in:
denise 2013-01-03 13:13:27 -05:00
parent 91caec8a75
commit 59f3826055
2 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
<div id="content" class="jp-container"> <div id="content" class="jp-container">
<h1><? echo _("Live stream") ?></h1> <h1><? echo _("Live stream") ?></h1>
<a id="popup-link" href="#">Share</a>
<?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?> <?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?>
<script> <script>
function setjPlayer(url, type, serverType){ function setjPlayer(url, type, serverType){
@ -31,21 +32,34 @@ $(document).ready(function(){
setjPlayer(elem.attr("data-url"), elem.attr("data-type"), elem.attr("server-type")); setjPlayer(elem.attr("data-url"), elem.attr("data-type"), elem.attr("server-type"));
}); });
<?php <?php
if (count($ids) > 0){ if (count($ids) > 0){
$id = $ids[0]; $id = $ids[0];
$streamData = Application_Model_StreamSetting::getStreamData($id); $streamData = Application_Model_StreamSetting::getStreamData($id);
$url = "http://".$streamData["${id}_host"].":".$streamData["${id}_port"]."/".$streamData["${id}_mount"]; $url = "http://".$streamData["${id}_host"].":".$streamData["${id}_port"]."/".$streamData["${id}_mount"];
$type = $streamData["${id}_type"]; $type = $streamData["${id}_type"];
$serverType = $streamData["${id}_output"]; $serverType = $streamData["${id}_output"];
if ($type == "ogg") if ($type == "ogg")
$type = "oga"; $type = "oga";
echo "setjPlayer('$url', '$type', '$serverType');"; echo "setjPlayer('$url', '$type', '$serverType');";
} }
?> ?>
$("#popup-link").click(function() {
$("#popup-share").show("slow");
$("#popup-share-link").val($("#combo-box option:selected").attr("data-url"));
});
$("#popup-close").click(function() {
$("#popup-share").hide("slow");
});
}); });
</script> </script>
<div class="jp-logo"><img id="logo-img" onload='resizeToMaxHeight(this, 40);' src="<?php echo $this->logo ?>" /></div> <div class="jp-logo"><img id="logo-img" onload='resizeToMaxHeight(this, 40);' src="<?php echo $this->logo ?>" /></div>
<div id="popup-share">
<a class="close-round" href="#" id="popup-close"></a>
<input id="popup-share-link" type="text" readonly="readonly"/>
</div>
<div class="jp-stream"> <div class="jp-stream">
<div class="jp-stream-text"><? echo _("Select stream:"); ?></div> <div class="jp-stream-text"><? echo _("Select stream:"); ?></div>

35
airtime_mvc/public/css/styles.css
View File

@ -2955,3 +2955,38 @@ dd .stream-status {
.edit-user-global input { .edit-user-global input {
width: 170px; width: 170px;
} }
.jp-container a#popup-link {
width: 104px;
border: 1px solid black;
font-size: 13px;
font-weight: bold;
text-decoration: none;
margin-top:3px;
text-align: center;
right: 16px;
position: absolute;
top: 40px;
color: #FF5D1A
}
#popup-share {
display:none;
position: fixed;
width:360px;
height: 26px;
margin-left:8px;
margin-right: 150px;
margin-top: 0px;
border:1px solid black;
background-color:#282828;
padding:10px;
z-index:102;
font-size:10pt;
font-weight:bold;
}
#popup-share-link {
width: 320px;
}