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

# Conflicts:
#	mockup/inputmodeswitcher.html

Makefile

@@ -28,7 +28,7 @@ nightly: bootstrap
 
 snapshot: bootstrap
 	echo $(GIT_REVISION_LONG) > extension/revision.git
-	cd extension ; zip -r ../qfq-$(GIT_REVISION_SHORT)  $(EXTENSION_CONTENT) -x config.ini
+	cd extension ; zip -r ../qfq-$(NIGHTLY_DATE)-$(GIT_REVISION_SHORT)  $(EXTENSION_CONTENT) -x config.ini
 
 
 t3sphinx:

mockup/inputmodeswitcher.html

@@ -46,27 +46,26 @@
             </div>
             <div class="col-md-6">
                 <div class="input-group">
-<<<<<<< HEAD
+<<<<<<< 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">
                     <div class="input-group-btn">
                         <button class="btn btn-default"
->>>>>>> origin/raos_work
+>>>>>>> Temporary merge branch 2
                                 onclick="$('#input1').prop('readonly',!$('#input1').prop('readonly'))">
                             <span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
                         </button>
                     </div>
                 </div>
             </div>
-<<<<<<< HEAD
+<<<<<<< Temporary merge branch 1
             <div class="col-md-3 qfq-note">
 =======
             <div class="col-md-3">
->>>>>>> origin/raos_work
+>>>>>>> Temporary merge branch 2
                 <p>Note</p>
             </div>
         </div>
@@ -78,23 +77,22 @@
             <div class="col-md-6">
                 <div class="input-group">
                     <input id="passwordinput" type="password" name="password" class="form-control" type="text"
-<<<<<<< HEAD
+<<<<<<< Temporary merge branch 1
                            placeholder="Password">
-
                     <div class="input-group-btn">
                         <button class="btn btn-info"
 =======
                            placeholder="Grade">
                     <div class="input-group-btn">
                         <button class="btn btn-default"
->>>>>>> origin/raos_work
+>>>>>>> Temporary merge branch 2
                                 onclick="$('#passwordinput').attr('type',$('#passwordinput').attr('type')==='password' ? 'text': 'password')">
                             <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
                         </button>
                     </div>
                 </div>
             </div>
-<<<<<<< HEAD
+<<<<<<< Temporary merge branch 1
             <div class="col-md-3 qfq-note">
                 <p>Note</p>
             </div>
@@ -105,22 +103,21 @@
                 <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>
-
+                <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>
+                    <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">
+=======
+            <div class="col-md-3">
+>>>>>>> Temporary merge branch 2
                 <p>Note</p>
             </div>
         </div>
 
+<<<<<<< Temporary merge branch 1
         <div class="form-group clearfix">
             <div class="col-md-3">
                 <label>Name</label>
@@ -128,7 +125,6 @@
             <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>
@@ -136,23 +132,18 @@
                     </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>
+                    <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">
-=======
-            <div class="col-md-3">
->>>>>>> origin/raos_work
                 <p>Note</p>
             </div>
         </div>
 
-<<<<<<< HEAD
+
 
 =======
->>>>>>> origin/raos_work
+>>>>>>> Temporary merge branch 2
     </form>
 </div>
 
@@ -163,14 +154,14 @@
 <script src="../js/EventEmitter.min.js"></script>
 <script src="../js/qfq.debug.js"></script>
 <script type="text/javascript">
-<<<<<<< HEAD
+<<<<<<< Temporary merge branch 1
 =======
 
     // Do not remove, or selenium tests will fail.
     QfqNS.QfqPage.prototype.beforeUnloadHandler = function (evt) {
     };
 
->>>>>>> origin/raos_work
+>>>>>>> Temporary merge branch 2
     $(function () {
         var qfqPage = new QfqNS.QfqPage({
             tabsId: 'myTabs',