diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index d19a4a7d7340..45878ddc7db3 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -396,7 +396,7 @@ public static function getEditionString() { if (OC_App::isEnabled('enterprise_key')) { return "Enterprise"; } else { - return ""; + return "Non-Enterprise"; } } diff --git a/settings/css/settings.css b/settings/css/settings.css index 2a5659793e82..1d5d7f0c1d0c 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -7,6 +7,13 @@ input#openid, input#webdav { width:20em; } /* PERSONAL */ +#general { + margin-left: 50px; + width: 50%; + font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; + color: #444; + margin-bottom: 20px; +} #avatar { display: inline-block; float: left; diff --git a/settings/templates/panels/personal/profile.php b/settings/templates/panels/personal/profile.php index 444565f85b47..f7c96f886c17 100644 --- a/settings/templates/panels/personal/profile.php +++ b/settings/templates/panels/personal/profile.php @@ -7,6 +7,57 @@ vendor_style('jcrop/css/jquery.Jcrop'); } ?> + +

t('General Details')); ?>

+getSystemConfig(); + + $installed = (bool) $systemConfig->getValue('installed', false); + $maintenance = (bool) $systemConfig->getValue('maintenance', false); + # see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php + # for description and defaults + $defaults = new \OCP\Defaults(); + $values= [ + 'Installed'=>$installed, + 'Maintenance Mode' => $maintenance, + 'Database Upgrade' => \OCP\Util::needUpgrade(), + 'Version'=>implode('.', \OCP\Util::getVersion()), + 'Version String'=>OC_Util::getVersionString(), + 'Edition'=>OC_Util::getEditionString(), + 'Product Name'=>$defaults->getName()]; + if (OC::$CLI) { + print_r($values); + } else { + echo ""; + + foreach ($values as $key => $val) { + echo ""; + echo ""; + echo ""; + } + echo "
" . $key . ""; + if(!$val) { + if($key == "Database Upgrade") echo 'Not Required'; + else if($key == 'Maintenance Mode') echo 'Off'; + else echo 'No'; + } + else { + if($key == "Database Upgrade") echo 'Required'; + else if($key == 'Maintenance Mode') echo 'On'; + else if($key == 'Installed') echo 'Yes'; + else echo $val; + } + echo "
"; + } + +} catch (Exception $ex) { + OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); + \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL); +} +?> +

t('Profile picture')); ?>

diff --git a/version.php b/version.php index 9787ee8b1caa..b991cdf42f52 100644 --- a/version.php +++ b/version.php @@ -25,7 +25,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = [10, 0, 0, 0]; +$OC_Version = [10, 0, 0, 1]; // The human readable string $OC_VersionString = '10.0.0';