From b7b3a704369389c17409309fa80a0dc1ec1de45f Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Wed, 30 Jul 2014 09:53:11 -0400 Subject: [PATCH] Pages, Footer, Images Standardizing pages, making sure they all use the same markup. Adding some spacing to images. Fixing some footer variables. --- _notes/dwsync.xml | 2 +- archive.php | 2 +- content-home.php | 17 +++++ content-page.php | 2 + css/_notes/dwsync.xml | 2 +- css/alignments.css | 4 +- inc/_notes/dwsync.xml | 2 +- inc/sidemenu-walker.php | 16 +++++ inc/submenu-check.php | 37 ++++++++++ inc/submenu-closing-tags.php | 4 ++ page-az.php | 131 ++++++++++++++++++++--------------- page-blog.php | 92 +++++++++--------------- page-home.php | 68 +++++++++--------- page-user-profile.php | 49 +++++++------ page.php | 112 ------------------------------ sass/_notes/dwsync.xml | 2 +- sass/alignments.scss | 5 +- sass/footer.scss | 2 +- sass/utilities.scss | 2 + sass/variables.scss | 2 + search.php | 2 +- style.css | 29 ++++++-- 22 files changed, 289 insertions(+), 295 deletions(-) create mode 100644 content-home.php create mode 100644 inc/sidemenu-walker.php create mode 100644 inc/submenu-check.php create mode 100644 inc/submenu-closing-tags.php delete mode 100644 page.php diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml index c32d828..039e1d1 100644 --- a/_notes/dwsync.xml +++ b/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/archive.php b/archive.php index 9278675..8934869 100755 --- a/archive.php +++ b/archive.php @@ -15,7 +15,7 @@ get_header(); ?> -
+

+ +
> +
+ +
+
+ ', '' ); ?> +
+
+ \ No newline at end of file diff --git a/content-page.php b/content-page.php index f726dbc..84b68dc 100755 --- a/content-page.php +++ b/content-page.php @@ -5,6 +5,8 @@ * @package cornerstone */ ?> + +
>
', '

' ); ?> diff --git a/css/_notes/dwsync.xml b/css/_notes/dwsync.xml index 6726c6b..37b5301 100644 --- a/css/_notes/dwsync.xml +++ b/css/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/css/alignments.css b/css/alignments.css index 11f0a2b..b5b00b9 100644 --- a/css/alignments.css +++ b/css/alignments.css @@ -5,16 +5,18 @@ display: inline; float: left; margin-right: 1.5em; + margin-bottom: 1.5em; } .alignright { display: inline; float: right; margin-left: 1.5em; + margin-bottom: 1.5em; } .aligncenter { clear: both; display: block; - margin: 0 auto; + margin: 1em auto; } diff --git a/inc/_notes/dwsync.xml b/inc/_notes/dwsync.xml index 64b091e..04941a9 100644 --- a/inc/_notes/dwsync.xml +++ b/inc/_notes/dwsync.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/inc/sidemenu-walker.php b/inc/sidemenu-walker.php new file mode 100644 index 0000000..84b9849 --- /dev/null +++ b/inc/sidemenu-walker.php @@ -0,0 +1,16 @@ + 'aside', + 'menu_class' => 'nav nav-pills nav-stacked', + 'theme_location' => 'primary', + 'container' => false, + 'fallback_cb' => false, + 'items_wrap' => '
    %3$s
', + 'walker' => new Secondary_Bootstrap_Nav_Walker(), + 'depth' => 2, + 'sub_menu' => true, + 'start_depth' => 2 + ) + ); +?> diff --git a/inc/submenu-check.php b/inc/submenu-check.php new file mode 100644 index 0000000..63c40b3 --- /dev/null +++ b/inc/submenu-check.php @@ -0,0 +1,37 @@ +term_id); + $level = 0; + $stack = array('0'); + foreach($menu_items as $key => $menu_item) { + if($menu_item->object_id == get_the_ID()) $current_id = $menu_item->ID; + } + foreach($menu_items as $key => $menu_item) { + while($menu_item->menu_item_parent != array_pop($stack)) { + $level--; + } + $level++; + $stack[] = $menu_item->menu_item_parent; + $stack[] = $menu_item->ID; + $menu_items[$key]->level = $level; + if($menu_item->menu_item_parent == $current_id && $level > 2 || $menu_item->ID == $current_id && $level > 2){ + $has_sub_menu = true; + } + } + //print_r($menu_items); +} +if($has_sub_menu){ +?> + +
+
+ +
+
+ \ No newline at end of file diff --git a/inc/submenu-closing-tags.php b/inc/submenu-closing-tags.php new file mode 100644 index 0000000..68fccae --- /dev/null +++ b/inc/submenu-closing-tags.php @@ -0,0 +1,4 @@ + +
+
+ \ No newline at end of file diff --git a/page-az.php b/page-az.php index 4a6a2b9..11c4bdb 100644 --- a/page-az.php +++ b/page-az.php @@ -7,68 +7,89 @@ Template Name: A-Z Index */ get_header(); ?> - + + + +
+
+
+
+ +
+ post_title); + $char = $title{0}; + if( !(is_numeric($char)) && !in_array($char, $letters) ){ + array_push($letters, $char); + } + } + return $letters; + } + + // Generate AZ Navigation + echo ''; + + // Generate AZ List + $pages = get_pages(array('sort_order' => 'asc', 'sort_column' => 'post_title', 'hierarchical' => false)); + $letters = array(); + echo '
'; + foreach( (array) $pages as $pg ){ + $title = ucwords($pg->post_title); + $char = $title{0}; + if( !( is_numeric($char) || empty($char) ) ){ + if( $char != end($letters) && !empty($letters) ){ + echo '
'; + } + if( !in_array($char, $letters) ){ + echo '

'.$char.'

    '; + array_push($letters, $char); + } + echo '
  1. '.$title.'
    2. '; + } + } + echo '
'; + ?> +
+ +
+
+ + + + + + + + +
-
-

- -

-
+
+
+

+ +

+
+
-
- post_title); - $char = $title{0}; - if( !(is_numeric($char)) && !in_array($char, $letters) ){ - array_push($letters, $char); - } - } - return $letters; - } - - // Generate AZ Navigation - echo ''; - - // Generate AZ List - $pages = get_pages(array('sort_order' => 'asc', 'sort_column' => 'post_title', 'hierarchical' => false)); - $letters = array(); - echo '
'; - foreach( (array) $pages as $pg ){ - $title = ucwords($pg->post_title); - $char = $title{0}; - if( !( is_numeric($char) || empty($char) ) ){ - if( $char != end($letters) && !empty($letters) ){ - echo '
'; - } - if( !in_array($char, $letters) ){ - echo '

'.$char.'

    '; - array_push($letters, $char); - } - echo '
  1. '.$title.'
    2. '; - } - } - echo '
'; - ?> -
+
diff --git a/page-blog.php b/page-blog.php index 28e08c5..267d4ba 100644 --- a/page-blog.php +++ b/page-blog.php @@ -1,66 +1,40 @@ - -
-
- - - */ - ?> - - - -
-
-

- -

-
-
- -
-
- ', '' ); ?> - - - - ', ', ', '' ); - ?> + + + +
+
+
+
+ + + + + + + +
+

+ +

+
+ +
+
+
- -
- - - -
- - - -
-

- -

-
- - - -
- - -
- - + + + \ No newline at end of file diff --git a/page-home.php b/page-home.php index f7ad3a9..dc06b7d 100644 --- a/page-home.php +++ b/page-home.php @@ -9,38 +9,40 @@ Template Name: Home $rows = get_theme_mod('homepagerows'); $count = 1; get_header(); ?> - - - - - - -
- -
-
- -
- -
- - - -

Home

-

Go to Appearance > Customize, scroll down and open the Home section to edit this area.

- -
-
- -
-
+
+ + +
+
+ +
+
+
+ +
+
+ + + +

Home

+

Go to Appearance > Customize, scroll down and open the Home section to edit this area.

+ +
+
+ +
+
+ +
+ +
- -
- +
+ +
diff --git a/page-user-profile.php b/page-user-profile.php index ca67c1d..76ec6e3 100644 --- a/page-user-profile.php +++ b/page-user-profile.php @@ -3,32 +3,37 @@ /* Template Name: User Profile -* The Template for diaplaying user profiles +* The Template for displaying user profiles */ get_header(); ?> -
-