Commit e091e60c authored by Rafael Ostertag's avatar Rafael Ostertag
Browse files

Merge remote-tracking branch 'origin/master' into raos_work

# Conflicts:
#	mockup/inputmodeswitcher.html
parents 260ba45c 836df65b
......@@ -15,7 +15,7 @@
</head>
<body>
<div class="container-fluid">
<div class="container">
<div class="row">
<div class="col-md-10 ">
<div class="btn-toolbar pull-right" role="toolbar">
......@@ -46,16 +46,16 @@
</div>
<div class="col-md-6">
<div class="input-group">
<input id="input1" name="name" class="form-control" type="text" placeholder="Grade">
<input id="input1" name="name" class="form-control" type="text" placeholder="Name" readonly>
<div class="input-group-btn">
<button class="btn btn-default"
<button class="btn btn-success"
onclick="$('#input1').prop('readonly',!$('#input1').prop('readonly'))">
<span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
</button>
</div>
</div>
</div>
<div class="col-md-3">
<div class="col-md-3 qfq-note">
<p>Note</p>
</div>
</div>
......@@ -67,20 +67,60 @@
<div class="col-md-6">
<div class="input-group">
<input id="passwordinput" type="password" name="password" class="form-control" type="text"
placeholder="Grade">
placeholder="Password">
<div class="input-group-btn">
<button class="btn btn-default"
<button class="btn btn-info"
onclick="$('#passwordinput').attr('type',$('#passwordinput').attr('type')==='password' ? 'text': 'password')">
<span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
</button>
</div>
</div>
</div>
<div class="col-md-3 qfq-note">
<p>Note</p>
</div>
</div>
<div class="form-group clearfix">
<div class="col-md-3">
<label>Statement</label>
</div>
<div class="col-md-6">
<textarea class="form-control" rows="20" placeholder="Please give a brief statement of purpose, such as the topics of your main mathematical interest, your past work in mathematics, of your academic plans in graduate school and your subsequent career objectives."></textarea>
<span class="glyphicon glyphicon-info-sign text-info qfq-icon-inside" aria-hidden="true" onclick="$('#qfq-info-201').slideToggle('swing')"></span>
<div class="alert alert-info" id="qfq-info-201" style="display: none;">
<p>Please give a brief statement of purpose, such as the topics of your main mathematical interest, your past work in mathematics, of your academic plans in graduate school and your subsequent career objectives.</p>
</div>
</div>
<div class="col-md-3 qfq-note">
<p>Note</p>
</div>
</div>
<div class="form-group clearfix">
<div class="col-md-3">
<label>Name</label>
</div>
<div class="col-md-6">
<div class="input-group">
<input type=name="name" class="form-control" type="text" placeholder="Name">
<div class="input-group-btn">
<button class="btn btn-info" onclick="$('#qfq-info-202').slideToggle('swing')">
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
</button>
</div>
</div>
<div class="alert alert-info qfq-margin-top" id="qfq-info-202" style="display: none;">
<p>Please give a brief statement of purpose, such as the topics of your main mathematical interest, your past work in mathematics, of your academic plans in graduate school and your subsequent career objectives.</p>
</div>
</div>
<div class="col-md-3 qfq-note">
<p>Note</p>
</div>
</div>
</form>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment