diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 4 | ||||
| -rw-r--r-- | core/img/filetypes/application-msexcel.png | bin | 566 -> 663 bytes | |||
| -rw-r--r-- | core/img/filetypes/application-mspowerpoint.png | bin | 519 -> 588 bytes | |||
| -rw-r--r-- | core/img/filetypes/application-msword.png | bin | 789 -> 651 bytes | |||
| -rw-r--r-- | core/img/filetypes/ms-excel.png | bin | 566 -> 663 bytes | |||
| -rw-r--r-- | core/img/filetypes/ms-powerpoint.png | bin | 519 -> 588 bytes | |||
| -rw-r--r-- | core/js/multiselect.js | 5 | ||||
| -rw-r--r-- | core/lostpassword/controller.php | 6 |
8 files changed, 10 insertions, 5 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index c2e1ad92088..8a01211d8b0 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -258,8 +258,8 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; } #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } #expanddiv { position:absolute; right:0; top:45px; z-index:76; display:none; - background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68); - background:#383c43 url('../img/noise.png') repeat; border-bottom:1px #333 solid; border-left:border-bottom:1px #333 solid; + background:#383c43 url('../img/noise.png') repeat; + border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid; -moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68); } #expanddiv a { diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png Binary files differindex abcd93689a0..b977d7e52e2 100644 --- a/core/img/filetypes/application-msexcel.png +++ b/core/img/filetypes/application-msexcel.png diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png Binary files differindex b4aaad9a45c..c4eff0387d5 100644 --- a/core/img/filetypes/application-mspowerpoint.png +++ b/core/img/filetypes/application-mspowerpoint.png diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png Binary files differindex e8b230c59cb..ae8ecbf4767 100644 --- a/core/img/filetypes/application-msword.png +++ b/core/img/filetypes/application-msword.png diff --git a/core/img/filetypes/ms-excel.png b/core/img/filetypes/ms-excel.png Binary files differindex abcd93689a0..b977d7e52e2 100644 --- a/core/img/filetypes/ms-excel.png +++ b/core/img/filetypes/ms-excel.png diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png Binary files differindex b4aaad9a45c..c4eff0387d5 100644 --- a/core/img/filetypes/ms-powerpoint.png +++ b/core/img/filetypes/ms-powerpoint.png diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 623c6e0f7e1..bc4223feb64 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -266,8 +266,9 @@ } list.append(list.find('li.creator')); var pos=button.position(); - if($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) - || $(document).height()/2 > pos.top + if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) + && $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height())) + || $(document).height()/2 > button.offset().top ) { list.css({ top:pos.top+button.outerHeight()-5, diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 3ef8eaf71aa..fbcf4a87f22 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -44,7 +44,11 @@ class OC_Core_LostPassword_Controller { $msg = $tmpl->fetchPage(); $l = OC_L10N::get('core'); $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply'); - OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); + try { + OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); + } catch (Exception $e) { + OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.'); + } self::displayLostPasswordPage(false, true); } else { self::displayLostPasswordPage(true, false); |
