From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QoIoj-000433-Lw for garchives@archives.gentoo.org; Tue, 02 Aug 2011 17:31:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B421321C067; Tue, 2 Aug 2011 17:31:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8102D21C067 for ; Tue, 2 Aug 2011 17:31:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D65A71B400D for ; Tue, 2 Aug 2011 17:31:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 359BF3C004 for ; Tue, 2 Aug 2011 17:31:35 +0000 (UTC) From: "Liam McLoughlin" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Liam McLoughlin" Message-ID: Subject: [gentoo-commits] proj/gentoaster:webui commit in: web/ X-VCS-Repository: proj/gentoaster X-VCS-Files: web/config.php web/index.php X-VCS-Directories: web/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: a0a786dbc48cf83aab4954058c28b4ff8dfa19f5 Date: Tue, 2 Aug 2011 17:31:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 51ea59ccebc5b1ec8c08cad326b36c82 commit: a0a786dbc48cf83aab4954058c28b4ff8dfa19f5 Author: Liam McLoughlin hexxeh net> AuthorDate: Tue Aug 2 17:31:27 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Tue Aug 2 17:31:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3Da0a786db Add options for configuring default keyboard layout and timezone --- web/config.php | 6 ++++++ web/index.php | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/web/config.php b/web/config.php index 39f505f..38076e8 100644 --- a/web/config.php +++ b/web/config.php @@ -11,6 +11,12 @@ =20 // Should we allow multiple simultaneous builds for a user? define("SIMULTANEOUS_BUILDS", false); + =20 + // What should we set as the default keyboard layout? + define("DEFAULT_KEYBOARD", "gb"); + + // What should we set as the default timezone? + define("DEFAULT_TIMEZONE", "Europe/London"); =20 // What should we set as the default list of packages? define("DEFAULT_PACKAGES", "dhcpd"); diff --git a/web/index.php b/web/index.php index b6cb119..4903bbb 100644 --- a/web/index.php +++ b/web/index.php @@ -57,15 +57,22 @@ } $timezoneOption =3D ""; foreach ($timezones as $timezone =3D> $description) { - $timezoneOption .=3D "\n"; + $timezoneOption .=3D "".$timezone."\n"; } $layoutLines =3D file(GENTOASTER_PATH."/res/keyboard.lst"); $keyboardOption =3D ""; =20 foreach($layoutLines as $layout) { $layoutdata =3D explode("\t", $layout); - $keyboardOption .=3D "\n"; + $keyboardOption .=3D "\n"; } =20 asort($layouts); From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qs11U-0004Ni-Ix for garchives@archives.gentoo.org; Fri, 12 Aug 2011 23:20:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C34621C3F5; Fri, 12 Aug 2011 23:18:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E2EDC21C3F5 for ; Fri, 12 Aug 2011 23:18:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B2CE1B4038 for ; Fri, 12 Aug 2011 23:18:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DEADE80056 for ; Fri, 12 Aug 2011 23:17:59 +0000 (UTC) From: "Liam McLoughlin" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Liam McLoughlin" Message-ID: Subject: [gentoo-commits] proj/gentoaster:master commit in: web/ X-VCS-Repository: proj/gentoaster X-VCS-Files: web/config.php web/index.php X-VCS-Directories: web/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: a0a786dbc48cf83aab4954058c28b4ff8dfa19f5 Date: Fri, 12 Aug 2011 23:17:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 53d567181e09daf6f367691f7b8d92a7 Message-ID: <20110812231759.xfjaqGKZY4MXbTZ_NLkmaDLEhOrzfOnJY6q19iBx0N0@z> commit: a0a786dbc48cf83aab4954058c28b4ff8dfa19f5 Author: Liam McLoughlin hexxeh net> AuthorDate: Tue Aug 2 17:31:27 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Tue Aug 2 17:31:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3Da0a786db Add options for configuring default keyboard layout and timezone --- web/config.php | 6 ++++++ web/index.php | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/web/config.php b/web/config.php index 39f505f..38076e8 100644 --- a/web/config.php +++ b/web/config.php @@ -11,6 +11,12 @@ =20 // Should we allow multiple simultaneous builds for a user? define("SIMULTANEOUS_BUILDS", false); + =20 + // What should we set as the default keyboard layout? + define("DEFAULT_KEYBOARD", "gb"); + + // What should we set as the default timezone? + define("DEFAULT_TIMEZONE", "Europe/London"); =20 // What should we set as the default list of packages? define("DEFAULT_PACKAGES", "dhcpd"); diff --git a/web/index.php b/web/index.php index b6cb119..4903bbb 100644 --- a/web/index.php +++ b/web/index.php @@ -57,15 +57,22 @@ } $timezoneOption =3D ""; foreach ($timezones as $timezone =3D> $description) { - $timezoneOption .=3D "\n"; + $timezoneOption .=3D "".$timezone."\n"; } $layoutLines =3D file(GENTOASTER_PATH."/res/keyboard.lst"); $keyboardOption =3D ""; =20 foreach($layoutLines as $layout) { $layoutdata =3D explode("\t", $layout); - $keyboardOption .=3D "\n"; + $keyboardOption .=3D "\n"; } =20 asort($layouts);