Browse Source

where where we

windhamdavid 9 years ago
parent
commit
bb07e7cb76
9 changed files with 124 additions and 71 deletions
  1. 18 16
      functions.php
  2. 13 15
      index.php
  3. 1 3
      js/init.js
  4. 5 0
      js/jquery.countdown.min.js
  5. 3 0
      js/jquery.plugin.min.js
  6. 27 0
      page-test.php
  7. 32 34
      page.php
  8. 19 0
      single.php
  9. 6 3
      style.css

+ 18 - 16
functions.php

@@ -7,6 +7,7 @@ if ( ! function_exists( 'bml_setup' ) ) :
 
 function bml_setup() {
 	require( get_template_directory() . '/inc/tweaks.php' );
+	
 	load_theme_textdomain( 'bml', get_template_directory() . '/languages' );
 	add_theme_support( 'automatic-feed-links' );
 	register_nav_menus( array( 'primary' => __( 'Primary Menu', 'bml' ), ) );
@@ -20,7 +21,6 @@ endif;
 add_action( 'after_setup_theme', 'bml_setup' );
 
 
-
 add_filter('show_admin_bar', '__return_false');
 
 function bml_widgets_init() {
@@ -37,25 +37,27 @@ add_action( 'widgets_init', 'bml_widgets_init' );
 
 add_action( 'wp_enqueue_scripts', 'bml_scripts' );
 function bml_scripts() {
+	wp_enqueue_script('jquery');
 	//wp_dequeue_script('jquery');
 	//wp_deregister_script('jquery');
-	
 	//wp_enqueue_style( 'bml-style', get_stylesheet_uri() );
 	wp_enqueue_style( 'bml', get_template_directory_uri() . '/style.css');
 	wp_enqueue_style( 'bml2', get_template_directory_uri() . '/css/stripe.css');
-	//wp_enqueue_script( 'bscript', get_template_directory_uri() . '/js/script.js', array(), '1.0.0', true );
-	//wp_enqueue_script( 'binit', get_template_directory_uri() . '/js/init.js', array(), '1.0.0', true );
-	//wp_enqueue_script( 'bml-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20120206', true );
-	//wp_enqueue_script( 'bml-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20130115', true );
-
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
-	}
-	if ( is_singular() && wp_attachment_is_image() ) {
-		wp_enqueue_script( 'bml-keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20120202' );
-	}
+	
+    if( is_front_page() )
+    {
+		wp_enqueue_script( 'bmlskroll', get_template_directory_uri() . '/js/skrollr.min.js', array(), '1.0.0', true );
+		wp_enqueue_script( 'bmlskrollmenu', get_template_directory_uri() . '/js/skrollr.menu.min.js', array(), '1.0.0', true );
+		//wp_enqueue_script( 'bmlscript', get_template_directory_uri() . '/js/script.js', array(), '1.0.0', true );
+		//wp_enqueue_script( 'bmlinit', get_template_directory_uri() . '/js/init.js', array(), '1.0.0', true );
+		//wp_enqueue_script( 'bmljquery', get_template_directory_uri() . '/js/jquery-1.8.3.min.js', array(), '1.0.0', true );
+    }
 }
 
+add_filter("gform_init_scripts_footer", "init_scripts");
+function init_scripts() {
+return true;
+}
 
 add_action( 'wp_print_scripts', 'bml_deregister', 100 );
 function bml_deregister() {
@@ -68,7 +70,7 @@ function bml_deregister() {
 }
 
 
-require get_template_directory() . '/inc/template-tags.php';
-require get_template_directory() . '/inc/extras.php';
-require get_template_directory() . '/inc/customizer.php';
+//require get_template_directory() . '/inc/template-tags.php';
+//require get_template_directory() . '/inc/extras.php';
+//require get_template_directory() . '/inc/customizer.php';
 //require get_template_directory() . '/inc/jetpack.php';

+ 13 - 15
index.php

@@ -114,18 +114,11 @@
 			</div>
 		</div>
 	</div>
+	
 	<div id="wish">
-		<div class="easing" data-25000="left:100%" data-26000="left:15%;">
+		<div class="easing" data-25000="left:100%" data-26000="left:0%;">
 			<div class="container">
-			<?php $comment_args = array( 'title_reply'=>'', 'comment_notes_before' => 'Leave us a message and...',
-			'fields' => apply_filters( 'comment_form_default_fields', array(
-			'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . '</label> ' . ( $req ? '<span>*</span>' : '' ) .
-			'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>', 'email'  => '<p class="comment-form-email">' .
-			'<label for="email">' . __( 'Email' ) . '</label> ' . ( $req ? '<span>*</span>' : '' ) .
-			'<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' />'.'</p>', 'url'    => '' ) ),
-			'comment_field' => '<p>' . '<label for="comment">' . __( '' ) . '</label>' . '<textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea>' . '</p>', 'label_submit' => 'Wish Us Well', 'comment_notes_after' => '',
-			);
-			comment_form($comment_args); ?>
+				<?php gravity_form(1, false, false, false, '', true); ?>
 			</div>
 		</div>
 	</div>
@@ -183,11 +176,16 @@
 	</div>
 
 <?php wp_footer(); ?>
-<script src="<?php echo get_template_directory_uri(); ?>/js/jquery-1.8.3.min.js"></script>
-<script src="<?php echo get_template_directory_uri(); ?>/js/script.js"></script>
-<script src="<?php echo get_template_directory_uri(); ?>/js/skrollr.min.js"></script>
-<script src="<?php echo get_template_directory_uri(); ?>/js/skrollr.menu.min.js"></script>
-<script src="<?php echo get_template_directory_uri(); ?>/js/init.js"></script>
+<script>
+var s = skrollr.init({
+	edgeStrategy: 'set',
+	easing: {
+		inverted: function(p) {
+			return 1-p;
+		}
+	}
+});
+</script>
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

+ 1 - 3
js/init.js

@@ -11,6 +11,4 @@ var s = skrollr.init({
 			return 1-p;
 		}
 	}
-});
-
-
+});

File diff suppressed because it is too large
+ 5 - 0
js/jquery.countdown.min.js


File diff suppressed because it is too large
+ 3 - 0
js/jquery.plugin.min.js


+ 27 - 0
page-test.php

@@ -0,0 +1,27 @@
+<?php /* Template Name: Test */ ?>
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<meta name="description" content="David + Ginny">
+<title>D+G (Can't Buy Me Love)</title>
+<?php wp_head(); ?>
+</head>
+<body>
+<div class="container">
+<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
+</div>
+<?php wp_footer(); ?>
+<script src="<?php echo get_template_directory_uri(); ?>/js/skrollr.min.js"></script>
+<script src="<?php echo get_template_directory_uri(); ?>/js/skrollr.menu.min.js"></script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-1906067-35', 'cantbuymelove.org');
+  ga('send', 'pageview');
+</script>
+</body>
+</html>

+ 32 - 34
page.php

@@ -1,34 +1,32 @@
-<?php
-/**
- * The template for displaying all pages.
- *
- * This is the template that displays all pages by default.
- * Please note that this is the WordPress construct of pages
- * and that other 'pages' on your WordPress site will use a
- * different template.
- *
- * @package bml
- */
-
-get_header(); ?>
-
-	<div id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
-
-			<?php while ( have_posts() ) : the_post(); ?>
-
-				<?php get_template_part( 'content', 'page' ); ?>
-
-				<?php
-					// If comments are open or we have at least one comment, load up the comment template
-					if ( comments_open() || '0' != get_comments_number() )
-						comments_template();
-				?>
-
-			<?php endwhile; // end of the loop. ?>
-
-		</main><!-- #main -->
-	</div><!-- #primary -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php?>
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<meta name="description" content="David + Ginny">
+<title>D+G (Can't Buy Me Love)</title>
+<?php wp_head(); ?>
+</head>
+<body>
+<div class="container">
+	<?php while ( have_posts() ) : the_post(); ?>
+		<?php the_content(); ?>
+	<?php endwhile;?>
+</div>
+<?php wp_footer(); ?>
+<script src="<?php echo get_template_directory_uri(); ?>/js/jquery-1.8.3.min.js"></script>
+<script src="<?php echo get_template_directory_uri(); ?>/js/script.js"></script>
+<script src="<?php echo get_template_directory_uri(); ?>/js/skrollr.min.js"></script>
+<script src="<?php echo get_template_directory_uri(); ?>/js/skrollr.menu.min.js"></script>
+<script src="<?php echo get_template_directory_uri(); ?>/js/init.js"></script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-1906067-35', 'cantbuymelove.org');
+  ga('send', 'pageview');
+</script>
+</body>
+</html>

+ 19 - 0
single.php

@@ -0,0 +1,19 @@
+<?php?>
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<meta name="description" content="David + Ginny">
+<title>D+G (Can't Buy Me Love)</title>
+<?php wp_head(); ?>
+</head>
+<body>
+<div class="container">
+	<?php while ( have_posts() ) : the_post(); ?>
+		<?php the_content(); ?>
+	<?php endwhile;?>
+</div>
+<?php wp_footer(); ?>
+</body>
+</html>

+ 6 - 3
style.css

@@ -12,8 +12,8 @@ Author URI: http://davidawindham.com
 */
 
 @import url(https://fonts.googleapis.com/css?family=Reenie+Beanie);
-@import url(http://fonts.googleapis.com/css?family=Great+Vibes);
-@import url(http://fonts.googleapis.com/css?family=Cardo|Monsieur+La+Doulaise);
+@import url(https://fonts.googleapis.com/css?family=Great+Vibes);
+@import url(https://fonts.googleapis.com/css?family=Cardo|Monsieur+La+Doulaise);
 @import url(css/fancy.css);
 
 /* #Reset  ================================================== */
@@ -233,11 +233,14 @@ html, body {width:100%;height:100%;padding:0;margin:0;overflow-x:hidden;}
 	width:100%;
 	height:100%;
 }
-
 #vows {
 	width:100%;
 	height:100%;
 }
+#wish {
+	width:100%;
+	height:100%;
+}
 
 
 

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