Commit d41429f1 authored by Kento HASEGAWA's avatar Kento HASEGAWA
Browse files

Improve UI: remove mergin spaces (#8)

parent b33ac986

comm/server/main.py

+1 −5
Changes for comm/server/main.py: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ def start(): 
    else:

        # Format check

        #cmd = "/usr/bin/python /home/pi/conmgr/adc2017/server/nlcheck.py --input {} --target {}".format(probpath, outpath)

        cmd = "/usr/bin/python /home/pi/adc2017/conmgr/adc2017/server/nlcheck.py --input {} --target {}".format(probpath, outpath)

        cmd = "/usr/bin/python /home/pi/adc2018/conmgr/adc2018/server/nlcheck.py --input {} --target {}".format(probpath, outpath)

        print("`{}`".format(cmd))

        subprocess.call(cmd.strip().split(" "))
@@ -318,7 +318,6 @@ def main(args): 
if __name__ == "__main__":



    parser = argparse.ArgumentParser(description="PYNQ control panel.")

    parser.add_argument("--no-gui", action="store_false", dest="gui", default=True, help="No GUI")

    parser.add_argument("-c", "--client", action="store", type=str, default=None, required=True, help="Client list.")

    parser.add_argument("-q", "--question", action="store", type=str, default="./problems", help="Path to the question folder.")

    parser.add_argument("-o", "--out", action="store", type=str, default="./answers", help="Path to the output folder.")
@@ -328,9 +327,6 @@ if __name__ == "__main__": 
    args = vars(parser.parse_args())

    app_args = args



    if args["gui"]:

    if args["debug"]:

        app.debug = True

    app.run(host='0.0.0.0', threaded=True)
 
    else:

        main(args)

comm/server/static/css/pynq-manager.css

+8 −4
Changes for comm/server/static/css/pynq-manager.css: 8 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ html, body{ 
    overflow: hidden;

}

body{

    margin-top: 20px;

    padding-top: 10px;

}



/* scrollbar settings */

::-webkit-scrollbar{

    width: 30px;

    width: 25px;

    border: 1px solid rgba(0, 0, 50, .2);

}

::-webkit-scrollbar-thumb{
@@ -18,7 +18,7 @@ body{ 
}



#question-table-wrapper{

    height: 350px;

    height: 300px;

    overflow-y: scroll;

    overflow-x: hidden;

}
@@ -42,7 +42,7 @@ body{ 
}



#client-control-pane{

    height: 350px;

    height: 330px;

    overflow: scroll;

}
@@ -50,3 +50,7 @@ body{ 
#client-control-pane table td{

    width: 50%;

}



#question-control-pane h3{

    display: inline-block;

}

comm/server/static/js/pynq-manager.js

+0 −6
Changes for comm/server/static/js/pynq-manager.js: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -97,12 +97,6 @@ $(function(){ 
            $("#question-table-wrapper").find("#question-table").remove();

            $("#question-table-wrapper").html(d);



            $(".show-question-status-button").click(function(){

                var qname = $(this).data("qname");

                show_question_status(qname);

                return false;

            });



            $(".question-row td").click(function(){

                var $tr = $(this).parent("tr.question-row");

                $(".question-row").removeClass("q-selected");

comm/server/templates/index.html

+5 −7
Changes for comm/server/templates/index.html: 5 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -15,20 +15,18 @@ 


<div id="wrapper">

        

    <div id="contorol-panel-wrapper" class="container">

        <h3>問題一覧</h3>

        <p><a href="#" id="view-server-status-button">クライアント状況</a></p>

    <div id="contorol-panel-wrapper" class="container-fluid">



        <div class="row">

            <div class="col" id="question-control-pane">



            <div class="col-5" id="question-control-pane">

                <h3>問題一覧</h3>&nbsp;

                <span><a href="#" id="view-server-status-button">クライアント状況</a></span>

                <div id="question-table-wrapper">



                    <p>Loading...</p>

                </div>

            </div>



            <div class="col" id="client-control-pane">

            <div class="col-7" id="client-control-pane">

                <p>Loading...</p>

            </div>

        </div>

comm/server/templates/part_question_table.html

+2 −6
Changes for comm/server/templates/part_question_table.html: 2 added lines, 6 removed lines.
Original line number Diff line number Diff line 
<table class="table table-bordered table-hover" id="question-table">

    <tr>

        <th class="large-cell">ファイル名</th>

        <th class="large-cell">File Name</th>

        <th class="large-cell">Size</th>

        <th class="small-cell">Line</th>

        <th class="large-cell">ステータス</th>

        <th class="small-cell">操作</th>

        <th class="large-cell">Status</th>

    </tr>

    {% for k, v in questions.items() %}

    <tr class="question-row" data-qname="{{k}}">
@@ -12,9 +11,6 @@ 
        <td class="large-cell">{{v.board_size}}</td>

        <td class="small-cell">{{v.line_num}}</td>

        <td class="large-cell">{{v.status}}</td>

        <td class="small-cell">

            <a href="#" class="show-question-status-button" data-qname="{{k}}">選択</a>

        </td>

    </tr>

    {% endfor %}

</table>