Changeset 11975 for trunk/admin/include
- Timestamp:
- Aug 19, 2011, 6:04:43 PM (13 years ago)
- Location:
- trunk/admin/include
- Files:
-
- 2 added
- 2 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/photos_add_direct_prepare.inc.php
r11966 r11975 86 86 $max_upload_width = round(sqrt($available_memory/(2 * $fudge_factor))); 87 87 $max_upload_height = round(2 * $max_upload_width / 3); 88 $max_upload_resolution = floor($max_upload_width * $max_upload_height / (1024 * 1024)); 88 89 // we don't want dimensions like 2995x1992 but 3000x2000 90 $max_upload_width = round($max_upload_width/100)*100; 91 $max_upload_height = round($max_upload_height/100)*100; 92 93 $max_upload_resolution = floor($max_upload_width * $max_upload_height / (1000000)); 89 94 90 95 // no need to display a limitation warning if the limitation is huge like 20MP -
trunk/admin/include/photos_add_direct_process.inc.php
r11962 r11975 43 43 ); 44 44 } 45 46 $category_id = $_POST['category']; 47 45 else 46 { 47 $category_id = $_POST['category']; 48 } 49 50 if (isset($_POST['onUploadError']) and is_array($_POST['onUploadError']) and count($_POST['onUploadError']) > 0) 51 { 52 foreach ($_POST['onUploadError'] as $error) 53 { 54 array_push($page['errors'], $error); 55 } 56 } 57 48 58 $image_ids = array(); 49 59 -
trunk/admin/include/uploadify/uploadify.css
r11966 r11975 1 1 /* 2 Uploadify v2.1.0 3 Release Date: August 24, 2009 4 5 Copyright (c) 2009 Ronnie Garcia, Travis Nickels 2 Uploadify v3.0.0 3 Copyright (c) 2010 Ronnie Garcia 6 4 7 5 Permission is hereby granted, free of charge, to any person obtaining a copy … … 23 21 THE SOFTWARE. 24 22 */ 23 24 .uploadify {margin:0 auto 10px auto} 25 26 .uploadifyButton { 27 display: block; 28 cursor: pointer; 29 font-size: 11px; 30 font-weight: bold; 31 color: #eeeeee; 32 padding: 8px 0; 33 text-align: center; 34 height: 14px; 35 width: 100%; 36 background-color: #464646; 37 -webkit-border-radius:5px; 38 -moz-border-radius:5px; 39 border-radius:5px; 40 letter-spacing:2px; 41 } 42 .uploadify:hover .uploadifyButton { 43 color:#fff; 44 background-color: #333; 45 cursor:pointer; 46 } 47 .uploadifyQueueItem { 48 background-color: #F5F5F5; 49 -webkit-border-radius: 3px; 50 -moz-border-radius: 3px; 51 border-radius: 3px; 52 font: 11px Verdana, Geneva, sans-serif; 53 margin-top: 5px; 54 max-width: 350px; 55 padding: 10px; 56 } 57 .uploadifyQueueItem .cancel { 58 float: right; 59 } 60 .uploadifyQueueItem .fileName, .uploadifyQueueItem .data { 61 float: left; 62 } 63 .uploadifyQueue .completed { 64 background-color: #E5E5E5; 65 } 66 .uploadifyProgress { 67 background-color: #E5E5E5; 68 margin-top: 25px; 69 height: 3px; 70 width: 100%; 71 position: relative; 72 } 73 .uploadifyProgressBar { 74 background-color: #0099FF; 75 height: 3px; 76 width: 1px; 77 position: absolute; 78 left: 0px; 79 } 80 .uploadifyError { 81 background-color: #FDE5DD !important; 82 } 83 84 85 /* Piwigo specific */ 25 86 #fileQueue { 26 87 width: 420px; … … 50 111 background-color: #333; 51 112 border: 1px solid #666; 52 margin-top: 10px;53 113 width: 100%; 54 114 }
Note: See TracChangeset
for help on using the changeset viewer.