diff --git a/trunk/3rdparty/bootstrap.2.3.2.zip b/trunk/3rdparty/bootstrap.2.3.2.zip new file mode 100644 index 000000000..47536ba28 Binary files /dev/null and b/trunk/3rdparty/bootstrap.2.3.2.zip differ diff --git a/trunk/3rdparty/jquery-1.10.2.zip b/trunk/3rdparty/jquery-1.10.2.zip new file mode 100644 index 000000000..fdf2378f3 Binary files /dev/null and b/trunk/3rdparty/jquery-1.10.2.zip differ diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index eb0d225d6..b86e86dea 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -197,6 +197,7 @@ vhost dev { } } } + # the http hook callback vhost, srs will invoke the hooks for specified events. vhost hooks.callback.vhost.com { http_hooks { diff --git a/trunk/research/players/css/bootstrap-wizard.css b/trunk/research/players/css/bootstrap-wizard.css new file mode 100755 index 000000000..21ecb9b3b --- /dev/null +++ b/trunk/research/players/css/bootstrap-wizard.css @@ -0,0 +1,160 @@ +.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; +} diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html index 97148ee90..cbffc8852 100755 --- a/trunk/research/players/index.html +++ b/trunk/research/players/index.html @@ -31,6 +31,7 @@