Permalink
Browse files

implement header

  • Loading branch information...
1 parent 3e3725a commit cd5450da31523c07bad4f128a463e46a57acd6ab @brianyang brianyang committed Mar 17, 2012
Showing with 45 additions and 164 deletions.
  1. +14 −39 index.php
  2. +13 −11 ui/index.html
  3. +1 −0 ui/js/custom.js
  4. +1 −33 ui/music.html
  5. +15 −45 ui/video.html
  6. +1 −36 ui/works.html
View
@@ -26,6 +26,15 @@
F3::set('CACHE',FALSE);
+F3::route('GET /min',
+ function() {
+ Web::minify($_GET['base'],explode(',',$_GET['files']));
+ },
+ 3600
+);
+
+
+
$main->route('GET /',
function() {
F3::set('modules',
@@ -63,24 +72,27 @@ function() {
'xcache'=>
'Cache engine'
)
- );
+ );
echo Template::serve('index.html');
}
);
$main->route('GET /works.html',
function(){
- echo Template::serve('works.html');
+ echo Template::serve('header.html');
+ echo Template::serve('works.html');
}
);
$main->route('GET /video.html',
function() {
+ echo Template::serve('header.html');
echo Template::serve('video.html');
}
);
$main->route('GET /music.html',
function() {
+ echo Template::serve('header.html');
echo Template::serve('music.html');
}
);
@@ -116,26 +128,6 @@ function getListings(){
}
-$main->route('GET /v1/vimeo/@query',
- function() {
- // $query = F3::get('PARAMS["query"]');
- // $oauth_consumer_key="c1f5add1d34817a6775d10b3f6821268";
- // $oauth_nonce="317ef018bd77dd9ef3194554ee966d32";
- // $oauth_signature_method="HMAC-SHA1";
- // $oauth_timestamp="1331434347";
- // $oauth_version="1.0";
- // echo Web::http('GET http://vimeo.com/api/rest/v2?format=json&method=vimeo.channels.getAll',
- // http_build_query(
- // array('oauth_consumer_key'=>$oauth_consumer_key,'oauth_nonce'=>$oauth_nonce,'oauth_signature_method'=>$oauth_signature_method,'oauth_timestamp'=>$oauth_timestamp,'oauth_version'=>$oauth_version)
- // ),
- // array(
- // 'Accept: text/html,application/xhtml+xml,application/json',
- // 'Accept-Language: en-us'
- // )
- // );
- }
-);
-
$main->route('GET /v1/vimeo/channels',
function() {
@@ -151,23 +143,6 @@ function() {
-// $main->route('GET /v1/vimeo/channels',
-// function() {
-// // echo Web::http('GET http://vimeo.com/api/rest/v2?format=json&method=vimeo.channels.getAll');
-// echo Web::http(
-// 'POST http://vimeo.com/api/rest/v2?format=json&method=vimeo.channels.getAll',
-// http_build_query(
-// array('oauth_consumer_key'=>'8edc9c8ca0cd57ff7ba93afa22422ca0','oauth_nonce'=>'value2','oauth_signature_method'=>'value2','oauth_timestamp'=>'value2','oauth_version'=>'value2')
-// ),
-// array(
-// 'Accept: text/html,application/xhtml+xml,application/xml',
-// 'Accept-Language: en-us'
-// )
-// );
-// }
-// );
-
-
$main->route('GET /photos/popular',
function()
View
@@ -26,13 +26,10 @@
<meta name="author" content="Brian Yang">
<!--[if !lte IE 6]><!-->
- <link rel="stylesheet" href="/ui/css/style.css" media="screen" />
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,600,300,800,700,400italic|PT+Serif:400,400italic" />
+<link rel="stylesheet" type="text/css" href="/min?base=ui/css/&files=mediaelementplayer.min.css,fancybox.min.css,style.css" />
- <link rel="stylesheet" href="/ui/css/fancybox.min.css" media="screen" />
-
- <link rel="stylesheet" href="/ui/css/mediaelementplayer.min.css" media="screen" />
<!--<![endif]-->
<!--[if lte IE 6]>
@@ -44,8 +41,11 @@
<![endif]-->
<script data-main="scripts/main" type="text/javascript" src="scripts/require-jquery.js"></script>
</head>
-<body>
-<section id="content" class="container clearfix">
+<body class=index>
+
+ <F3:include href="header.html"/>
+
+ <section id="content" class="container clearfix">
<h2 class="slogan align-center">I am an Application Engineer and Architect</h2>
@@ -67,7 +67,7 @@ <h2 class="slogan align-center">I am an Application Engineer and Architect</h2>
<p><a class="button" href="#">Read More</a></p>
</div>
- </article><!-- end .slide (Responsive Layout) -->
+ </article>
<article class="slide">
@@ -221,8 +221,6 @@ <h5 class="title">Futurisk</h5>
<ul class="contact-info">
<li class="address">East 45th Street. New York, NY, 10017. USA</li>
- <!-- <li class="phone">(123) 456-7890</li> -->
- <!-- <li class="email"><a href="mailto:contact@companyname.com">contact@companyname.com</a></li> -->
</ul><!-- end .contact-info -->
</div><!-- end .three-fourth -->
@@ -264,10 +262,14 @@ <h5 class="title">Futurisk</h5>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/ui/js//jquery-1.7.1.min.js"><\/script>')</script>
<!--[if lt IE 9]> <script src="/ui/js//selectivizr-and-extra-selectors.min.js"></script> <![endif]-->
- <script src="/ui/js/respond.min.js"></script>
+<!--
+ <script type="text/javascript" src="/min?base=ui/js/&files=respond.min.js,jquery.easing-1.3.min.js,jquery.fancybox-1.3.4.pack.js,jquery.smartStartSlider.min.js" ></script>
+ -->
+ <script src="/ui/js/respond.min.js"></script>
<script src="/ui/js/jquery.easing-1.3.min.js"></script>
<script src="/ui/js/jquery.fancybox-1.3.4.pack.js"></script>
- <script src="/ui/js/jquery.smartStartSlider.min.js"></script>
+ <script src="/ui/js/jquery.smartStartSlider.min.js"></script>
+
<script src="/ui/js/jquery.jcarousel.min.js"></script>
<script src="/ui/js/jquery.cycle.all.min.js"></script>
<script src="/ui/js/jquery.isotope.min.js"></script>
View
@@ -333,6 +333,7 @@ console.log(data)
console.log($(this).attr('data-videoid'))
var videoId = $(this).attr('data-videoid').split('?v=')[1].split('&feature')[0]
$('iframe').attr('src','http://www.youtube.com/embed/'+videoId)
+ $('body').scrollTop('200')
})
},
scrapeMenu:function(){
View
@@ -43,39 +43,7 @@
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
-<body>
-
-<header id="header" class="container clearfix">
-
- <a href="index-2.html" id="logo">
- <h1>Brian Yang</h1>
- </a>
-
- <nav id="main-nav">
-
- <ul>
- <li>
- <a href="/" data-description="All starts here">Home</a>
- </li>
- <li>
- <a href="video.html" data-description="Vimeo channels">Video</a>
- <ul>
- <li><a href="about-us.html">dynamic channel 1</a></li>
- <li><a href="our-team.html">dynamic channel 2</a>
- </ul>
- </li>
- <li class=current>
- <a href="music.html" data-description="music project">Music</a>
- </li>
-
- <li>
- <a href="works.html" data-description"Recent works">Works</a>
- </li>
- </ul>
-
- </nav><!-- end #main-nav -->
-
-</header><!-- end #header -->
+<body class=music-pg>
<section id="content" class="container clearfix">
View
@@ -43,34 +43,7 @@
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
-<body>
-
-<header id="header" class="container clearfix">
-
- <a href="index-2.html" id="logo">
- <h1>Brian Yang</h1>
- </a>
-
- <nav id="main-nav">
-
- <ul>
- <li>
- <a href="/" data-description="All starts here">Home</a>
- </li>
- <li class="current">
- <a href="video.html" data-description="Vimeo channels">Video</a>
- </li>
- <li>
- <a href="music.html" data-description="music project">Music</a>
- </li>
-
-
- <li>
- <a href="works.html" data-description"Recent works">Works</a>
- </li>
- </nav><!-- end #main-nav -->
-
-</header><!-- end #header -->
+<body class=video-pg>
<section id="content" class="container clearfix">
@@ -97,33 +70,30 @@ <h6 class="section-title">Recent Youtube videos</h6>
-</section><!-- end #content -->
+ </section>
-<footer id="footer" class="clearfix">
+<footer id="footer" class="clearfix">
<div class="container">
<div class="three-fourth">
<nav id="footer-nav" class="clearfix">
-
- <ul>
- <li><a href="index-2.html">Home</a></li>
- <li><a href="elements.html">Features</a></li>
- <li><a href="blog.html">Blog</a></li>
- <li><a href="portfolio-4-columns.html">Portfolio</a></li>
- <li><a href="contact-us.html">Contact</a></li>
+ <ul>
+ <li><a href="/">Home</a></li>
+ <li><a href="video.html">Video</a></li>
+ <li><a href="music.html">Audio</a></li>
+ <li><a href="works.html">Works</a></li>
</ul>
- </nav><!-- end #footer-nav -->
+
+ </nav>
<ul class="contact-info">
<li class="address">East 45th Street. New York, NY, 10017. USA</li>
- <!-- <li class="phone">(123) 456-7890</li> -->
- <!-- <li class="email"><a href="mailto:contact@companyname.com">contact@companyname.com</a></li> -->
- </ul><!-- end .contact-info -->
+ </ul>
- </div><!-- end .three-fourth -->
+ </div>
<div class="one-fourth last">
@@ -142,7 +112,7 @@ <h6 class="section-title">Recent Youtube videos</h6>
</div><!-- end .container -->
-</footer><!-- end #footer -->
+ </footer>
<footer id="footer-bottom" class="clearfix">
@@ -154,9 +124,9 @@ <h6 class="section-title">Recent Youtube videos</h6>
<li><a href="#">Terms</a></li>
</ul>
- </div><!-- end .container -->
+ </div>
-</footer><!-- end #footer-bottom -->
+ </footer>
<!--[if !lte IE 6]><!-->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
View
@@ -44,42 +44,7 @@
<![endif]-->
<script data-main="scripts/main" type="text/javascript" src="scripts/require-jquery.js"></script>
</head>
-<body>
-
-<header id="header" class="container clearfix">
-
- <a href="index-2.html" id="logo">
- <h1>Brian Yang</h1>
- </a>
-
- <nav id="main-nav">
-
- <ul>
- <li>
- <a href="/" data-description="Popular photos">Home</a>
- </li>
- <li>
- <a href="video.html" data-description="Popular channels">Video</a>
-<!--
- <ul>
- <li><a href="about-us.html">dynamic channel 1</a></li>
- <li><a href="our-team.html">dynamic channel 2</a>
- </ul>
- -->
-
- </li>
- <li>
- <a href="music.html" data-description="Popular music">Music</a>
- </li>
- <li >
- <li class="current">
- <a href="works.html" data-description="Recent works">Works</a>
- </li> </ul>
-
- </nav><!-- end #main-nav -->
-
-</header><!-- end #header -->
-
+<body class=works-pg>
<section id="content" class="container clearfix">
<h2 class="slogan align-center">Here are some interesting photos from 500px</h2>

0 comments on commit cd5450d

Please sign in to comment.