From 828d7d6cf5e9cc7df89527243268a14ad7d4d0b9 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sun, 18 Jan 2015 18:50:46 +0100 Subject: [PATCH] add a Windows warning --- settings/admin.php | 2 ++ settings/templates/admin.php | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/settings/admin.php b/settings/admin.php index 01cab1fa1f..bb20c665f5 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -81,6 +81,8 @@ $template->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMe $databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false); $template->assign('databaseOverload', $databaseOverload); +// warn if Windows is used +$template->assign('WindowsWarning', OC_Util::runningOnWindows()); // add hardcoded forms from the template $forms = OC_App::getForms('admin'); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 41b60b6442..65c6359e50 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -10,13 +10,10 @@ */ style('settings', 'settings'); -script('settings', 'settings'); -script( "settings", "admin" ); -script( "settings", "log" ); -script( 'core', 'multiselect' ); +script('settings', [ 'settings', 'admin', 'log'] ); +script('core', ['multiselect', 'setupchecks']); vendor_script('select2/select2'); vendor_style('select2/select2'); -script('core', 'setupchecks'); $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal'); $levelLabels = array( @@ -125,6 +122,20 @@ if ($_['databaseOverload']) { +
+

t('Microsoft Windows Platform'));?>

+ +

+ t('Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience.')); ?> +

+ +
+