[gnome-web-www: 46/68] Use WordPress functions to call the header and footer



commit e56d0ac2c3e927ba7905eaf91aad0e1784faa77d
Author: Tom Tryfonidis <tomtryf gnome org>
Date:   Mon Jan 9 18:59:41 2017 +0200

    Use WordPress functions to call the header and footer
    
    Various markup changes
    Escape any translatable text

 theme/404.php                       |   17 ++++--------
 theme/index.php                     |   17 +++++-------
 theme/news.php                      |   26 ++++++-------------
 theme/news_sidebar.php              |   11 +++-----
 theme/one-column-with-nav.php       |   46 ++++++++++++++++------------------
 theme/one-column-with-submenu.php   |   15 ++++-------
 theme/one-column-without-title.php  |   17 +++++-------
 theme/one-column.php                |   35 ++++++++++++--------------
 theme/page-applications.php         |   17 ++++--------
 theme/page-apply.php                |   10 ++-----
 theme/page-home.php                 |    2 -
 theme/page-membership.php           |   19 ++++++--------
 theme/page-news.php                 |   30 ++++++----------------
 theme/page-press.php                |   22 +++++-----------
 theme/page-previous-donors.php      |   25 +++++++-----------
 theme/project.php                   |   17 ++++--------
 theme/search.php                    |   36 +++++++++------------------
 theme/social_icons.php              |   20 ++++----------
 theme/taxonomy-project_category.php |   18 ++++---------
 19 files changed, 147 insertions(+), 253 deletions(-)
---
diff --git a/theme/404.php b/theme/404.php
index a119487..b336c33 100644
--- a/theme/404.php
+++ b/theme/404.php
@@ -3,19 +3,19 @@
  * @package GNOME Website
  * @subpackage Grass Theme
  */
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
-        <div class="container">
+    <div class="container two_columns">
             
             <div class="content without_sidebar">
                 
                 <div class="col-sm-10 col-sm-offset-1">
-                        <h1><?php _e( 'Ooooops. Something is not here.', 'grass' ); ?></h1>
+                        <h1><?php esc_html_e( 'Ooooops. Something is not here.', 'grass' ); ?></h1>
                         
-                        <p class="main_feature"><?php _e( 'The page you tried to access was not found.', 
'grass' ); ?></p>
+                        <p class="main_feature"><?php esc_html_e( 'The page you tried to access was not 
found.', 'grass' ); ?></p>
                         
                         <hr />
                         
@@ -45,13 +45,8 @@ require_once("header.php"); ?>
                 
                 <div class="clear"></div>
             </div>
-            <?php $footer_art = '404'; ?>
-            <?php require_once("footer_art.php"); ?>
-        </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/index.php b/theme/index.php
index 87736a8..31ed54b 100644
--- a/theme/index.php
+++ b/theme/index.php
@@ -3,15 +3,15 @@
  * @package GNOME Website
  * @subpackage Grass Theme
  */
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
-        <div class="container">
-        
+    <div class="container two_columns">
+        <div class="col-xs-12">
             <?php require_once('inc/page-title.php'); ?>
-            
+
             <div class="content col-md-9">
             <?php while ( have_posts() ) : the_post(); ?>
                 <?php the_content(); ?>
@@ -52,12 +52,9 @@ require_once("header.php"); ?>
                 </ul>
                 <?php } ?>            
             </div>
-            <?php require_once("footer_art.php"); ?>
         </div>
     </div>
-    
+
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/news.php b/theme/news.php
index 2fd4aa8..8cab88f 100644
--- a/theme/news.php
+++ b/theme/news.php
@@ -3,30 +3,24 @@
  * @package GNOME Website
  * @subpackage Grass Theme
  */
- 
-
-add_action('wp_head', function() {
-    echo '<link rel="stylesheet" type="text/css" media="all" 
href="'.get_bloginfo('template_url').'/css/news.css" />';
-});
 
 /*
  * Add link to global feeds instead of current page comments
  */
-automatic_feed_links(false);
 add_action('wp_head', function() {
    echo '<link rel="alternate" type="application/rss+xml" title="'.get_bloginfo('name').' &raquo; Feed" 
href="'.home_url('/').'feed/" />'; 
 });
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
-        <div class="container">
-        
-            <div class="page_title">
-                <h1><a href="<?php bloginfo('url'); ?>/news/"><?php echo __('News', 'grass');?></a></h1>
+    <div class="container two_columns">
+            <div class="col-xs-12">
+                <div class="page_title">
+                    <h1><a href="<?php bloginfo('url'); ?>/news/"><?php esc_html_e('News', 
'grass');?></a></h1>
+                </div>
             </div>
-            
             <div class="content col-md-9">
             <?php while ( have_posts() ) : the_post(); ?>
                 <div class="news_title">
@@ -44,12 +38,8 @@ require_once("header.php"); ?>
                 <?php require_once("news_sidebar.php");?>
                       
             </div>
-            <?php require_once("footer_art.php"); ?>
-        </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/news_sidebar.php b/theme/news_sidebar.php
index bb75fc6..44c0ec4 100644
--- a/theme/news_sidebar.php
+++ b/theme/news_sidebar.php
@@ -1,16 +1,13 @@
 <?php if(!isset($is_news_home) || $is_news_home == false) { ?>
-<a class="action_button" href="<?php bloginfo('url'); ?>/news/" style="display: block; text-align: center; 
margin-bottom: 20px;"><?php _e('Read the archives...', 'grass'); ?></a>
+<a class="btn btn-default" href="<?php bloginfo('url'); ?>/news/" style="display: block; text-align: center; 
margin-bottom: 20px;"><?php esc_html_e('Read the archives...', 'grass'); ?></a>
 <?php } ?>
 
-<div class="subtle_box">
-    <h4><?php _e('Connect with GNOME', 'grass'); ?></h4>
-    
-    <div class="social_network_icons">
+<div class="subtle_box text-center">
+    <h4><?php esc_html_e('Connect with GNOME', 'grass'); ?></h4>
         <?php require("social_icons.php");?>
-    </div>
 </div>
     
 <div class="subtle_box">
-    <h4>Development News</h4>
+    <h4 class="text-center"><?php esc_html_e('Development News', 'grass'); ?></h4>
     <p>For commit digests, release announcements, and GNOME team updates, go to <a 
href="http://news.gnome.org";>http://news.gnome.org</a></p>
 </div>
diff --git a/theme/one-column-with-nav.php b/theme/one-column-with-nav.php
index db4f8b4..a8548e0 100644
--- a/theme/one-column-with-nav.php
+++ b/theme/one-column-with-nav.php
@@ -2,32 +2,30 @@
 /*
 Template Name: One Column with Foundation Navigation
 */
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
-<!-- container -->
-<div id="container" class="two_columns">
-    <div class="container">
-  <div id = "foundation">
-    <div class="page_title">
-        <h1><?php the_title(); ?></h1>
+    <!-- container -->
+    <div class="container two_columns">
+        <div id="foundation">
+            <div class="col-sm-12">
+
+                <div class="page_title">
+                    <h1><?php the_title(); ?></h1>
+                </div>
+
+                <div class="clearfix"></div>
+                <div class="content without_sidebar">
+                    <?php while ( have_posts() ) : the_post(); ?>
+                        <?php the_content(); ?>
+                    <?php endwhile;?>
+                    <br />
+                    <div class="clearfix"></div>
+                </div>
+            </div>
+        </div>
     </div>
     <div class="clearfix"></div>
-    
-    <!-- <div class="content without_sidebar"> -->
-        <?php while ( have_posts() ) : the_post(); ?>
-            <?php the_content(); ?>
-        <?php endwhile;?>
-        <br />
-        <div class="clearfix"></div>
-    <!-- </div> -->
-  </div> 
-<?php require_once("footer_art.php"); ?>
-</div>
-</div>
-
-<div class="clearfix"></div>
 
-<?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/one-column-with-submenu.php b/theme/one-column-with-submenu.php
index 2f53048..8a0b82d 100644
--- a/theme/one-column-with-submenu.php
+++ b/theme/one-column-with-submenu.php
@@ -2,14 +2,13 @@
 /*
 Template Name: One Column with submenu in the title
 */
+?>
 
-
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
-        <div class="container">
-        
+    <div class="container two_columns">
+        <div class="col-xs-12">
             <div class="page_title with_subpages_list">
                 <h1><?php the_title(); ?></h1>
                 
@@ -44,13 +43,9 @@ require_once("header.php"); ?>
                 <br />
                 <div class="clear"></div>
             </div>
-            
-            <?php require_once("footer_art.php"); ?>
         </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/one-column-without-title.php b/theme/one-column-without-title.php
index 1d72b32..3624d95 100644
--- a/theme/one-column-without-title.php
+++ b/theme/one-column-without-title.php
@@ -2,26 +2,23 @@
 /*
 Template Name: One Column without page title
 */
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
-        <div class="container">
-            <div class="content without_sidebar">
+    <div class="container two_columns">
+        <div class="content without_sidebar row">
+            <div class="col-xs-12">
             <?php while ( have_posts() ) : the_post(); ?>
                 <?php the_content(); ?>
             <?php endwhile; // End the loop. Whew. ?>
                 <br />
                 <div class="clear"></div>
             </div>
-            </div>
-            
-            <?php require_once("footer_art.php"); ?>
+        </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/one-column.php b/theme/one-column.php
index edeb106..3497e30 100644
--- a/theme/one-column.php
+++ b/theme/one-column.php
@@ -2,31 +2,28 @@
 /*
 Template Name: One Column
 */
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
-        <div class="container">
-            
-            <div class="page_title">
-                <h1><?php the_title(); ?></h1>
-            </div>
-            
-            <div class="content without_sidebar">
-            <?php while ( have_posts() ) : the_post(); ?>
-                <?php the_content(); ?>
-            <?php endwhile; // End the loop. Whew. ?>
-                <br />
-                <div class="clear"></div>
-        
+    <div class="container two_columns">
+        <div class="content without_sidebar">
+            <div class="col-sm-12">
+
+                <div class="page_title">
+                    <h1><?php the_title(); ?></h1>
+                </div>
+
+                <?php while ( have_posts() ) : the_post(); ?>
+                    <?php the_content(); ?>
+                <?php endwhile; // End the loop. Whew. ?>
+                    <br />
+                    <div class="clear"></div>
             </div>
-            <?php require_once("footer_art.php"); ?>
         </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/page-applications.php b/theme/page-applications.php
index 6dd60a8..df79498 100644
--- a/theme/page-applications.php
+++ b/theme/page-applications.php
@@ -8,19 +8,18 @@ add_action('wp_head', function() {
     echo '<link rel="stylesheet" type="text/css" media="all" 
href="'.get_bloginfo('template_url').'/css/project.css" />';
 });
 
-
-
 /*
  * Remove feed from this page
  */
 //automatic_feed_links(false);
 //remove_theme_support('automatic-feed-links');
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
     <div id="container">
-        <div class="container_12">
+        <div class="container">
         
             <div class="page_title">
                 <h1><?php the_title(); ?></h1>
@@ -44,11 +43,11 @@ require_once("header.php"); ?>
                 
                 <hr class="top_shadow" />
                 
-                <div class="grid_3 alpha">
+                <div class="col-sm-3">
                     <?php include('applications_sidebar.php'); ?>
                 </div>
                 
-                <div class="grid_9 omega">
+                <div class="col-sm-9">
                     
                     <div class="applications_featured">
                         <?php while ( have_posts() ) : the_post(); ?>
@@ -125,13 +124,9 @@ require_once("header.php"); ?>
                 <?php endif; ?>
                 
             </div>
-            <?php $footer_art = 'applications'; ?>
-            <?php require_once("footer_art.php"); ?>
         </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/page-apply.php b/theme/page-apply.php
index 75794cc..3a21171 100644
--- a/theme/page-apply.php
+++ b/theme/page-apply.php
@@ -64,9 +64,9 @@ if (array_key_exists('submit', $_POST)) {
 }
 
 ?>
-<?php require_once("header.php"); ?>
+<?php get_header(); ?>
 <!-- container -->
-<div id="container" class="two_columns">
+<div id="foundation" class="two_columns">
     <div class="container">
 
      <div class="page_title">
@@ -184,13 +184,9 @@ if (array_key_exists('submit', $_POST)) {
 <br />
 <div class="clear"></div>
 </div>
-
-<?php require_once("footer_art.php"); ?>
 </div>
 </div>
 
 <div class="clearfix"></div>
 
-<?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/page-home.php b/theme/page-home.php
index e8de3a0..20ddd24 100644
--- a/theme/page-home.php
+++ b/theme/page-home.php
@@ -77,8 +77,6 @@ The GNOME Project is a diverse international community which involves hundreds o
 
 
 <!-- END container -->
-               
-        <?php require_once("footer_art.php"); ?>
         </div>
     </div>
 </div>
diff --git a/theme/page-membership.php b/theme/page-membership.php
index a554b37..038594d 100644
--- a/theme/page-membership.php
+++ b/theme/page-membership.php
@@ -12,16 +12,17 @@ if (false === ($members = get_transient('foundation_members_list'))) {
     set_transient('foundation_members_list', $members, 60*60*12);
     
 }
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
+    <div id="foundation" class="two_columns">
         <div class="container">
-               <div class="page_title">
-                 <h1><?php the_title(); ?></h1>
-               </div>        
-               <div class="clearfix"></div>
+            <div class="page_title">
+                <h1><?php the_title(); ?></h1>
+            </div>
+        <div class="clearfix"></div>
             
             <div class="content without_sidebar">
             <?php while ( have_posts() ) : the_post(); ?>
@@ -45,13 +46,9 @@ require_once("header.php"); ?>
                 <br />
                 <div class="clear"></div>
             </div>
-            
-            <?php require_once("footer_art.php"); ?>
         </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/page-news.php b/theme/page-news.php
index b8d4851..aed6db8 100644
--- a/theme/page-news.php
+++ b/theme/page-news.php
@@ -4,34 +4,26 @@
  * @subpackage Grass Theme
  */
 
-add_action('wp_head', 'add_news_stylesheet');
-
-function add_news_stylesheet() {
-    echo '<link rel="stylesheet" type="text/css" media="all" 
href="'.get_bloginfo('template_url').'/css/news.css" />';
-}
-
 $is_news_home = true;
 
-
 /*
  * Add link to global feeds instead of current page comments
  */
-add_theme_support( 'automatic-feed-links');
 add_action('wp_head', function() {
    echo '<link rel="alternate" type="application/rss+xml" title="'.get_bloginfo('name').' &raquo; Feed" 
href="'.home_url('/').'feed/" />'; 
 });
+?>
 
-
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
     <div id="container" class="two_columns">
         <div class="container">
-        
-            <div class="page_title">
-                <h1><?php echo __('News', 'grass');?></h1>
+            <div class="col-xs-12">
+                <div class="page_title">
+                    <h1><?php esc_html_e('News', 'grass');?></h1>
+                </div>
             </div>
-            
             <div class="content col-md-9">
             
                 <?php the_content(); ?>
@@ -56,26 +48,20 @@ require_once("header.php"); ?>
                 </ul>
                 
                 <?php if (  $wp_query->max_num_pages > 1 ) : ?>
-                <div class="page_navigation">
+                <div class="page_navigation clearfix">
                     <span class="next"><?php previous_posts_link(__('Newer posts', 'grass')); ?></span>
                     <span class="prev"><?php next_posts_link(__('Older posts', 'grass')); ?></span>
-                    <div class="clear"></div>
                 </div>
                 <?php endif; ?>
                 <div class="clear"></div>
-                <div class="clearfix"></div>
-
             </div>
             
             <div class="sidebar col-md-3">
                 <?php require_once("news_sidebar.php");?>
             </div>
-            <?php require_once("footer_art.php"); ?>
         </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/page-press.php b/theme/page-press.php
index 9ad9946..7f4e0e6 100644
--- a/theme/page-press.php
+++ b/theme/page-press.php
@@ -4,30 +4,25 @@
  * @subpackage Grass Theme
  */
 
-add_action('wp_head', 'add_news_stylesheet');
-
-function add_news_stylesheet() {
-    echo '<link rel="stylesheet" type="text/css" media="all" 
href="'.get_bloginfo('template_url').'/css/news.css" />';
-}
-
 $is_news_home = true;
 
 /*
  * Add link to press feeds instead of current page comments
  */
-automatic_feed_links(false);
 add_action('wp_head', function() {
    echo '<link rel="alternate" type="application/rss+xml" title="'.get_bloginfo('name').' &raquo; ' . 
get_the_title() . ' Feed" href="'.home_url('/').'category/press/feed/" />'; 
 });
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
     <div id="container" class="two_columns">
         <div class="container">
-        
-            <div class="page_title">
-                <h1><?php the_title(); ?></h1>
+            <div class="col-xs-12">
+                <div class="page_title">
+                    <h1><?php the_title(); ?></h1>
+                </div>
             </div>
             
             <div class="content col-md-8">
@@ -71,12 +66,9 @@ require_once("header.php"); ?>
                 <?php require_once("news_sidebar.php");?>
                 
             </div>
-            <?php require_once("footer_art.php"); ?>
         </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/page-previous-donors.php b/theme/page-previous-donors.php
index 662e4d9..65001c4 100644
--- a/theme/page-previous-donors.php
+++ b/theme/page-previous-donors.php
@@ -39,20 +39,19 @@ foreach (array(
 
     }
 }
+?>
 
-
-
-
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
-        <div class="container_12">
+    <div class="container two_columns">
         
+            <div class="col-xs-12">
             <?php require_once('inc/page-title.php'); ?>
+            </div>
             
-            <div class="content without_sidebar">
-                
+            <div class="row content without_sidebar">
+                <div class="col-xs-12">
                 <?php
                 
                 if (isset($donors)) {
@@ -63,7 +62,7 @@ require_once("header.php"); ?>
                         if ($level_count > 1) { // The count behaves weirdly for me. Always +1.
                             echo "<h4>$fname_dispname_map[$level]</h4>\n";
                             echo '<ul class="col-3">'."\n";
-                            foreach ($donor_array as $donor_line) {
+                 foreach ($donor_array as $donor_line) {
                                 $donor = trim($donor_line, "\x00..\x20");
                                 if (strlen($donor) > 0)
                                     echo "  <li>".htmlspecialchars($donor)."</li>\n";
@@ -82,13 +81,9 @@ require_once("header.php"); ?>
                 <br />
                 <div class="clear"></div>
             </div>
-            
-            <?php require_once("footer_art.php"); ?>
         </div>
-    </div>
+    </div>    </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/project.php b/theme/project.php
index e4c57dc..19260cf 100644
--- a/theme/project.php
+++ b/theme/project.php
@@ -10,22 +10,23 @@ add_action('wp_head', function() {
     echo '<script type="text/javascript" 
src="'.get_bloginfo('template_url').'/pack/jcarousel/jquery.jcarousel.min.js"></script>'."\n";
     echo '<script type="text/javascript" 
src="'.get_bloginfo('template_url').'/js/project.js"></script>'."\n";
 });
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
     <div id="container" class="two_columns">
-        <div class="container_12">
+        <div class="container">
         
             <div class="page_title">
                 <h1><a href="<?php bloginfo('url'); ?>/applications/"><?php echo __('Applications', 
'grass');?></a></h1>
             </div>
         
-            <div class="sidebar">
+            <div class="sidebar col-sm-3">
                 <?php include('applications_sidebar.php'); ?>
             </div>
             
-            <div class="content">
+            <div class="content col-sm-9">
             <?php while ( have_posts() ) : the_post(); ?>
             
                 <div class="project">
@@ -305,15 +306,9 @@ require_once("header.php"); ?>
             <?php endwhile; // End the loop. Whew. ?>
             
             </div>
-            <?php
-            $footer_art = 'applications';
-            require_once("footer_art.php");
-            ?>
         </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/search.php b/theme/search.php
index 8f22f81..ceeac15 100644
--- a/theme/search.php
+++ b/theme/search.php
@@ -3,16 +3,16 @@
  * @package GNOME Website
  * @subpackage Grass Theme
  */
+?>
 
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
-    <div id="container" class="two_columns">
-        <div class="container_12">
+    <div class="container two_columns">
 
             <?php if ( have_posts() ) : ?>
                 <div class="page_title">
-                    <h1><?php _e( 'Looking for', 'grass' ); ?> <em><?php echo 
htmlentities(strip_tags($_GET['s']));?></em>...</h1>
+                    <h1><?php esc_html_e( 'Looking for', 'grass' ); ?> <em><?php echo 
htmlentities(strip_tags($_GET['s']));?></em>...</h1>
                 </div>
                 
                 <div class="content">
@@ -41,26 +41,26 @@ require_once("header.php"); ?>
             
                 <div class="content without_sidebar">
                     
-                    <div class="grid_10 alpha prefix_1 omega suffix_1">
+                    <div class="col-lg-7 col-lg-offset-0 col-sm-8 col-sm-offset-0 col-xs-7 col-xs-offset-2">
                     
                         <p><?php get_search_form(); ?></p>
                         
                         <hr />
                     
-                        <h2><?php _e( 'Sorry, but nothing was found.', 'grass' ); ?></h2>
+                        <h2><?php esc_html_e( 'Sorry, but nothing was found.', 'grass' ); ?></h2>
                         
-                        <p><?php _e( 'Suggestions:', 'grass' ); ?></p>
+                        <p><?php esc_html_e( 'Suggestions:', 'grass' ); ?></p>
                         
                         <ul>
-                            <li><?php _e( 'Make sure all words are spelled correctly.', 'grass' ); ?></li>
-                            <li><?php _e( 'Try different keywords.', 'grass' ); ?></li>
-                            <li><?php _e( 'Try fewer keywords.', 'grass' ); ?></li>
+                            <li><?php esc_html_e( 'Make sure all words are spelled correctly.', 'grass' ); 
?></li>
+                            <li><?php esc_html_e( 'Try different keywords.', 'grass' ); ?></li>
+                            <li><?php esc_html_e( 'Try fewer keywords.', 'grass' ); ?></li>
                         </ul>
                         
                         <p>
                         <?php
                         printf(
-                                __( 'If you feel lost, you may want to search for %1$s in all GNOME websites 
on %2$s.', 'grass'),
+                              /* translators: %1$s is the search keyword, %2$s refers to Google */  __( 'If 
you feel lost, you may want to search for %1$s in all GNOME websites on %2$s.', 'grass'),
                                 '“'.htmlspecialchars(stripslashes(strip_tags($_GET['s']))).'”',
                                 '<a 
href="http://google.com/search?q='.htmlspecialchars(stripslashes(strip_tags($_GET['s']))).'%20site:gnome.org">Google</a>'
                             );
@@ -74,20 +74,8 @@ require_once("header.php"); ?>
                     
             </div>
             <?php endif; ?>
-            
-            <?php
-            if ( have_posts() ) :
-                $footer_art = 'search';
-            else:
-                $footer_art = 'search_no-results';
-            endif;
-            ?>
-            <?php require_once("footer_art.php"); ?>
-        </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>
diff --git a/theme/social_icons.php b/theme/social_icons.php
index 5fd544b..e8fe507 100644
--- a/theme/social_icons.php
+++ b/theme/social_icons.php
@@ -1,14 +1,6 @@
-<div class="social_network_icons">
-    <a href="https://gnome.org/feed"; target="_blank">
-        <i class="fa fa-2x fa-rss"></i>
-    </a>
-    <a href="https://www.facebook.com/GNOMEDesktop"; target="_blank">
-        <i class="fa fa-2x fa-facebook"></i>
-    </a>
-    <a href="https://twitter.com/gnome"; target="_blank">
-        <i class="fa fa-2x fa-twitter"></i>
-    </a>
-    <a href="https://plus.google.com/+gnome"; target="_blank">
-        <i class="fa fa-2x fa-google-plus"></i>
-    </a>
-</div>
+    <div class="social_network_icons">
+        <a href="https://gnome.org/feed"; target="_blank" aria-label="RSS Feed"><i class="fa fa-2x fa-rss" 
aria-hidden="true" title="RSS Feed"></i></a>
+        <a href="https://www.facebook.com/GNOMEDesktop"; target="_blank" aria-label="GNOME on Facebook"><i 
class="fa fa-2x fa-facebook" aria-hidden="true" title="GNOME on Facebook"></i></a>
+        <a href="https://twitter.com/gnome"; target="_blank" aria-label="GNOME on Twitter"><i class="fa fa-2x 
fa-twitter" aria-hidden="true" title="GNOME on Twitter"></i></a>
+        <a href="https://plus.google.com/+gnome"; target="_blank" aria-label="GNOME on Google Plus"><i 
class="fa fa-2x fa-google-plus" aria-hidden="true" title="GNOME on Google Plus"></i></a>
+    </div>
diff --git a/theme/taxonomy-project_category.php b/theme/taxonomy-project_category.php
index f0983ea..54ac30c 100644
--- a/theme/taxonomy-project_category.php
+++ b/theme/taxonomy-project_category.php
@@ -7,23 +7,23 @@
 add_action('wp_head', function() {
     echo '<link rel="stylesheet" type="text/css" media="all" 
href="'.get_bloginfo('template_url').'/css/project.css" />'."\n";
 });
+?>
 
-
-require_once("header.php"); ?>
+<?php get_header(); ?>
 
     <!-- container -->
     <div id="container" class="two_columns">
-        <div class="container_12">
+        <div class="container">
         
             <div class="page_title">
                 <h1><a href="<?php bloginfo('url'); ?>/applications/"><?php echo __('Applications', 
'grass');?></a></h1>
             </div>
         
-            <div class="sidebar">
+            <div class="sidebar col-sm-3">
                 <?php include('applications_sidebar.php'); ?>
             </div>
             
-            <div class="content">
+            <div class="content col-sm-9">
             
                 <div class="applications_list">
                     <div class="row">
@@ -64,15 +64,9 @@ require_once("header.php"); ?>
 
                 <div class="clear"></div>
             </div>
-            <?php
-            $footer_art = 'applications';
-            require_once("footer_art.php");
-            ?>
         </div>
     </div>
     
     <div class="clearfix"></div>
     
-    <?php require_once("footer.php"); ?>
-</body>
-</html>
+<?php get_footer(); ?>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]