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 1Qkofl-0006Wy-LT for garchives@archives.gentoo.org; Sun, 24 Jul 2011 02:44:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A74DF21C131; Sun, 24 Jul 2011 02:43:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7902D21C13F for ; Sun, 24 Jul 2011 02:43:38 +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 E325F1BC018 for ; Sun, 24 Jul 2011 02:43:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E378B80056 for ; Sun, 24 Jul 2011 02:43:36 +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: <6966eb6938356224c61760ec44a15c2e690311e3.hexxeh@gentoo> Subject: [gentoo-commits] proj/gentoaster:webui commit in: web/js/, web/ X-VCS-Repository: proj/gentoaster X-VCS-Files: web/index.php web/js/gentoaster.js X-VCS-Directories: web/js/ web/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: 6966eb6938356224c61760ec44a15c2e690311e3 Date: Sun, 24 Jul 2011 02:43:36 +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: 8d65d892ef80a2635c15c49b81d95908 commit: 6966eb6938356224c61760ec44a15c2e690311e3 Author: Liam McLoughlin hexxeh net> AuthorDate: Sun Jul 24 02:34:02 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Sun Jul 24 02:43:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3D6966eb69 Added disk size cap --- web/index.php | 10 +++++++++- web/js/gentoaster.js | 14 ++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/web/index.php b/web/index.php index 43be192..6b6abec 100644 --- a/web/index.php +++ b/web/index.php @@ -37,6 +37,11 @@
@@ -108,7 +113,7 @@

Partitioning

=20
-
+
=20



@@ -148,6 +153,9 @@
+ diff --git a/web/js/gentoaster.js b/web/js/gentoaster.js index 99cd514..2ff875b 100644 --- a/web/js/gentoaster.js +++ b/web/js/gentoaster.js @@ -25,9 +25,10 @@ $(function(){ root_size: { min: 3072 }, - size: { - min: 4020 - } + image_size: { + min: 4020, + max: MAX_DISK_SIZE + }, }, messages: { username: { @@ -49,9 +50,10 @@ $(function(){ root_size: { min: "Your root partition must be at least 3072MB" }, - size: { - min: "Your disk image must be at least 4020MB" - } + image_size: { + min: "Your disk image must be at least 4020MB", + max: "Your disk image cannot be larger than "+MAX_DISK_SIZE+"MB" + }, } } }); 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-0004UF-UZ for garchives@archives.gentoo.org; Fri, 12 Aug 2011 23:20:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C403421C3BE; Fri, 12 Aug 2011 23:17:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9386821C2D8 for ; Fri, 12 Aug 2011 23:17:57 +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 9EAEF1B4063 for ; Fri, 12 Aug 2011 23:17:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A08E98004A for ; Fri, 12 Aug 2011 23:17:55 +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: <6966eb6938356224c61760ec44a15c2e690311e3.hexxeh@gentoo> Subject: [gentoo-commits] proj/gentoaster:master commit in: web/, web/js/ X-VCS-Repository: proj/gentoaster X-VCS-Files: web/index.php web/js/gentoaster.js X-VCS-Directories: web/ web/js/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: 6966eb6938356224c61760ec44a15c2e690311e3 Date: Fri, 12 Aug 2011 23:17:55 +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: 705ab536773697d53ad962ff49ee5ace Message-ID: <20110812231755.JRokRhU6EKFRGMErFlSdUMv39k4qPoj7BAUTHXsWsb0@z> commit: 6966eb6938356224c61760ec44a15c2e690311e3 Author: Liam McLoughlin hexxeh net> AuthorDate: Sun Jul 24 02:34:02 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Sun Jul 24 02:43:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3D6966eb69 Added disk size cap --- web/index.php | 10 +++++++++- web/js/gentoaster.js | 14 ++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/web/index.php b/web/index.php index 43be192..6b6abec 100644 --- a/web/index.php +++ b/web/index.php @@ -37,6 +37,11 @@
@@ -108,7 +113,7 @@

Partitioning

=20
-
+
=20



@@ -148,6 +153,9 @@
+ diff --git a/web/js/gentoaster.js b/web/js/gentoaster.js index 99cd514..2ff875b 100644 --- a/web/js/gentoaster.js +++ b/web/js/gentoaster.js @@ -25,9 +25,10 @@ $(function(){ root_size: { min: 3072 }, - size: { - min: 4020 - } + image_size: { + min: 4020, + max: MAX_DISK_SIZE + }, }, messages: { username: { @@ -49,9 +50,10 @@ $(function(){ root_size: { min: "Your root partition must be at least 3072MB" }, - size: { - min: "Your disk image must be at least 4020MB" - } + image_size: { + min: "Your disk image must be at least 4020MB", + max: "Your disk image cannot be larger than "+MAX_DISK_SIZE+"MB" + }, } } });