windhamdavid 5 years ago
parent
commit
5f16aeb37e
4 changed files with 31 additions and 34 deletions
  1. 3 2
      footer.php
  2. 18 20
      functions.php
  3. 2 0
      js/last.fm.js
  4. 8 12
      page-music.php

+ 3 - 2
footer.php

@@ -2,13 +2,14 @@
 	<div class="container">
 		<div class="row">
 			<div class="col-md-4">
-			</div>
+				</div>
 			<div class="col-md-4">
 				<p class="dim"><p>
 			</div>
 			<div class="col-md-4">
-				<p class="dim right"><a href="https://github.com/windhamdavid/dw"><span class="fa fa-15x fa-code-fork"></span> </a></p>
 				<p class="small dim right">&copy; 2005-2015<br />David A. Windham</p>
+				<p class="dim right"><a href="https://github.com/windhamdavid/dw"><span class="fa fa-1x fa-code-fork"></span></a> <span class="fa fa-1x fa-css3"></span> <span class="fa fa-1x fa-html5"></span></p>
+				
 			</div>
 		</div>
 	</div>

+ 18 - 20
functions.php

@@ -24,13 +24,12 @@ function dw_editor() {
 }
 add_action( 'init', 'dw_editor' );
 
-
 function dw_scripts() {
 	global $post;
 	wp_enqueue_style( 'style', get_stylesheet_uri() );
-	//wp_enqueue_style( 'style-o-min', get_template_directory_uri() . '/css/style-o.min.css');
+	//wp_enqueue_style( 'style-min', get_template_directory_uri() . '/css/style.min.css');
 	//wp_enqueue_style( 'style-o', get_template_directory_uri() . '/css/style-o.css');
-	//wp_enqueue_style( 'style-o', get_template_directory_uri() . '/css/style-o.min.css');
+	//wp_enqueue_style( 'style-o-min', get_template_directory_uri() . '/css/style-o.min.css');
 	wp_enqueue_style( 'boot', get_template_directory_uri() . '/css/bootstrap.css');
 	wp_enqueue_style( 'jasny', get_template_directory_uri() . '/css/jasny-bootstrap.css');
 	wp_enqueue_style( 'font', get_template_directory_uri() . '/css/font-awesome.css');
@@ -38,16 +37,17 @@ function dw_scripts() {
 	wp_enqueue_style( 'ani', get_template_directory_uri() . '/css/animate.css');
 	
 	wp_deregister_script('jquery');
-	wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
-
 	if ( is_front_page() || is_home() ) {
-		//wp_enqueue_style( 'style-min', get_template_directory_uri() . '/css/style.min.css');
+		
+	}
+	if ( is_page('home') ) {	
 		wp_enqueue_style( 'boot', get_template_directory_uri() . '/css/bootstrap.css');
 		wp_enqueue_style( 'jasny', get_template_directory_uri() . '/css/jasny-bootstrap.css');
 		wp_enqueue_style( 'font', get_template_directory_uri() . '/css/font-awesome.css');
 		wp_enqueue_style( 'cal', get_template_directory_uri() . '/css/fullcalendar.css');
 		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 );
@@ -58,10 +58,11 @@ function dw_scripts() {
 		wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/scripts.js', 'jquery', '', true );
 		//wp_enqueue_script( 'script', get_template_directory_uri() . '/js/script.js', 'jquery', '', true );
 		//wp_enqueue_script( 'scriptmin', get_template_directory_uri() . '/js/script.min.js', 'jquery', '', true );
-		wp_enqueue_script( 'init', get_template_directory_uri() . '/js/init.js', 'jquery', '', true );
 		//wp_enqueue_script( 'init', get_template_directory_uri() . '/js/init.min.js', 'jquery', '', true );
-	} 
-	if ( is_page('music') || is_archive() || is_search() ) {	
+		wp_enqueue_script( 'init', get_template_directory_uri() . '/js/init.js', 'jquery', '', true );	
+	}
+	
+	if ( is_page('music') ) {	
 		wp_enqueue_script( 'scripts-o', get_template_directory_uri() . '/js/scripts-o.js', 'jquery', '', true );
 		//wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/script-o.min.js', 'jquery', '', true );
 		wp_enqueue_script( 'init-o', get_template_directory_uri() . '/js/init-o.js', 'jquery', '', true );
@@ -74,16 +75,7 @@ function dw_scripts() {
 		wp_enqueue_script( 'comment-reply' );
 	}
 	
-	else {
-		wp_enqueue_script( 'scripts-o', get_template_directory_uri() . '/js/script-o.js', 'jquery', '', true );
-		//wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/script-o.min.js', 'jquery', '', true );
-		wp_enqueue_script( 'init-o', get_template_directory_uri() . '/js/init-o.js', 'jquery', '', true );
-		//wp_enqueue_script( 'init', get_template_directory_uri() . '/js/init-o.min.js', 'jquery', '', true );
-	}
-	
-	
-	
-	if ( is_page('notebook') || is_archive() || is_search() ) {	
+	if ( is_page('notebook') || is_archive() ) {	
 		global $wp_rewrite;
 		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();
@@ -110,8 +102,14 @@ function dw_scripts() {
 		if ( is_paged() ) {
 			$local['page'] = absint( get_query_var( 'paged' ) ) + 1;
 		}
-
 		wp_localize_script( '_s_backbone-loop', 'settings', $local );
+	}
+	
+	else {
+		wp_enqueue_script( 'scripts-o', get_template_directory_uri() . '/js/script-o.js', 'jquery', '', true );
+		//wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/script-o.min.js', 'jquery', '', true );
+		wp_enqueue_script( 'init-o', get_template_directory_uri() . '/js/init-o.js', 'jquery', '', true );
+		//wp_enqueue_script( 'init', get_template_directory_uri() . '/js/init-o.min.js', 'jquery', '', true );
 	}	
 }
 add_action( 'wp_enqueue_scripts', 'dw_scripts' );

+ 2 - 0
js/last.fm.js

@@ -150,6 +150,7 @@ $('.timeline').waypoint(function() {
 $('.music-types').waypoint(function() {
 	$(function() {
 	     options = {
+			responsive: true,
 	        scaleShowLabelBackdrop: true,
 	        scaleBackdropColor: "rgba(255,255,255,0.75)",
 	        scaleBeginAtZero: true,
@@ -250,6 +251,7 @@ $('.music-types').waypoint(function() {
 $('.music-typed').waypoint(function() {
 	$(function() {
 	     options = {
+			responsive: true,
 	        scaleShowLabelBackdrop: true,
 	        scaleBackdropColor: "rgba(255,255,255,0.75)",
 	        scaleBeginAtZero: true,

+ 8 - 12
page-music.php

@@ -13,12 +13,8 @@ get_header(); ?>
 					<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( '%s', 'daw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark">Music</a></h2>
 					<?php the_content(); ?>
 					<div class="row">
-						<div class="col-sm-4">
-						<p>&nbsp;</p>
-						</div>
-						<div class="col-sm-4">
-						</div>
-						<div class="col-sm-4">
+						<div class="col-sm-12">
+							<p>&nbsp;</p>
 						</div>
 					</div>
 					<div class="row">
@@ -35,7 +31,6 @@ get_header(); ?>
 					</div>
 					<div class="row">
 						<div class="col-sm-2">
-							
 							<ul class="list-group">
 								<li class="list-group-item active">Tracks</li>
 									<li class='list-group-item'>Year<span class='badge'>7151</span></li>
@@ -77,7 +72,8 @@ get_header(); ?>
 					<div class="row">
 						<div class="col-sm-12">
 							<div id="music-notes">
-								<p><small><sup>*</sup>Note: 12 Categories is limiting. Bluegrass is country, Rhythm and Blues includes Fats Domino and Mary J. Blige. Peter Tosh is World music. Brian Eno is somtimes ambient and sometimes electronic. I tagged alot of pop music as electronic when I hear very few real instruments. I also noticed that because pop songs are shorter there are much more plays.  I capped off the plays below at 200. </small></p>
+								<p>&nbsp;</p>
+								<p><small><sup>*</sup>Note: 12 categories are limiting. Bluegrass is country, Rhythm and Blues includes Fats Domino and Mary J. Blige. Peter Tosh is World music. Brian Eno is somtimes ambient and sometimes electronic. I tagged alot of pop music as electronic when I hear very few real instruments. On the monthly chart, I've capped the play count at 200. </small></p>
 							</div>
 						</div>
 					</div>
@@ -102,13 +98,13 @@ get_header(); ?>
 							</ul>
 						</div>
 						<div class="col-sm-4">
-							<h5 class="cm-type"><em>Top Artists - Last Week</em></h5>
+							<h5 class="cm-type"><em>Artists: 7 Days</em></h5>
 							<ul class="list-group">
 								<div class="wartists"></div>
 							</ul>
 						</div>
 						<div class="col-sm-4">
-							<h5 class="cm-type"><em>Top Tracks - Last Week</em></h5>
+							<h5 class="cm-type"><em>Tracks: 7 Days</em></h5>
 							<ul class="list-group">
 								<div class="wtracks"></div>
 							</ul>
@@ -116,13 +112,13 @@ get_header(); ?>
 					</div>
 					<div class="row">
 						<div class="col-sm-4">
-							<h5 class="cm-type"><em>Top Artists - Last 6 Months</em></h5>
+							<h5 class="cm-type"><em>Artists: 6 Months</em></h5>
 							<ul class="list-group">
 								<div class="artists"></div>
 							</ul>
 						</div>
 						<div class="col-sm-8">
-							<h5 class="cm-type"><em>Top Tracks - Last 6 Months</em></h5>
+							<h5 class="cm-type"><em>Tracks: 6 Months</em></h5>
 							<ul class="list-group">
 								<div class="tracks"></div>
 							</ul>