Commit 16415561 by Kyle Fiedler

Moved around some of the js and autofocused the first part of the forms for enrollment and login

parent 24f4ea7f
<%inherit file="main.html" /> <%inherit file="main.html" />
<%block name="headextra"> <%block name="js_extra">
<!-- TODO: http://docs.jquery.com/Plugins/Validation --> <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
</script> </script>
<script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script> <script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<%block name="headextra"/> <%block name="headextra"/>
</head> </head>
...@@ -117,6 +112,12 @@ $(function() { ...@@ -117,6 +112,12 @@ $(function() {
}); });
</script> </script>
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<%block name="js_extra"/> <%block name="js_extra"/>
</body> </body>
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<script src="/static/js/html5shiv.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<%block name="headextra"/> <%block name="headextra"/>
...@@ -156,7 +151,20 @@ $(document).ready(function(){ ...@@ -156,7 +151,20 @@ $(document).ready(function(){
}); });
}); });
$(function(){
$("a[rel*=leanModal]").leanModal();
$("a.login").click(function(){
$("#login_form #li_email").focus();
});
$("a.enroll").click(function(){
$("#enroll_form #ca_email").focus();
});
});
</script> </script>
<%block name="js_extra"/>
</body> </body>
</html> </html>
...@@ -51,6 +51,8 @@ ...@@ -51,6 +51,8 @@
<iframe id="player" type="text/html" width="560" height="390" src="http://www.youtube.com/embed/p2Q6BrNhdh8?enablejsapi=1" frameborder="0"> <iframe id="player" type="text/html" width="560" height="390" src="http://www.youtube.com/embed/p2Q6BrNhdh8?enablejsapi=1" frameborder="0">
</iframe> </iframe>
</div> </div>
<%block name="js_extra">
<script> <script>
var player; var player;
...@@ -113,3 +115,4 @@ $(function() { ...@@ -113,3 +115,4 @@ $(function() {
}); });
</script> </script>
</%block>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
@import "jquery-ui-1.8.16.custom"; @import "jquery-ui-1.8.16.custom";
// pages // pages
@import "courseware/courseware", "courseware/sidebar", "courseware/video", "courseware/sequence-nav"; @import "courseware/courseware", "courseware/sidebar", "courseware/video", "courseware/sequence-nav", "courseware/amplifier";
@import "textbook"; @import "textbook";
@import "info"; @import "info";
@import "profile"; @import "profile";
......
...@@ -53,6 +53,7 @@ div.leanModal_box { ...@@ -53,6 +53,7 @@ div.leanModal_box {
ol { ol {
@extend .clearfix; @extend .clearfix;
padding-top: lh();
li { li {
......
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
</%block> </%block>
<%block name="bodyextra"> <%block name="bodyextra">
<%include file="navigation.html" args="active_page='wiki'" /> <%include file="navigation.html" args="active_page='wiki'" />
<section class="main-content"> <section class="main-content">
......
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