diff options
| author | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-15 19:16:00 +0400 |
|---|---|---|
| committer | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-15 19:16:00 +0400 |
| commit | 323a98adb79b84192085208798525be831b33e81 (patch) | |
| tree | 1bbf1ad7769b606c90485edf1f871337b2f9b1e3 /core | |
| parent | ea8461e83d83e17820518b844f7bb0d71685a88c (diff) | |
| parent | c383543ec9d56db12fdf6d796ea95667dd3f1c45 (diff) | |
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 1 | ||||
| -rw-r--r-- | core/img/loading-dark.gif | bin | 0 -> 673 bytes | |||
| -rw-r--r-- | core/templates/installation.php | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 46b340be961..539ae580aa0 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -122,3 +122,4 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; } .pager li { display:inline-block; } li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; }
\ No newline at end of file diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif Binary files differnew file mode 100644 index 00000000000..5fe86acabc4 --- /dev/null +++ b/core/img/loading-dark.gif diff --git a/core/templates/installation.php b/core/templates/installation.php index 70a545d66cf..f1cde6b3904 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -37,7 +37,7 @@ </fieldset> <fieldset id='databaseField'> - <?php if($_['hasMySQL'] or $_['hasPostgreSQL']) $hasOtherDB = true; //other than SQLite ?> + <?php if($_['hasMySQL'] or $_['hasPostgreSQL']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> <legend><?php echo $l->t( 'Configure the database' ); ?></legend> <div id="selectDbType"> <?php if($_['hasSQLite']): ?> |
