Dynamic content test BS tried
This commit is contained in:
Aarni
@@ -0,0 +1,43 @@
|
||||
$(function() {
|
||||
|
||||
// if(Modernizr.history){
|
||||
|
||||
var $mainContent = $("#main-content"),
|
||||
$pageWrap = $("#page-content-wrapper"),
|
||||
baseHeight = 0,
|
||||
$el;
|
||||
|
||||
$pageWrap.height($pageWrap.height());
|
||||
baseHeight = $pageWrap.height() - $mainContent.height();
|
||||
|
||||
$("nav").delegate("a", "click", function() {
|
||||
_link = $(this).attr("href");
|
||||
//history.pushState(null, null, _link);
|
||||
loadContent(_link);
|
||||
return false;
|
||||
});
|
||||
|
||||
function loadContent(href){
|
||||
$mainContent
|
||||
.find("#main-content")
|
||||
.fadeOut(200, function() {
|
||||
$mainContent.hide().load(href + " #main-content", function() {
|
||||
$mainContent.fadeIn(200, function() {
|
||||
$pageWrap.animate({
|
||||
height: baseHeight + $mainContent.height() + "px"
|
||||
});
|
||||
});
|
||||
console.log(href);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
$(window).bind('popstate', function(){
|
||||
_link = location.pathname.replace(/^.*[\\\/]/, ''); //get filename only
|
||||
loadContent(_link);
|
||||
});
|
||||
|
||||
//} // otherwise, history is not supported, so nothing fancy here.
|
||||
|
||||
|
||||
});
|
||||
File diff suppressed because one or more lines are too long
@@ -29,10 +29,14 @@
|
||||
<script src = "https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<!--ReactJS-->
|
||||
<!--AngularJS-->
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
|
||||
|
||||
<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'></script>
|
||||
<!--<script type='text/javascript' src='js/modernizr.js'></script>-->
|
||||
<script type='text/javascript' src='../static/js/dynamicpage.js'></script>
|
||||
|
||||
{%load staticfiles %}
|
||||
|
||||
</head>
|
||||
@@ -42,49 +46,30 @@
|
||||
|
||||
<!-- Sidebar -->
|
||||
<div id="sidebar-wrapper">
|
||||
<ul class="sidebar-nav">
|
||||
<li class="sidebar-brand">
|
||||
<a href="#">
|
||||
Member list
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../static/html/lisaa_jasen.html">Add member</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Shortcuts</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Overview</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Events</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">About</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Services</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Contact</a>
|
||||
</li>
|
||||
</ul>
|
||||
<nav>
|
||||
<ul class="sidebar-nav">
|
||||
<li class="sidebar-brand"><a href="">Home</a></li>
|
||||
<li><a href="add.html">Lisää</a></li>
|
||||
<li><a href="remove.html">Poista</a></li>
|
||||
<li><a href="list.html">Listaa</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<!-- /#sidebar-wrapper -->
|
||||
|
||||
<!-- Page Content -->
|
||||
<div id="page-content-wrapper">
|
||||
<div id="react-test"></div>
|
||||
<div id = "griddata"></div>
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h1>Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri</h1>
|
||||
<p>Alla lista jäsenistä</p>
|
||||
<p>Make sure to keep all page content within the <code>#page-content-wrapper</code>.</p>
|
||||
<a href="#menu-toggle" class="btn btn-default" id="menu-toggle">Toggle Menu</a>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h1>Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri</h1>
|
||||
<section id="main-content">
|
||||
<h2>Home</h2>
|
||||
<div class="container-fluid">
|
||||
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
|
||||
|
||||
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -93,19 +78,5 @@
|
||||
|
||||
</div>
|
||||
<!-- /#wrapper -->
|
||||
|
||||
<!-- Menu Toggle Script -->
|
||||
<script>
|
||||
$("#menu-toggle").click(function(e) {
|
||||
e.preventDefault();
|
||||
$("#wrapper").toggleClass("toggled");
|
||||
});
|
||||
</script>
|
||||
|
||||
<!--
|
||||
This is where you link to your Angular code. Only .js extension!
|
||||
-->
|
||||
<script src="../static/js/getmembers.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user