From fb16dd246007ceff747812dab92c6ea583c383aa Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 9 Aug 2015 17:44:33 +0300 Subject: [PATCH 01/11] kept from "Feature" branch --- admin/operators.php | 2 +- admin/timezonetemplate.php | 3 ++- config.inc.local.php.example | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/admin/operators.php b/admin/operators.php index c54aa46b..a3061154 100644 --- a/admin/operators.php +++ b/admin/operators.php @@ -245,7 +245,7 @@ function generate() {
-
+
  " class="btn btn-default fa" />     diff --git a/admin/timezonetemplate.php b/admin/timezonetemplate.php index ae0fe2e5..e585e9ea 100644 --- a/admin/timezonetemplate.php +++ b/admin/timezonetemplate.php @@ -95,7 +95,8 @@ $dtz = get_setting("DEFAULT_TIME_ZONE"); $sql = "SELECT name as value, name as description, CASE WHEN name LIKE '$dtz' THEN 'selected=\'selected\'' ELSE '' END AS selected - FROM mysql.time_zone_name"; + FROM mysql.time_zone_name + WHERE `Name` LIKE 'Europe%' OR `Name` LIKE 'Asia%' "; $tzl = $db->GetAll($sql); diff --git a/config.inc.local.php.example b/config.inc.local.php.example index e77296b6..bd323a14 100644 --- a/config.inc.local.php.example +++ b/config.inc.local.php.example @@ -29,6 +29,16 @@ * */ + +// This Site name will appear as Limesurvey {ENDURL} +define ('SITE_URL', 'http://Your site name.com/'); + +// Specify Your Local namings +define ('COMPANY_NAME', 'MY Company'); +define ('ADMIN_PANEL_NAME','Admin Panel'); +define ('OPERATOR_PANEL_NAME','Operator Panel'); + + /** * * Only some of the configuration directives are here. See the file: config.default.php for them all From 5be029ac0824963d77b41b5a4218e6d2122cf2e7 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 10 Aug 2015 01:37:07 +0300 Subject: [PATCH 02/11] removed admin.css and display.css as not required anymore Temporary switch dashpoard to display/index.php --- admin/index.php | 2 +- css/admin.css | 42 ------------------------------------------ css/display.css | 4 ---- display/index.php | 2 +- 4 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 css/admin.css delete mode 100644 css/display.css diff --git a/admin/index.php b/admin/index.php index 6be6b8f4..29b92050 100644 --- a/admin/index.php +++ b/admin/index.php @@ -92,7 +92,7 @@ include ("../lang.inc.php");