提交 c7f7e209 编写于 作者: H HFO4

add thumb preview in folder sharing page

上级 c1171032
...@@ -132,6 +132,18 @@ class Share extends Controller{ ...@@ -132,6 +132,18 @@ class Share extends Controller{
return $shareObj->listPic($shareId,$filePath); return $shareObj->listPic($shareId,$filePath);
} }
public function Thumb(){
$filePath = input("get.path");
if(input("get.isImg") != "true"){
return "";
}
$fileObj = new FileManage($filePath,$this->userObj->uid);
$Redirect = $fileObj->getThumb();
if($Redirect[0]){
$this->redirect($Redirect[1],302);
}
}
public function Delete(){ public function Delete(){
$shareId = input('post.id'); $shareId = input('post.id');
$shareObj = new ShareHandler($shareId,false); $shareObj = new ShareHandler($shareId,false);
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
"topthink/think-captcha":"1.*", "topthink/think-captcha":"1.*",
"aliyuncs/oss-sdk-php": "~2.0", "aliyuncs/oss-sdk-php": "~2.0",
"sabre/dav":"~3.2.0", "sabre/dav":"~3.2.0",
"upyun/sdk": "^3.3" "upyun/sdk": "^3.3",
"google/apiclient": "^2.2"
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {
......
此差异已折叠。
...@@ -310,12 +310,11 @@ textarea.code { ...@@ -310,12 +310,11 @@ textarea.code {
.sidebar { .sidebar {
display: none; display: none;
background: #fafafa; background: #fafafa;
margin-top: 2px;
padding: 0; padding: 0;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
border-right: 1px solid #eee; border-right: 1px solid #eee;
height: 100%; height: calc(100% - 61px);
} }
.btn-go-back { .btn-go-back {
...@@ -375,7 +374,10 @@ textarea.code { ...@@ -375,7 +374,10 @@ textarea.code {
} }
.iconset { .iconset {
padding: 10px padding: 10px;
overflow: auto;
overflow-x: hidden;
overflow-y: visible;
} }
.col-120 { .col-120 {
...@@ -548,7 +550,9 @@ a:active,a:focus,a:hover,table th>a:active,table th>a:focus,table th>a:hover { ...@@ -548,7 +550,9 @@ a:active,a:focus,a:hover,table th>a:active,table th>a:focus,table th>a:hover {
} }
.main { .main {
overflow-y: auto overflow: auto;
overflow-x: hidden;
height: calc(100% - 61px)
} }
@media (min-width:768px) { @media (min-width:768px) {
...@@ -617,7 +621,7 @@ a:active,a:focus,a:hover,table th>a:active,table th>a:focus,table th>a:hover { ...@@ -617,7 +621,7 @@ a:active,a:focus,a:hover,table th>a:active,table th>a:focus,table th>a:hover {
border-top: none; border-top: none;
box-shadow: none; box-shadow: none;
padding: 0; padding: 0;
margin: 0 0 margin: 5px 0
} }
.breadcrumb { .breadcrumb {
...@@ -626,7 +630,9 @@ a:active,a:focus,a:hover,table th>a:active,table th>a:focus,table th>a:hover { ...@@ -626,7 +630,9 @@ a:active,a:focus,a:hover,table th>a:active,table th>a:focus,table th>a:hover {
font-size: 17px; font-size: 17px;
margin: 12px; margin: 12px;
overflow: hidden; overflow: hidden;
max-height: 30px max-height: 30px;
margin-bottom: 17px;
margin-top: 18px;
} }
.breadcrumb a,.breadcrumb>.active { .breadcrumb a,.breadcrumb>.active {
...@@ -652,7 +658,7 @@ a:active,a:focus,a:hover,table th>a:active,table th>a:focus,table th>a:hover { ...@@ -652,7 +658,7 @@ a:active,a:focus,a:hover,table th>a:active,table th>a:focus,table th>a:hover {
.btn.btn-flat { .btn.btn-flat {
background: 0 0; background: 0 0;
color: #777 color:#bbc5e3
} }
.btn-group.open>.btn-flat,.btn.btn-flat,.btn.btn-flat:active { .btn-group.open>.btn-flat,.btn.btn-flat,.btn.btn-flat:active {
...@@ -774,7 +780,7 @@ td { ...@@ -774,7 +780,7 @@ td {
} }
.pull-left.visible-xs.ng-binding.ng-scope { .pull-left.visible-xs.ng-binding.ng-scope {
color: #777 color: #bbc5e3
} }
.a,a:focus,a:hover { .a,a:focus,a:hover {
...@@ -1021,4 +1027,17 @@ video { ...@@ -1021,4 +1027,17 @@ video {
border: 0; border: 0;
border-radius: 0; border-radius: 0;
color: #fff; color: #fff;
}
.btn:not(.btn-raised).btn-primary, .input-group-btn .btn:not(.btn-raised).btn-primary {
color: #b9c3e2;
}
.btn-primary:not(.btn-raised):not(.btn-link):focus, .btn-primary:not(.btn-raised):not(.btn-link):hover, .input-group-btn .btn-primary:not(.btn-raised):not(.btn-link):focus, .input-group-btn .btn-primary:not(.btn-raised):not(.btn-link):hover {
background-color: #eeeeee;
box-shadow: 5px 3px 10px 4px rgba(0,0,0,.12), 0 1px 1px 0 rgba(0,0,0,.24);
}
.indent{
width: initial;
}
.btn-group-vertical.open>.dropdown-toggle.btn, .btn-group-vertical.open>.dropdown-toggle.btn.btn-default, .btn-group.open>.dropdown-toggle.btn, .btn-group.open>.dropdown-toggle.btn.btn-default {
background-color: #5468d6;
} }
\ No newline at end of file
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册