]> iEval git - plack-app-gruntmaster.git/commitdiff
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Sun, 8 Feb 2015 10:56:33 +0000 (12:56 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Sun, 8 Feb 2015 10:56:33 +0000 (12:56 +0200)
Conflicts:
tmpl/skel.en

12 files changed:
css/custom.css
js/20-sprintf.js [new file with mode: 0644]
js/90-reqjs.js [new file with mode: 0644]
js/90-themes.js
js/90-timers.js [new file with mode: 0644]
js/90-tracker.js
js/95-login.js
lib/Plack/App/Gruntmaster/HTML.pm
tmpl/ct_entry.en
tmpl/pb_entry.en
tmpl/skel.en
tmpl/us_entry.en

index 4239ab8421843a38ed6e3f5a12abda283c3c4497..f9ccad3dc93d90b49bc40d248c98972e987ac3f5 100644 (file)
@@ -86,4 +86,13 @@ ul.inline li:last-child:after {
 
 .tracker-mark.x{
        color: red;
+}
+
+#ctcountdown {
+       text-align: center;
+       font-size: 200%;
+}
+
+.reqjs {
+       display: none !important;
 }
\ No newline at end of file
diff --git a/js/20-sprintf.js b/js/20-sprintf.js
new file mode 100644 (file)
index 0000000..0ccb64c
--- /dev/null
@@ -0,0 +1,195 @@
+(function(window) {
+    var re = {
+        not_string: /[^s]/,
+        number: /[dief]/,
+        text: /^[^\x25]+/,
+        modulo: /^\x25{2}/,
+        placeholder: /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fiosuxX])/,
+        key: /^([a-z_][a-z_\d]*)/i,
+        key_access: /^\.([a-z_][a-z_\d]*)/i,
+        index_access: /^\[(\d+)\]/,
+        sign: /^[\+\-]/
+    }
+
+    function sprintf() {
+        var key = arguments[0], cache = sprintf.cache
+        if (!(cache[key] && cache.hasOwnProperty(key))) {
+            cache[key] = sprintf.parse(key)
+        }
+        return sprintf.format.call(null, cache[key], arguments)
+    }
+
+    sprintf.format = function(parse_tree, argv) {
+        var cursor = 1, tree_length = parse_tree.length, node_type = "", arg, output = [], i, k, match, pad, pad_character, pad_length, is_positive = true, sign = ""
+        for (i = 0; i < tree_length; i++) {
+            node_type = get_type(parse_tree[i])
+            if (node_type === "string") {
+                output[output.length] = parse_tree[i]
+            }
+            else if (node_type === "array") {
+                match = parse_tree[i] // convenience purposes only
+                if (match[2]) { // keyword argument
+                    arg = argv[cursor]
+                    for (k = 0; k < match[2].length; k++) {
+                        if (!arg.hasOwnProperty(match[2][k])) {
+                            throw new Error(sprintf("[sprintf] property '%s' does not exist", match[2][k]))
+                        }
+                        arg = arg[match[2][k]]
+                    }
+                }
+                else if (match[1]) { // positional argument (explicit)
+                    arg = argv[match[1]]
+                }
+                else { // positional argument (implicit)
+                    arg = argv[cursor++]
+                }
+
+                if (get_type(arg) == "function") {
+                    arg = arg()
+                }
+
+                if (re.not_string.test(match[8]) && (get_type(arg) != "number" && isNaN(arg))) {
+                    throw new TypeError(sprintf("[sprintf] expecting number but found %s", get_type(arg)))
+                }
+
+                if (re.number.test(match[8])) {
+                    is_positive = arg >= 0
+                }
+
+                switch (match[8]) {
+                    case "b":
+                        arg = arg.toString(2)
+                    break
+                    case "c":
+                        arg = String.fromCharCode(arg)
+                    break
+                    case "d":
+                    case "i":
+                        arg = parseInt(arg, 10)
+                    break
+                    case "e":
+                        arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential()
+                    break
+                    case "f":
+                        arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg)
+                    break
+                    case "o":
+                        arg = arg.toString(8)
+                    break
+                    case "s":
+                        arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg)
+                    break
+                    case "u":
+                        arg = arg >>> 0
+                    break
+                    case "x":
+                        arg = arg.toString(16)
+                    break
+                    case "X":
+                        arg = arg.toString(16).toUpperCase()
+                    break
+                }
+                if (re.number.test(match[8]) && (!is_positive || match[3])) {
+                    sign = is_positive ? "+" : "-"
+                    arg = arg.toString().replace(re.sign, "")
+                }
+                else {
+                    sign = ""
+                }
+                pad_character = match[4] ? match[4] === "0" ? "0" : match[4].charAt(1) : " "
+                pad_length = match[6] - (sign + arg).length
+                pad = match[6] ? (pad_length > 0 ? str_repeat(pad_character, pad_length) : "") : ""
+                output[output.length] = match[5] ? sign + arg + pad : (pad_character === "0" ? sign + pad + arg : pad + sign + arg)
+            }
+        }
+        return output.join("")
+    }
+
+    sprintf.cache = {}
+
+    sprintf.parse = function(fmt) {
+        var _fmt = fmt, match = [], parse_tree = [], arg_names = 0
+        while (_fmt) {
+            if ((match = re.text.exec(_fmt)) !== null) {
+                parse_tree[parse_tree.length] = match[0]
+            }
+            else if ((match = re.modulo.exec(_fmt)) !== null) {
+                parse_tree[parse_tree.length] = "%"
+            }
+            else if ((match = re.placeholder.exec(_fmt)) !== null) {
+                if (match[2]) {
+                    arg_names |= 1
+                    var field_list = [], replacement_field = match[2], field_match = []
+                    if ((field_match = re.key.exec(replacement_field)) !== null) {
+                        field_list[field_list.length] = field_match[1]
+                        while ((replacement_field = replacement_field.substring(field_match[0].length)) !== "") {
+                            if ((field_match = re.key_access.exec(replacement_field)) !== null) {
+                                field_list[field_list.length] = field_match[1]
+                            }
+                            else if ((field_match = re.index_access.exec(replacement_field)) !== null) {
+                                field_list[field_list.length] = field_match[1]
+                            }
+                            else {
+                                throw new SyntaxError("[sprintf] failed to parse named argument key")
+                            }
+                        }
+                    }
+                    else {
+                        throw new SyntaxError("[sprintf] failed to parse named argument key")
+                    }
+                    match[2] = field_list
+                }
+                else {
+                    arg_names |= 2
+                }
+                if (arg_names === 3) {
+                    throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported")
+                }
+                parse_tree[parse_tree.length] = match
+            }
+            else {
+                throw new SyntaxError("[sprintf] unexpected placeholder")
+            }
+            _fmt = _fmt.substring(match[0].length)
+        }
+        return parse_tree
+    }
+
+    var vsprintf = function(fmt, argv, _argv) {
+        _argv = (argv || []).slice(0)
+        _argv.splice(0, 0, fmt)
+        return sprintf.apply(null, _argv)
+    }
+
+    /**
+     * helpers
+     */
+    function get_type(variable) {
+        return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase()
+    }
+
+    function str_repeat(input, multiplier) {
+        return Array(multiplier + 1).join(input)
+    }
+
+    /**
+     * export to either browser or node.js
+     */
+    if (typeof exports !== "undefined") {
+        exports.sprintf = sprintf
+        exports.vsprintf = vsprintf
+    }
+    else {
+        window.sprintf = sprintf
+        window.vsprintf = vsprintf
+
+        if (typeof define === "function" && define.amd) {
+            define(function() {
+                return {
+                    sprintf: sprintf,
+                    vsprintf: vsprintf
+                }
+            })
+        }
+    }
+})(typeof window === "undefined" ? this : window);
diff --git a/js/90-reqjs.js b/js/90-reqjs.js
new file mode 100644 (file)
index 0000000..df21b15
--- /dev/null
@@ -0,0 +1,7 @@
+(function(){
+       'use strict';
+
+       $( document ).ready(function() {
+               $('.reqjs').removeClass('reqjs');
+       });
+})();
index 56138d36f94d7000c8cba5e6599d6e1f8c7e80d1..9bc36047b545d8d781111259ca4e25bff45be3e2 100644 (file)
@@ -12,7 +12,6 @@
        }
 
        $( document ).ready(function() {
-               $('#theme-selector').removeClass('hidden');
                $('#theme_slate'   ).on('click', function () { set_style("slate"); });
                $('#theme_cerulean').on('click', function () { set_style("cerulean"); });
                $('#theme_cyborg'  ).on('click', function () { set_style("cyborg"); });
diff --git a/js/90-timers.js b/js/90-timers.js
new file mode 100644 (file)
index 0000000..2d6cbfb
--- /dev/null
@@ -0,0 +1,32 @@
+(function(){
+       'use strict';
+
+       function update_timer(timer){
+               var start = parseInt(timer.dataset.start);
+               var stop  = parseInt(timer.dataset.stop);
+               var value = parseInt(timer.dataset.value);
+               var now   = Math.floor(Date.now() / 1000);
+
+               var left = stop - now;
+               var total = stop - start;
+               if(left < 0)
+                       left = 0;
+
+               if(value) {
+                       value = Math.max(value * 3 / 10, value * left / total);
+                       timer.innerHTML = Math.floor(value);
+               } else {
+                       var hours = left / 60 / 60;
+                       var minutes = left / 60 % 60;
+                       var seconds = left % 60;
+                       timer.innerHTML = sprintf('%02d:%02d:%02d', hours, minutes, seconds);
+               }
+       }
+
+       $( document ).ready(function() {
+               $('.timer').each(function(index, item){
+                       update_timer(item);
+                       setInterval(function(){update_timer(item)}, 1000);
+               });
+       });
+})();
index 3ef0ac171d7ef652f963d702ee292e5af8741e81..2f8271c12ab8295ad7d300e8e5d4c90603b90117 100644 (file)
        }
 
        $( document ).ready(function(){
-               $('#tracker').detach().prependTo($('#sidebar')).removeClass('hidden');
+               $('#tracker').detach().prependTo($('#sidebar'));
                $('#tracker_button').on('click', function() { start_tracking($('#tracker_username').val()) });
                $('#tracker_stop').on('click', stop_tracking);
-               $('#track_user').removeClass('hidden');
                $('#track_user').on('click', function() { stop_tracking(); start_tracking($(this).data('user')) });
 
                if(localStorage.getItem('tracker_username'))
index adbeb1dde858de945f47b0f97d8d08fd7065f623..81e4533f0b3df969599c0724b399108153a955ca 100644 (file)
@@ -2,7 +2,7 @@
        'use strict';
 
        $( document ).ready(function(){
-               $('#login').detach().prependTo($('#sidebar')).removeClass('hidden');
+               $('#login').detach().prependTo($('#sidebar'));
 
                document.cookie = "cookietest=1";
                var cookie = document.cookie.indexOf("cookietest=") != -1;
index 090ca325e85dc3d486453b2bec0c332b999a5a98..0a681161a51f91856bedde4e9b43d49177ef0a29 100644 (file)
@@ -32,7 +32,7 @@ sub HTML::Element::iter3 {
 }
 
 sub HTML::Element::fid    { shift->look_down(id    => shift) }
-sub HTML::Element::fclass { shift->look_down(class => shift) }
+sub HTML::Element::fclass { shift->look_down(class => qr/\b$_[0]\b/) }
 
 sub HTML::Element::namedlink {
        my ($self, $id, $name) = @_;
@@ -116,10 +116,14 @@ sub process_ct_entry {
        $_->edit_href (sub {s/contest_id/$args{id}/}) for $tree->find('a');
        $tree->fid('editorial')->detach unless $args{finished};
        $tree->fid('links')->detach unless $args{started};
+       my $status = ($args{time} < $args{start} ? 'starts' : 'ends');
+       $tree->fclass('timer')->attr('data-stop', $status eq 'ends' ? $args{stop} : $args{start});
        $tree->content_handler(
                start       => ftime   $args{start},
                stop        => ftime   $args{stop},
+               status      => $status,
                description => literal $args{description});
+       $tree->fid('ctcountdown')->detach if $args{time} >= $args{stop};
 }
 
 sub process_ct {
@@ -148,25 +152,24 @@ sub process_pb_entry {
        if ($args{contest_stop}) {
                $tree->fid('solution')->detach;
                $tree->fid('solution_modal')->detach;
-               my $countdown = $tree->fid('countdown');
-               $countdown->attr('data-start' => $args{open_time});
-               $countdown->attr('data-stop' => $args{contest_stop});
-               $countdown->attr('data-time' => $args{time});
-               my $left = $args{contest_stop} - $args{time};
-               $countdown->replace_content(sprintf '%02d:%02d:%02d', $left/60/60, $left/60%60, $left%60);
-               $tree->fid('score')->attr('data-value' => $args{value});
-               $tree->fid('score')->replace_content(Gruntmaster::Data::Result::Contest::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
+               my $score = $tree->fid('score');
+               $score->attr('data-start' => $args{open_time});
+               $score->attr('data-stop'  => $args{contest_stop});
+               $score->attr('data-value'  => $args{value});
+               $tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
        } else {
                $tree->fid('solution')->detach unless $args{solution};
                $_->detach for $tree->fclass('rc'); # requires contest
                $tree->fid('solution_modal')->fclass('modal-body')->replace_content(literal $args{solution});
        }
        if ($args{cansubmit}) {
+               $tree->fid('nosubmit')->detach;
                $tree->look_down(name => 'problem')->attr(value => $args{id});
                my $contest = $tree->look_down(name => 'contest');
                $contest->attr(value => $args{contest}) if $args{contest};
                $contest->detach unless $args{contest}
        } else {
+               $tree->fid('nosubmit')->find('a')->edit_href(sub{s/id/$args{id}/});
                $tree->fid('submit')->detach
        }
 }
index ec16306ba86b115d10ca537ece00fa90afaf0089..13d2e9eb6e877c37c750992db96d3cb1c9c470b6 100644 (file)
@@ -3,6 +3,9 @@
 <dt>Contest stop time</dt>  <dd id="stop">stop</dd>
 </dl>
 
+<div id="ctcountdown" class="reqjs">
+Contest <span id="status">starts/ends</span> in: <span class="timer" data-stop="...">
+</div>
 <div id="description">description</div>
 
 <div id="links">
index f2e597e86c4dbb1366f2ccef5ff9f911fa42af29..a74fc79e1887442b592abbaf8fec4ebefbe9aa13 100644 (file)
@@ -9,15 +9,21 @@
 <dt>Owner</dt> <dd id="owner">owner</dd>
 <dt>Level</dt> <dd id="level">Easy</dd>
 <dt>Time limit (seconds)</dt> <dd smap="timeout">1</dd>
-<dt class="rc">Score</dt> <dd id="score" data-value="100" class="rc">50</dd>
-<dt class="rc">Contest ends in</dt> <dd id="countdown" data-start="..." data-time="..." data-stop="..." class="rc">01:30</dd>
+<dt class="rc reqjs">Score</dt> <dd id="score" class="timer reqjs rc" data-start="..." data-stop="..." data-value="100">50</dd>
+<dt class="rc reqjs">Contest ends in</dt> <dd id="countdown" class="timer reqjs rc" data-stop="...">01:30</dd>
 </dl>
 
 <a href="/log/?problem=problem_id" id="job_log">Job log</a><br>
 <a href="/sol/problem_id" id="solution" data-toggle="modal" data-target="#solution_modal">Solution</a>
 
-<div id="submit">
 <h1>Submit solution</h1>
+
+<div id="nosubmit">
+The contest has finished.<br>
+To submit solutions to this problem, please visit the problem <a href="/pb/id">outside&nbsp;the&nbsp;contest</a>.
+</div>
+
+<div id="submit">
 <form action="/action/submit" method="POST" enctype="multipart/form-data" role="form">
 <input type="hidden" name="problem" value="problem_id">
 <input type="hidden" name="contest" value="contest_id">
index 16ebd70a30f2880d4f2cd7e1c0c299c6c4ca9785..19377d91df6910a4473593357d580c9ff0466850 100644 (file)
@@ -17,7 +17,7 @@
 <li id="nav-us"><a href="/us/">Users</a>
 <li id="nav-account"><a href="/account">Account</a>
 <li id="nav-about"><a href="/about">About / Help</a>
-<li id="theme-selector" class="hidden"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
+<li id="theme-selector" class="reqjs"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
 <ul class="dropdown-menu" role="menu">
 <li><a href="#" id="theme_slate">Gunmetal gray</a>
 <li><a href="#" id="theme_cyborg">Black</a>
 
 <div id="content">Content goes here</div>
 
-<div id="login" class="hidden"><a href="/login">Log in</a></div>
+<div id="login" class="reqjs"><a href="/login">Log in</a></div>
 <div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
 
-<div id="tracker" class="hidden">
+<div id="tracker" class="reqjs">
 <h3>Track user</h3>
 <div id="tracker_form">
 <div class="form-group">
index 3d56654fa08ee0ea861bebacc4efddd4da199490..7b261eda59dee350e461a6a0d3a75b57712988ad 100644 (file)
@@ -5,7 +5,7 @@
 <dt>Level</dt> <dd smap="level">Level</dd>
 </dl>
 
-<a href="#" id="track_user" data-user="id" class="hidden">Track user</a><br>
+<a href="#" id="track_user" data-user="id" class="reqjs">Track user</a><br>
 <a href="/log/?owner=id" id="log">Job log</a><br>
 <a href="/pb/?owner=id" id="pb">Owned problems</a>
 
This page took 0.035897 seconds and 4 git commands to generate.