windhamdavid 9 years ago
parent
commit
6e3b8ff0a9
11 changed files with 181 additions and 12 deletions
  1. 3 2
      archive.php
  2. 27 0
      category.php
  3. 1 1
      footer-studio.php
  4. 7 2
      functions.php
  5. 0 1
      inc/template.php
  6. 94 0
      js/desk.js
  7. 0 0
      js/scripts.js
  8. 1 1
      page-contact.php
  9. 28 1
      page-desk.php
  10. 17 4
      page-studio.php
  11. 3 0
      style.css

+ 3 - 2
archive.php

@@ -1,10 +1,11 @@
 <?php get_header(); ?>
 <?php get_header(); ?>
+<?php get_template_part( 'underscore' ); ?>
 	<div class="container">
 	<div class="container">
 		<div id="content" role="main">
 		<div id="content" role="main">
 			<div class="entry-content archive">
 			<div class="entry-content archive">
 				<?php if ( have_posts() ) : ?>
 				<?php if ( have_posts() ) : ?>
 				<header class="page-header">
 				<header class="page-header">
-					<h1 class="page-title">Archive: <?php the_time('Y'); ?></h1>
+					<h1 class="super cm-sans wow fadeInLeft">Archive: <?php the_time('Y'); ?></h1>
 				</header>
 				</header>
 				<?php while ( have_posts() ) : the_post();?>
 				<?php while ( have_posts() ) : the_post();?>
 				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'dw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
 				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'dw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
@@ -24,4 +25,4 @@
 			</div>
 			</div>
 		</div>
 		</div>
 	</div>
 	</div>
-<?php get_footer(); ?>
+<?php get_footer('studio'); ?>

+ 27 - 0
category.php

@@ -0,0 +1,27 @@
+<?php get_header(); ?>
+	<div class="container">
+		<div id="content" role="main">
+			<div class="entry-content archive">
+				<?php if ( have_posts() ) : ?>
+				<header class="page-header">
+					<h1 class="super cm-sans wow fadeInLeft">Category: <?php single_cat_title(); ?></h1>
+				</header>
+				<?php while ( have_posts() ) : the_post();?>
+				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'dw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+				<div class="entry-meta">
+					<div class="date">
+						<?php the_date(); ?>
+					</div>
+				</div>
+				<?php the_excerpt(); ?>
+				<?php endwhile;
+					dw_paging_nav();
+				else :
+					printf( __( 'Nothing Found', 'dw' ));		
+					get_search_form();
+				endif;
+				?>
+			</div>
+		</div>
+	</div>
+<?php get_footer('studio'); ?>

+ 1 - 1
footer-studio.php

@@ -10,7 +10,7 @@
 				<ul>
 				<ul>
 					<li><a href="<?php echo home_url( '/' ); ?>studio"><span class="fa fa-flask fa-fw"></span> Studio</a></li>
 					<li><a href="<?php echo home_url( '/' ); ?>studio"><span class="fa fa-flask fa-fw"></span> Studio</a></li>
 					<li><a href="<?php echo home_url( '/' ); ?>contact"><span class="fa fa-envelope-o fa-fw"></span> Contact</a></li>
 					<li><a href="<?php echo home_url( '/' ); ?>contact"><span class="fa fa-envelope-o fa-fw"></span> Contact</a></li>
-					<li><a href="<?php echo home_url( '/' ); ?>sitemap"><span class="fa fa-sitemap fa-fw"></span> Sitemap</a></li>
+					<li><a href="<?php echo home_url( '/' ); ?>shop"><span class="fa fa-credit-card fa-fw"></span> Shop</a></li>
 				</ul>
 				</ul>
 			</div>
 			</div>
 		</div>
 		</div>

+ 7 - 2
functions.php

@@ -106,8 +106,13 @@ function dw_scripts() {
 	elseif ( is_page('desk') || is_archive() || is_search() ) {	
 	elseif ( is_page('desk') || is_archive() || is_search() ) {	
 		global $wp_rewrite;
 		global $wp_rewrite;
 		//wp_enqueue_script( 'jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true); //jquery dependents
 		//wp_enqueue_script( 'jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true); //jquery dependents
-		wp_enqueue_script( 'jquery', get_template_directory_uri() . '/js/script-o.js', '', '', true );
-		wp_enqueue_script( 'init-o', get_template_directory_uri() . '/js/init-o.js', '', '', true );
+		wp_enqueue_style( 'ani', get_template_directory_uri() . '/css/animate.css');
+		wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
+		wp_enqueue_script( 'modern', get_template_directory_uri() . '/js/modernizr.js', 'jquery', '', true );
+		wp_enqueue_script( 'boostrap', get_template_directory_uri() . '/js/bootstrap.min.js', 'jquery', '', true );
+		wp_enqueue_script( 'offcanvas', get_template_directory_uri() . '/js/jasny-bootstrap.js', 'jquery', '', true );
+		wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/scripts.js', 'jquery', '', true );
+		wp_enqueue_script( 'desk', get_template_directory_uri() . '/js/desk.js', '', '', true );
 		wp_enqueue_script( '_s_backbone-loop', get_template_directory_uri() . '/js/loop.js', array( 'jquery', 'backbone', 'underscore', 'wp-api'  ), '1.0', true );
 		wp_enqueue_script( '_s_backbone-loop', get_template_directory_uri() . '/js/loop.js', array( 'jquery', 'backbone', 'underscore', 'wp-api'  ), '1.0', true );
 		$queried_object = get_queried_object();
 		$queried_object = get_queried_object();
 		$local = array(
 		$local = array(

+ 0 - 1
inc/template.php

@@ -117,7 +117,6 @@ function dw_paging_nav() {
 
 
 	?>
 	?>
 	<nav class="navigation pagination paging-navigation" role="navigation">
 	<nav class="navigation pagination paging-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'dw' ); ?></h1>
 		<div class="pagination loop-pagination">
 		<div class="pagination loop-pagination">
 			<?php echo $links; ?>
 			<?php echo $links; ?>
 		</div>
 		</div>

+ 94 - 0
js/desk.js

@@ -0,0 +1,94 @@
+new WOW().init();
+
+jQuery(document).ready(function($) {
+	
+	$(window).bind('load', function() {
+		$('#loader').fadeOut(100);
+	});
+
+	$('.nav-toggle').on('touchstart click', function(e) {
+		e.preventDefault();
+		$( this ).toggleClass( 'active' );
+	});
+
+	$(function dw_hidenav() {
+		var headerHeight = $('.navbar').height();
+		$(window).on('scroll', { previousTop: 0 },
+			function() {
+			var currentTop = $(window).scrollTop();
+			if (currentTop < this.previousTop) {
+				if (currentTop > 0 && $('.navbar').hasClass('fixed')) {
+						$('.navbar').addClass('visible');
+						$('.site-title a').removeClass('light');
+					} else {
+						$('.navbar').removeClass('visible fixed');
+					}
+			} 
+			else {
+				$('.navbar').removeClass('visible');
+				if (currentTop > headerHeight && !$('.navbar').hasClass('fixed')) $('.navbar').addClass('fixed');
+			}
+			this.previousTop = currentTop;
+			}  
+		);
+	});
+	
+	$("#studio-caro").wallpaper({source: "../wp-content/themes/dw/img/clou.jpg"});
+
+	$('#caro').carousel({
+		interval: false,
+		wrap: true,
+	});
+	
+	$(document).bind('keyup', function(e) {
+	    if(e.which === 39){
+			$('#caro').carousel('next');
+	    }
+	    else if(e.which === 37){
+			$('#caro').carousel('prev');
+	    }
+	});
+	
+	$('.studio-subnav a').click(function (e) {
+	  e.preventDefault()
+	  $(this).tab('show')
+	})
+
+	$('#caro').on('slid.bs.carousel', function(event) {
+		var consta = $(event.target);
+		setTimeout(function() {
+			if (consta.find('.item.active').data('id') === 0) {
+				$('.studio-subnav a[href="#studio"]').tab('show')
+				$('#studio-caro').addClass('caro-grad5').removeClass('caro-grad caro-grad3 caro-grad2 caro-grad5');
+				$('.carousel-indicators li').addClass('darken-carousel-indicators');
+				$("#studio-caro").wallpaper("destroy");
+				$("#studio-caro").wallpaper({source: "../wp-content/themes/dw/img/desk2.jpg"});
+			}
+			if (consta.find('.item.active').data('id') === 1) {
+				$('.studio-subnav a[href="#webdev"]').tab('show')
+				$('.active #svg-imac.screen').delay(2500).queue(function(screenit){
+				    $(this).attr('class', 'bg');
+				    screenit();
+				});
+				$('#studio-caro').addClass('caro-grad').removeClass('caro-grad3 caro-grad2 caro-grad5');
+				$('.site-title a').addClass('light');
+				$('.carousel-indicators li').removeClass('darken-carousel-indicators');
+				$("#studio-caro").wallpaper("destroy");
+			}
+		}, 10);
+	});
+	
+
+	$('#caro').on('slid.bs.carousel', function() {
+		$('.active .animac').removeClass('hide-svg fade-svg');
+		var animac = new DrawFillSVG({elementId: 'svg-imac'});
+		var animac1 = new DrawFillSVG({elementId: 'sv'});
+		var animac2 = new DrawFillSVG({elementId: 'svg-mac'});
+		var animac3 = new DrawFillSVG({elementId: 'svg-device'});
+		animac.replay();
+		animac1.replay();
+		animac2.replay();
+		animac3.replay();
+	});
+			
+});

File diff suppressed because it is too large
+ 0 - 0
js/scripts.js


+ 1 - 1
page-contact.php

@@ -45,4 +45,4 @@
 		</div>
 		</div>
 	</div>
 	</div>
 
 
-<?php get_footer(); ?>
+<?php get_footer('studio'); ?>

+ 28 - 1
page-desk.php

@@ -5,6 +5,33 @@ Template Name: Desk
 
 
 get_header(); ?>
 get_header(); ?>
 <?php get_template_part( 'underscore' ); ?>
 <?php get_template_part( 'underscore' ); ?>
+	<div class="container leader">
+		<div class="row">
+			<div class="col-sm-12">
+				<h1 class="super-duper cm-sans wow fadeInLeft">Desk</h1>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-sm-8">
+				<div class="entry-content">
+					<h4 class="georgia spread"><em><span class="firstcharacter">T</span>he internet is awash with nonsense and people that really want to be heard</em>. That's not exactly the case for me and I'm not planning on adding to the nonsense. I've spent too much time working on websites for other folks to really concern myself with my own. However, I've grown really tired of communicating using third party websites and I wanted to use this as a way to archive any notes, ideas, or anything I want to share. Right now, this site is clogged up with lots of old posts about mostly computer related ramblings, but I'll clean that up over time.</h4>
+				</div>
+			</div>
+			<div class="col-sm-4">	
+				<div class="col-xs-6 studio-tools">		
+					<ul>
+						<?php wp_list_categories('orderby=name&exclude=1,7,44'); ?>
+					</ul>
+				</div>
+				<div class="col-xs-6 studio-tools">		
+					<ul>
+						<li>Year</li>
+						<?php wp_get_archives( array( 'type' => 'yearly') ); ?>
+					</ul>
+				</div>
+			</div>
+		</div>	
+	</div>
 	<div class="container">
 	<div class="container">
 		<div id="content" role="main">
 		<div id="content" role="main">
 			<main id="main" class="site-main" role="main">
 			<main id="main" class="site-main" role="main">
@@ -26,4 +53,4 @@ get_header(); ?>
 			</main>
 			</main>
 		</div>
 		</div>
 	</div>
 	</div>
-<?php get_footer(); ?>
+<?php get_footer('studio'); ?>

+ 17 - 4
page-studio.php

@@ -149,7 +149,7 @@
 					<div role="tabpanel" class="tab-pane wow fadeIn active" id="studio">
 					<div role="tabpanel" class="tab-pane wow fadeIn active" id="studio">
 						<div class="col-sm-9">
 						<div class="col-sm-9">
 							<div class="entry-content">
 							<div class="entry-content">
-								<h4 class="georgia"><em><span class="firstcharacter">A</span>lthough it seems that in the shower or sleeping is where my best work occurs,</em> the studio is the place where the shoe leather hits the pavement. I mostly work with web and application development, but I also do a good deal of graphic, print, and multimedia design. On my off hours, I like to turn off the computers to paint with oil, camel hair, canvas, and minerals.</h4>
+								<h4 class="georgia"><em><span class="firstcharacter">A</span>lthough it seems that in the shower or sleeping is where my best work occurs,</em> the studio is the place where the shoe leather hits the pavement. I mostly work with web and application development, but I also do a good deal of graphic, print, and multimedia design. On my off hours, I like to turn off the computers to paint with camel hair, canvas, and minerals.</h4>
 							</div>
 							</div>
 						</div>
 						</div>
 						<div class="col-sm-3 studio-tools">		
 						<div class="col-sm-3 studio-tools">		
@@ -177,8 +177,20 @@
 						</div>
 						</div>
 					</div>
 					</div>
 					<div role="tabpanel" class="tab-pane wow fadeIn" id="ux">
 					<div role="tabpanel" class="tab-pane wow fadeIn" id="ux">
-						<div class="entry-content">
-							<h4 class="georgia"><em><span class="firstcharacter">I</span> believe that user experience design is a very important aspect of modern communications</em>. It encompasses psychology, human factors and ergonomics. I've found myself referening to one of the most cited papers in cognitive psychology on more than one project. The concept is called 'The magical number sever plus or minus two'. </h4>
+						<div class="col-sm-9">
+							<div class="entry-content">
+								<h4 class="georgia"><em><span class="firstcharacter">I</span> believe that user experience design is a very important aspect of modern communications</em>. I've found myself refering to one of the most cited papers in cognitive psychology on more than one project. The concept is called '<a href="http://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two">The magical number sever plus or minus two</a>' and I often apply it to the number of choices a user has on a particular screen or page. </h4>
+							</div>
+						</div>
+						<div class="col-sm-3 studio-tools">		
+							<ul>
+								<li><em>Tools</em></li>
+								<li>OmniGraffle</li>
+								<li>Qualtrics</li>
+								<li>PiWik Analytics</li>
+								<li>Google Analytics</li>
+								<li>Hotjar Heatmaps</li>
+							</ul>
 						</div>
 						</div>
 					</div>
 					</div>
 					<div role="tabpanel" class="tab-pane wow fadeIn" id="graphic">
 					<div role="tabpanel" class="tab-pane wow fadeIn" id="graphic">
@@ -192,6 +204,7 @@
 								<li><em>Tools</em></li>
 								<li><em>Tools</em></li>
 								<li>Adobe Illustrator / Photoshop / InDesign</li>
 								<li>Adobe Illustrator / Photoshop / InDesign</li>
 								<li>Wacom Intuos Pro</li>
 								<li>Wacom Intuos Pro</li>
+								<li>Design Books</li>
 								<li>Sketchbook</li>
 								<li>Sketchbook</li>
 							</ul>
 							</ul>
 						</div>
 						</div>
@@ -199,7 +212,7 @@
 					<div role="tabpanel" class="tab-pane wow fadeIn" id="media">
 					<div role="tabpanel" class="tab-pane wow fadeIn" id="media">
 						<div class="col-sm-9">
 						<div class="col-sm-9">
 							<div class="entry-content">
 							<div class="entry-content">
-								<h4 class="georgia"><em><span class="firstcharacter">T</span>he average human attention span is a bit shorter than that of a goldfish</em>. People often forget that the web is a multimedia medium. I'm a decent videographer with enough production abilities, lighting, equipment, and an eye for detail to make your multimedia look and sound like it was actually done by a seasoned professional.</h4>
+								<h4 class="georgia"><em><span class="firstcharacter">T</span>he average human attention span is a bit shorter than that of a goldfish</em>. People often forget that the web is a multimedia medium. I'm a decent with enough production, lighting, equipment, and I have an eye for detail to make your multimedia look and sound like it was actually done by a   professional.</h4>
 							</div>
 							</div>
 						</div>
 						</div>
 						<div class="col-sm-3 studio-tools">		
 						<div class="col-sm-3 studio-tools">		

+ 3 - 0
style.css

@@ -201,6 +201,9 @@ em {
 h5.contact {
 h5.contact {
 	margin: 0 0 5px !important;
 	margin: 0 0 5px !important;
 }
 }
+h4.spread {
+	line-height: 24px;
+}
 .conq {
 .conq {
 	font-family: "aw-conqueror-didot",serif;
 	font-family: "aw-conqueror-didot",serif;
 	font-style: normal;
 	font-style: normal;

Some files were not shown because too many files changed in this diff