Commit 370f36ab authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fixed inputmodeswitcher.html.

parent 789432f1
...@@ -46,26 +46,16 @@ ...@@ -46,26 +46,16 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="input-group"> <div class="input-group">
<<<<<<< Temporary merge branch 1
<input id="input1" name="name" class="form-control" type="text" placeholder="Name" readonly>
<div class="input-group-btn">
<button class="btn btn-success"
=======
<input id="input1" name="name" class="form-control" type="text" placeholder="Grade"> <input id="input1" name="name" class="form-control" type="text" placeholder="Grade">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-default" <button class="btn btn-default"
>>>>>>> Temporary merge branch 2
onclick="$('#input1').prop('readonly',!$('#input1').prop('readonly'))"> onclick="$('#input1').prop('readonly',!$('#input1').prop('readonly'))">
<span class="glyphicon glyphicon-lock" aria-hidden="true"></span> <span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<<<<<<< Temporary merge branch 1
<div class="col-md-3 qfq-note">
=======
<div class="col-md-3"> <div class="col-md-3">
>>>>>>> Temporary merge branch 2
<p>Note</p> <p>Note</p>
</div> </div>
</div> </div>
...@@ -77,22 +67,16 @@ ...@@ -77,22 +67,16 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="input-group"> <div class="input-group">
<input id="passwordinput" type="password" name="password" class="form-control" type="text" <input id="passwordinput" type="password" name="password" class="form-control" type="text"
<<<<<<< Temporary merge branch 1
placeholder="Password">
<div class="input-group-btn">
<button class="btn btn-info"
=======
placeholder="Grade"> placeholder="Grade">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-default" <button class="btn btn-default"
>>>>>>> Temporary merge branch 2
onclick="$('#passwordinput').attr('type',$('#passwordinput').attr('type')==='password' ? 'text': 'password')"> onclick="$('#passwordinput').attr('type',$('#passwordinput').attr('type')==='password' ? 'text': 'password')">
<span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span> <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<<<<<<< Temporary merge branch 1
<div class="col-md-3 qfq-note"> <div class="col-md-3 qfq-note">
<p>Note</p> <p>Note</p>
</div> </div>
...@@ -110,14 +94,10 @@ ...@@ -110,14 +94,10 @@
</div> </div>
</div> </div>
<div class="col-md-3 qfq-note"> <div class="col-md-3 qfq-note">
=======
<div class="col-md-3">
>>>>>>> Temporary merge branch 2
<p>Note</p> <p>Note</p>
</div> </div>
</div> </div>
<<<<<<< Temporary merge branch 1
<div class="form-group clearfix"> <div class="form-group clearfix">
<div class="col-md-3"> <div class="col-md-3">
<label>Name</label> <label>Name</label>
...@@ -140,10 +120,6 @@ ...@@ -140,10 +120,6 @@
</div> </div>
</div> </div>
=======
>>>>>>> Temporary merge branch 2
</form> </form>
</div> </div>
...@@ -154,14 +130,11 @@ ...@@ -154,14 +130,11 @@
<script src="../js/EventEmitter.min.js"></script> <script src="../js/EventEmitter.min.js"></script>
<script src="../js/qfq.debug.js"></script> <script src="../js/qfq.debug.js"></script>
<script type="text/javascript"> <script type="text/javascript">
<<<<<<< Temporary merge branch 1
=======
// Do not remove, or selenium tests will fail. // Do not remove, or selenium tests will fail.
QfqNS.QfqPage.prototype.beforeUnloadHandler = function (evt) { QfqNS.QfqPage.prototype.beforeUnloadHandler = function (evt) {
}; };
>>>>>>> Temporary merge branch 2
$(function () { $(function () {
var qfqPage = new QfqNS.QfqPage({ var qfqPage = new QfqNS.QfqPage({
tabsId: 'myTabs', tabsId: 'myTabs',
......
Supports Markdown
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