From: "Liam McLoughlin" <hexxeh@hexxeh.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoaster:master commit in: web/, web/js/
Date: Fri, 12 Aug 2011 23:17:55 +0000 (UTC) [thread overview]
Message-ID: <6966eb6938356224c61760ec44a15c2e690311e3.hexxeh@gentoo> (raw)
Message-ID: <20110812231755.JRokRhU6EKFRGMErFlSdUMv39k4qPoj7BAUTHXsWsb0@z> (raw)
commit: 6966eb6938356224c61760ec44a15c2e690311e3
Author: Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Sun Jul 24 02:34:02 2011 +0000
Commit: Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Sun Jul 24 02:43:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=6966eb69
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 @@
<script type="text/javascript" src="/js/bbq.js"></script>
<script type="text/javascript" src="/js/jquery-ui-1.8.14.custom.min.js"></script>
<script type="text/javascript" src=" /js/jquery.form.wizard.js"></script>
+ <script type="text/javascript">
+ var RecaptchaOptions = {
+ theme : 'clean'
+ };
+ </script>
</head>
<body>
<div id="container">
@@ -108,7 +113,7 @@
<h1>Partitioning</h1>
<label for="partitioning_size">Disk size</label><br />
- <input id="partitioning_size" class="required" type="text" name="size" value="4096"><br>
+ <input id="partitioning_size" class="required" type="text" name="image_size" value="4096"><br>
<label for="">Split</label><br /><br />
<div id="partitioning_split" name="split"></div><br /><br />
@@ -148,6 +153,9 @@
</div>
</form>
</div>
+ <script type="text/javascript">
+ MAX_DISK_SIZE = <?php echo MAX_DISK_SIZE; ?>;
+ </script>
<script type="text/javascript" src=" /js/gentoaster.js"></script>
</body>
</html>
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"
+ },
}
}
});
next reply other threads:[~2011-08-12 23:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-24 2:43 Liam McLoughlin [this message]
2011-08-12 23:17 ` [gentoo-commits] proj/gentoaster:master commit in: web/, web/js/ Liam McLoughlin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6966eb6938356224c61760ec44a15c2e690311e3.hexxeh@gentoo \
--to=hexxeh@hexxeh.net \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox