mirror of
https://github.com/ossrs/srs.git
synced 2025-02-15 04:42:04 +00:00
remove the wizard control, too complex
This commit is contained in:
winlin
parent
aadff96e14
commit
e9a88e6b43
3 changed files with 6 additions and 197 deletions
160
trunk/research/players/css/bootstrap-wizard.css
vendored
160
trunk/research/players/css/bootstrap-wizard.css
vendored
|
|
@ -1,160 +0,0 @@
|
||||||
.wizard {
|
|
||||||
display:none;
|
|
||||||
}
|
|
||||||
.wizard-modal form {
|
|
||||||
margin:0;
|
|
||||||
padding:0;
|
|
||||||
}
|
|
||||||
.wizard-modal.modal {
|
|
||||||
width:750px;
|
|
||||||
margin-left:-375px;
|
|
||||||
top:50%;
|
|
||||||
}
|
|
||||||
.wizard-modal-footer {
|
|
||||||
padding:0;
|
|
||||||
}
|
|
||||||
.wizard-modal-header.modal-header h3 {
|
|
||||||
line-height:35px;
|
|
||||||
display:inline
|
|
||||||
}
|
|
||||||
.wizard-modal-header.modal-header {
|
|
||||||
border-bottom:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-subtitle {
|
|
||||||
font-weight:bold;
|
|
||||||
color:#AFAFAF;
|
|
||||||
padding-left:20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-error,
|
|
||||||
.wizard-failure,
|
|
||||||
.wizard-success,
|
|
||||||
.wizard-loading,
|
|
||||||
.wizard-card {
|
|
||||||
position:relative;
|
|
||||||
padding:35px;
|
|
||||||
padding-top:20px;
|
|
||||||
overflow-y:auto;
|
|
||||||
height:300px;
|
|
||||||
display:none;
|
|
||||||
border-top: 1px solid #EEE;
|
|
||||||
margin-right: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-nav-link .icon-chevron-right {
|
|
||||||
float:right;
|
|
||||||
margin-top:12px;
|
|
||||||
margin-right:-6px;
|
|
||||||
opacity:.25;
|
|
||||||
}
|
|
||||||
|
|
||||||
li.wizard-nav-item.active .icon-chevron-right {
|
|
||||||
opacity:1;
|
|
||||||
}
|
|
||||||
|
|
||||||
li.wizard-nav-item {
|
|
||||||
line-height:40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-no-modal .nav-list > li > a,
|
|
||||||
.wizard-modal.modal .nav-list > li > a {
|
|
||||||
background-color:#f5f5f5;
|
|
||||||
padding:3px 15px 3px 20px;
|
|
||||||
cursor:default;
|
|
||||||
color:#B4B4B4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-no-modal .nav-list li.active > a,
|
|
||||||
.wizard-modal.modal .nav-list li.active > a {
|
|
||||||
background-color:#08C;
|
|
||||||
}
|
|
||||||
.wizard-no-modal .nav-list > li.already-visited > a.wizard-nav-link,
|
|
||||||
.wizard-modal.modal .nav-list > li.already-visited > a.wizard-nav-link {
|
|
||||||
color:#08C;
|
|
||||||
cursor:pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-no-modal .nav-list > li.active > a.wizard-nav-link,
|
|
||||||
.wizard-modal.modal .nav-list > li.active > a.wizard-nav-link {
|
|
||||||
color:white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.already-visited > a.wizard-nav-link:hover {
|
|
||||||
background-color:#E4E4E4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-card > h3 {
|
|
||||||
margin-top:0;
|
|
||||||
margin-bottom:20px;
|
|
||||||
font-size:21px;
|
|
||||||
line-height:40px;
|
|
||||||
font-weight:normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-progress {
|
|
||||||
padding:15px;
|
|
||||||
bottom:0;
|
|
||||||
}
|
|
||||||
.wizard-progress-container {
|
|
||||||
padding:20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-steps {
|
|
||||||
width:28%;
|
|
||||||
height:425px;
|
|
||||||
background-color:#f5f5f5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-nav-container {
|
|
||||||
height:360px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav > li > a.wizard-step-error {
|
|
||||||
background-color:#F2DEDE;
|
|
||||||
color:#B94A48;
|
|
||||||
font-weight:bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-step-error .icon-chevron-right {
|
|
||||||
opacity:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-input-section {
|
|
||||||
margin-bottom:20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-buttons-container {
|
|
||||||
padding:20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-cancel {
|
|
||||||
display:none;
|
|
||||||
margin-left:20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-close {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-no-modal .popover.error-popover,
|
|
||||||
.wizard-modal .popover.error-popover {
|
|
||||||
background-color:#F2DEDE;
|
|
||||||
color:#B94A48;
|
|
||||||
border-color:#953B39;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-no-modal .popover.error-popover .arrow::after,
|
|
||||||
.wizard-modal .popover.error-popover .arrow::after {
|
|
||||||
border-right-color:#F2DEDE;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-no-modal .popover.error-popover .popover-title,
|
|
||||||
.wizard-modal .popover.error-popover .popover-title {
|
|
||||||
display:none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizard-no-modal .popover.error-popover .arrow,
|
|
||||||
.wizard-modal .popover.error-popover .arrow {
|
|
||||||
border-right-color:#953B39;
|
|
||||||
}
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -4,10 +4,8 @@
|
||||||
<title>SRS</title>
|
<title>SRS</title>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
|
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
|
||||||
<link rel="stylesheet" type="text/css" href="css/bootstrap-wizard.css"/>
|
|
||||||
<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
|
<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
|
||||||
<script type="text/javascript" src="js/bootstrap.min.js"></script>
|
<script type="text/javascript" src="js/bootstrap.min.js"></script>
|
||||||
<script type="text/javascript" src="js/bootstrap-wizard.min.js"></script>
|
|
||||||
<script type="text/javascript" src="js/swfobject.js"></script>
|
<script type="text/javascript" src="js/swfobject.js"></script>
|
||||||
<script type="text/javascript" src="js/srs.js"></script>
|
<script type="text/javascript" src="js/srs.js"></script>
|
||||||
<style>
|
<style>
|
||||||
|
|
@ -27,20 +25,13 @@
|
||||||
// url set to: rtmp://demo:1935/live/livestream
|
// url set to: rtmp://demo:1935/live/livestream
|
||||||
srs_init("#txt_url", null, null);
|
srs_init("#txt_url", null, null);
|
||||||
|
|
||||||
$("#btn_video_settings").click(function(){
|
$("#btn_create_chat").click(function(){
|
||||||
$("#video_modal").modal({show:true});
|
$("#video_modal").modal({show:true});
|
||||||
});
|
});
|
||||||
$("#btn_audio_settings").click(function(){
|
$("#btn_join_chat").click(function(){
|
||||||
$("#audio_modal").modal({show:true});
|
$("#audio_modal").modal({show:true});
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#remote_tips").tooltip({
|
|
||||||
title: "为了支持HLS输出，FLASH编码器输出的流需要经过转码(VP6=>H264,MP3=>aac)，所以会黑屏较长时间，请耐心等待"
|
|
||||||
});
|
|
||||||
$("#low_latecy_tips").tooltip({
|
|
||||||
title: "服务器不转码直接转发FLASH编码器的流，所以延迟比支持HLS的流要低很多"
|
|
||||||
});
|
|
||||||
|
|
||||||
$("#btn_publish").click(on_user_publish);
|
$("#btn_publish").click(on_user_publish);
|
||||||
|
|
||||||
// for publish, we use randome stream name.
|
// for publish, we use randome stream name.
|
||||||
|
|
@ -126,7 +117,7 @@
|
||||||
};
|
};
|
||||||
srs_publisher.start();
|
srs_publisher.start();
|
||||||
|
|
||||||
//wizard = $("#main_wizard").wizard({});
|
//wizard = $("#some-wizard").wizard({});
|
||||||
//wizard.show();
|
//wizard.show();
|
||||||
|
|
||||||
// if no play specified, donot show the player, for debug the publisher.
|
// if no play specified, donot show the player, for debug the publisher.
|
||||||
|
|
@ -150,14 +141,6 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
|
||||||
* we generate the transcoded stream url for flash publish donot support HLS
|
|
||||||
* which requires aac, so the publish vhost maybe players for example, we
|
|
||||||
* use players_pub vhost(transcoded stream to which) for all clients,
|
|
||||||
* both players and players_pub are write HLS to the sample dir,
|
|
||||||
* it's ok for the players vhost disabled the HLS, only the
|
|
||||||
* players_pub enalbed HLS.
|
|
||||||
*/
|
|
||||||
function update_play_url() {
|
function update_play_url() {
|
||||||
var url = $("#txt_url").val();
|
var url = $("#txt_url").val();
|
||||||
var ret = srs_parse_rtmp_url(url);
|
var ret = srs_parse_rtmp_url(url);
|
||||||
|
|
@ -277,25 +260,12 @@
|
||||||
<div class="alert alert-info fade in" id="txt_log">
|
<div class="alert alert-info fade in" id="txt_log">
|
||||||
<button type="button" class="close" data-dismiss="alert">×</button>
|
<button type="button" class="close" data-dismiss="alert">×</button>
|
||||||
<strong><span id="txt_log_title">Usage:</span></strong>
|
<strong><span id="txt_log_title">Usage:</span></strong>
|
||||||
<span id="txt_log_msg">设置编码参数，点“发布视频”，允许Flash访问摄像头即可推流</span>
|
<span id="txt_log_msg">创建会议室，或者加入会议室</span>
|
||||||
</div>
|
</div>
|
||||||
<!-- http://www.panopta.com/2013/02/06/bootstrap-application-wizard/ -->
|
|
||||||
<!-- https://github.com/amoffat/bootstrap-application-wizard -->
|
|
||||||
<div class="wizard" id="main_wizard" data-title="Wizard Title">
|
|
||||||
<div class="wizard-card" data-cardname="card1">
|
|
||||||
<h3>Card 1</h3>
|
|
||||||
Some content
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="wizard-card" data-cardname="card2">
|
|
||||||
<h3>Card 2</h3>
|
|
||||||
Some content
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="control-group">
|
<div class="control-group">
|
||||||
<div class="form-inline">
|
<div class="form-inline">
|
||||||
<button class="btn" id="btn_video_settings">视频编码配置</button>
|
<button class="btn" id="btn_create_chat">创建会议室</button>
|
||||||
<button class="btn" id="btn_audio_settings">音频编码配置</button>
|
<button class="btn" id="btn_join_chat">加入会议室</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="control-group">
|
<div class="control-group">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue