dburr/SIFTools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More iOS prettifying

Browse source 
* using <div> instead of <textarea> for gem verbose area, and
  formatting the verbose reports using HTML
* fix some mismatched div's and (try to) reindent html (need a
  better html reindenter)
This commit is contained in:
Donald Burr 2015-10-17 22:43:51 -07:00
parent 89b972ddc7
commit c07d35921a
2 changed files with 137 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

34
web_app/js/sif_tools.js
View file

@ -346,7 +346,11 @@ function is_same_day(m1, m2)
function calculate_gems()
{
var verbose = $("#gems_verbose").is(':checked');
var current_gems = parseInt($("#current_gems").val());
var current_gems_text = $("#current_gems").val();
var current_gems = 0;
if (current_gems_text != "") {
current_gems = parseInt(current_gems_text);
}
if (isNaN(current_gems)) {
alert("Error: invalid number of current gems. Please check your input and try again.");
return;
@ -354,7 +358,15 @@ function calculate_gems()
var mode = $("input[name=gem-mode]:checked").val();
if (mode === "DATE") {
var target_date = $("#gem_desired_date").val();
if (target_date === "") {
alert("Error: invalid date. Please check and try again.");
return;
}
var target_date_object = moment(new Date(target_date));
if (!target_date_object.isValid()) {
alert("Error: invalid date. Please check and try again.");
return;
}
var now = moment(new Date());
if (target_date_object.isBefore(now) || is_same_day(now, target_date_object)) {
@ -384,15 +396,15 @@ function calculate_gems()
// record verbose output if desired
if (verbose) {
if (is_gem_day(now) && is_bday) {
verboseText += sprintf("%02d/%02d/%04d: free gem as login bonus AND it's %s's birthday! You get 6 gems, which brings you to %d gems.\n", month(now), day(now), year(now), name, gems);
verboseText += sprintf("<b>%02d/%02d/%04d</b><br />Free gem as login bonus AND it's %s's birthday! You get 6 gems, which brings you to %d gems.<br /><br />", month(now), day(now), year(now), name, gems);
}
if (is_bday && !is_gem_day(now)) {
verboseText += sprintf("%02d/%02d/%04d: it's %s's birthday! You get 5 gems, which brings you to %d gems.\n", month(now), day(now), year(now), name, gems);
verboseText += sprintf("<b>%02d/%02d/%04d</b><br />It's %s's birthday! You get 5 gems, which brings you to %d gems.<br /><br />", month(now), day(now), year(now), name, gems);
}
if (is_gem_day(now) && !is_bday) {
verboseText = verboseText + sprintf("%02d/%02d/%04d: free gem as login bonus, which brings you to %d gems.\n", month(now), day(now), year(now), gems);
verboseText = verboseText + sprintf("<b>%02d/%02d/%04d</b><br />Free gem as login bonus, which brings you to %d gems.<br /><br />", month(now), day(now), year(now), gems);
}
}
@ -402,10 +414,10 @@ function calculate_gems()
resultsString = resultsString + sprintf("<br />You will have %d love gems on %02d/%02d/%04d. Good things come to those who wait!", gems, month(target_date_object), day(target_date_object), year(target_date_object));
$("#gem-result-summary").html(resultsString);
if (verbose) {
$("#gem-result-verbose-area").val(verboseText);
$("#gem-result-verbose-area").html(verboseText);
$("#gem-result-textarea").show();
} else {
$("#gem-result-verbose-area").val(verboseText);
$("#gem-result-verbose-area").html(verboseText);
$("#gem-result-textarea").hide();
}
} else if (mode === "GEMS") {
@ -440,15 +452,15 @@ function calculate_gems()
// record verbose output if desired
if (verbose) {
if (is_gem_day(now) && is_bday) {
verboseText += sprintf("%02d/%02d/%04d: free gem as login bonus AND it's %s's birthday! You get 6 gems, which brings you to %d gems.\n", month(now), day(now), year(now), name, gems);
verboseText += sprintf("<b>%02d/%02d/%04d</b><br />Free gem as login bonus AND it's %s's birthday! You get 6 gems, which brings you to %d gems.<br /><br />", month(now), day(now), year(now), name, gems);
}
if (is_bday && !is_gem_day(now)) {
verboseText += sprintf("%02d/%02d/%04d: it's %s's birthday! You get 5 gems, which brings you to %d gems.\n", month(now), day(now), year(now), name, gems);
verboseText += sprintf("<b>%02d/%02d/%04d</b><br />It's %s's birthday! You get 5 gems, which brings you to %d gems.<br /><br />", month(now), day(now), year(now), name, gems);
}
if (is_gem_day(now) && !is_bday) {
verboseText = verboseText + sprintf("%02d/%02d/%04d: free gem as login bonus, which brings you to %d gems.\n", month(now), day(now), year(now), gems);
verboseText = verboseText + sprintf("<b>%02d/%02d/%04d</b><br />Free gem as login bonus, which brings you to %d gems.<br /><br />", month(now), day(now), year(now), gems);
}
}
}
@ -457,10 +469,10 @@ function calculate_gems()
$("#gem-result-summary").html(resultsString);
if (verbose) {
$("#gem-result-verbose-area").val(verboseText);
$("#gem-result-verbose-area").html(verboseText);
$("#gem-result-textarea").show();
} else {
$("#gem-result-verbose-area").val(verboseText);
$("#gem-result-verbose-area").html(verboseText);
$("#gem-result-textarea").hide();
}
}

16
web_app/sif_tools.html
View file

@ -17,8 +17,8 @@
<script src="js/external/twitterFetcher.js"></script>
<script src="js/sif_tools.js"></script>
</head>
<body>
<body>
<div id="header" align="center">
<h1>SIF Tools</h1>
</div>
@ -63,13 +63,13 @@
</div>
<div id="tab-love-gem">
<div id="love-gem-form" align="center">
Current Love Gems:&nbsp;&nbsp;&nbsp;<input type="text" pattern="\d*" size="5" id="current_gems" name="current_gems" placeholder="gems" value="" />
Current Love Gems (optional):&nbsp;&nbsp;&nbsp;<input type="text" pattern="\d*" size="5" id="current_gems" name="current_gems" placeholder="gems" value="" />
<br /><br />
Mode:<br />
<input type="radio" name="gem-mode" id="gem-mode" value="DATE" checked />Number of gems on date?<br />
<input type="radio" name="gem-mode" id="gem-mode" value="GEMS" />Date you will have this many gems?<br /><br />
<div id="gem-date-area">
Date:&nbsp;&nbsp;&nbsp;<input type="text" size="10" id="gem_desired_date" name="gem_desired_date" placeholder="MM/DD/YYYY" value="" />
Date:&nbsp;&nbsp;&nbsp;<input type="text" size="10" id="gem_desired_date" name="gem_desired_date" readonly="true" placeholder="MM/DD/YYYY" value="" />
</div>
<div id="gem-desired-gems-area">
Number of gems desired:&nbsp;&nbsp;&nbsp;<input type="text" pattern="\d*" size="5" id="gem_desired_gems" name="gem_desired_gems" placeholder="gems" value="" />
@ -82,13 +82,13 @@
<div id="gem-calc-result-area">
<h1>Results</h1>
<span id="gem-result-summary">-</span><br /><br />
<div id="gem-result-textarea">
<textarea id="gem-result-verbose-area" rows="10" cols="80"></textarea><br /><br />
<div id="gem-result-verbose-area">
<div id="gem-result-textarea">-</div>
</div>
</div>
<div id="button-reset-gems">Reset</div>
</div>
</div>
</div>
<div id="tab-card-level">
<div id="love-gem-form" align="center">
@ -127,8 +127,8 @@
<div id="tab-event">
<div id="event-timer-form" align="center">
<h3>Enter Event End Date/Time (in UTC):</h3><br />
<input type="text" size="10" id="event_end_date" name="event_end_date" placeholder="MM/DD/YYYY" value="" />
<input type="text" size="5" id="event_end_time" name="event_end_time" placeholder="HH:MM" value="" />
<input type="text" size="10" id="event_end_date" name="event_end_date" readonly="true" placeholder="MM/DD/YYYY" value="" />
<input type="text" size="5" id="event_end_time" name="event_end_time" readonly="true" placeholder="HH:MM" value="" />
<br /><br />
<div id="button-start-stop-timer">Start Timer</div>
<div id="timer_output_area" align="center">