Commit f8375572 authored by Han Ruisong's avatar Han Ruisong
Browse files

更新到v1.1.0

1、支持拖拽上传
2、对断网情况不断重试
3、增加各种状态提示
4、优化上传逻辑
parent 06fd8013
Manifest-Version: 1.0
Class-Path:
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<!-- 生成视频信息接口 -->
<servlet>
<servlet-name>createVideoUploadInfo</servlet-name>
<servlet-class>com.dreamwin.h5demo.servlet.VideoServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>createVideoUploadInfo</servlet-name>
<url-pattern>/video/createuploadinfo</url-pattern>
</servlet-mapping>
<!-- 获取分类接口 -->
<servlet>
<servlet-name>categoryInfo</servlet-name>
<servlet-class>com.dreamwin.h5demo.servlet.CategoryServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>categoryInfo</servlet-name>
<url-pattern>/category/info</url-pattern>
</servlet-mapping>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
</web-app>
\ No newline at end of file
This diff is collapsed.
.category_layer_container{border:1px solid #ccc;padding:6px;border-radius:5px; display: inline-block;display: none;position: absolute;left:2px;top:36px;background-color: #ffffff;z-index:100;}
.all_category_box{border:1px solid #ccc;margin-top:10px;overflow:auto;font-size:12px;}
.all_category_box .item {line-height:30px;border-bottom:1px solid #ccc;padding-left:10px;padding-right:10px;}
.all_category_box .item:hover{background-color: #eeeeee;color:#000000;}
.all_category_box .item i {
position: absolute;
left:4px;
top:6px;
display: inline-block;
width: 14px;
height: 14px;
margin-top: 1px;
line-height: 14px;
vertical-align: text-top;
background-image: url("../../img/glyphicons-halflings.png");
background-repeat: no-repeat;
}
.all_category_box .item .icon-plus {background-position: -408px -96px;}
.all_category_box .item .icon-minus{background-position: -433px -96px;}
.all_category_box .item a{cursor: pointer;}
.all_category_box .item .category_name {padding-left:20px;display: inline-block;position: relative;word-break:keep-all;max-width:600px;}
.category_layer_container .sel_category_title{line-height: 30px;font-size:14px;margin-top:-6px;border-bottom:1px solid #ccc;}
.category_box{display:none;}
.all_category_box .selected{background-color:#0088cc;color:#ffffff;}
.all_category_box .selected .icon-plus{background:url("/img/plus_white.png");}
.all_category_box .selected .icon-minus{background:url("/img/minus_white.png");}
.all_category_box .selected:hover{background-color:#0088cc;color:#ffffff;}
.all_category_box .clean_pd {padding:0}
.category_layer_container .btn.disabled {cursor: not-allowed}
.li_tit{height:36px; line-height:38px; padding-left:15px; background:#F1F1F1; color:#666; font-weight:bold; border:1px solid #E5E5E5; border-bottom:none;}
.cc-layer-mask {position: fixed;background:rgba(0,0,0,0.7);width:100%;height:100%;z-index:9999;top:0;left:0;overflow: hidden;}
@media \0screen\,screen\9 {/* 只支持IE6、7、8 */
.cc-layer-mask{
background-color:#000;
filter:Alpha(opacity=70);
*zoom:1; /* 激活IE6、7的haslayout属性,让它读懂Alpha */
}
}
.cc-layer {position: fixed;z-index: 10000;width:900px;height:610px;background-color: #f4f4f4;left: 50%;top: 50%;margin-top:-305px;margin-left:-450px;border-radius:3px; overflow: hidden;display: none;}
.cc-layer .layer-header {height:34px;position: relative;line-height: 34px;color:#000; border: 1px solid #ddd;border-bottom:0;overflow: hidden;}
.cc-layer .layer-header span {display: inline-block;float: left;font-size:14px;}
.cc-layer .layer-header em {margin:0px 4px;}
.cc-layer .layer-header .close-box {position: absolute;top:0px;right:10px;font-size:14px;}
.cc-layer .layer-header .close-box span {cursor: pointer;}
.cc-layer .layer-body-wrap {background-color: #f4f4f4;border:1px solid #ddd;padding:0 10px 10px 10px;border-bottom:0;}
.cc-layer .layer-body {height: 100%; background-color: #fff; overflow: hidden;}
.cc-layer .layer-footer{width: 100%;}
.cc-layer .drag {border: 1px solid #ccc;}
.cc-layer .close-btn {font-size:18px;margin-left:10px;cursor: pointer;}
.cc-layer .close-btn:HOVER {font-size:22px;}
.cc-layer a {cursor: pointer;text-decoration: none; }
.cc-layer .gradient{
background:#E6E6E6; /* 一些不支持背景渐变的浏览器 */
background:-moz-linear-gradient(top, #F2F2F2, #E6E6E6);
background:-webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#E6E6E6));
background:-o-linear-gradient(top, #F2F2F2, #E6E6E6);
}
\ No newline at end of file
@charset "UTF-8";
body {
padding-top: 60px;
}
.fileinput-button {
position: relative;
overflow: hidden;
display: inline-block;
}
.fileinput-button input {
position: absolute;
top: 0;
right: 0;
margin: 0;
opacity: 0;
-ms-filter: 'alpha(opacity=0)';
font-size: 200px !important;
direction: ltr;
cursor: pointer;
}
/* Fixes for IE < 8 */
@media screen\9 {
.fileinput-button input {
filter: alpha(opacity=0);
font-size: 100%;
height: 100%;
}
}
.fileupload-buttonbar .btn,
.fileupload-buttonbar .toggle {
margin-bottom: 5px;
}
.progress-animated .progress-bar,
.progress-animated .bar {
background: url("../img/progressbar.gif") !important;
filter: none;
}
.fileupload-process {
float: right;
display: none;
}
.fileupload-processing .fileupload-process,
.files .processing .preview {
display: block;
width: 32px;
height: 32px;
background: url("../img/loading.gif") center no-repeat;
background-size: contain;
}
.files audio,
.files video {
max-width: 300px;
}
@media (max-width: 767px) {
.fileupload-buttonbar .toggle,
.files .toggle,
.files .btn span {
display: none;
}
.files .name {
width: 80px;
word-wrap: break-word;
}
.files audio,
.files video {
max-width: 80px;
}
.files img,
.files canvas {
max-width: 100%;
}
}
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment