diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-26 14:17:32 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-26 14:17:32 +0200 |
| commit | 4e53db3d9c2dfca6baf2e9878d14c38656b37bca (patch) | |
| tree | 21839e72d4742766e895e57d6b0fa943728dcfc5 /core | |
| parent | 51c5e7035e5bcc2b5675726584041160495f3470 (diff) | |
| parent | 72b365842f03d01e1479578ae36f5074d793e702 (diff) | |
| download | nextcloud-server-4e53db3d9c2dfca6baf2e9878d14c38656b37bca.tar.gz nextcloud-server-4e53db3d9c2dfca6baf2e9878d14c38656b37bca.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 1 | ||||
| -rw-r--r-- | core/js/multiselect.js | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 6d272845ebe..b818caa279f 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -106,6 +106,7 @@ label.infield { cursor: text !important; } /* VARIOUS REUSABLE SELECTORS */ .hidden { display:none; } .bold { font-weight: bold; } +.center { text-align: center; } #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 5f339006d26..db5afa637c9 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -136,7 +136,7 @@ var option=$('<option selected="selected"/>'); option.attr('value',$(this).val()); option.text($(this).val()); - select.append(optione); + select.append(options); li.prev().children('input').trigger('click'); button.parent().data('preventHide',false); if(settings.createCallback){ diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d6911fd1e18..7e98fdedc2d 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -47,7 +47,7 @@ <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> <form class="searchbox header-right" action="#" method="post"> - <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" /> + <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech /> </form> </div></header> |