From 2bdb0f1786eb6f3fdc702cfa49ba24a63bc537c1 Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Sun, 29 Mar 2015 16:53:26 +0200
Subject: [PATCH] Fixes titles for pages

---
 wp-content/themes/aktiv2014/entries.php           | 3 +--
 wp-content/themes/aktiv2014/index.php             | 4 ++--
 wp-content/themes/aktiv2014/page-mailinglists.php | 2 +-
 wp-content/themes/aktiv2014/page-profile.php      | 2 +-
 wp-content/themes/aktiv2014/page-search.php       | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/wp-content/themes/aktiv2014/entries.php b/wp-content/themes/aktiv2014/entries.php
index ea2fe2e..54fa9f4 100644
--- a/wp-content/themes/aktiv2014/entries.php
+++ b/wp-content/themes/aktiv2014/entries.php
@@ -1,7 +1,6 @@
 <?php if( have_posts() ) : while( have_posts() ) : the_post();
     $post_category = get_category_formatted();
     ?>
-    
     <article <?php post_class(); ?>>
     <div class="text-body">
         <div>
@@ -40,4 +39,4 @@
     </div>
     </article> <!-- .post -->
 
-<?php endwhile; endif; ?>
\ No newline at end of file
+<?php endwhile; endif; ?>
diff --git a/wp-content/themes/aktiv2014/index.php b/wp-content/themes/aktiv2014/index.php
index 926fd9e..3480d55 100644
--- a/wp-content/themes/aktiv2014/index.php
+++ b/wp-content/themes/aktiv2014/index.php
@@ -8,8 +8,8 @@
                 <a href="#dismiss-introduction" data-toggle-introduction class="button dismiss-button" title="Lukk">Oki doki!</a>
             </div>
             <h2>Siste nytt</h2>
-        <?php elseif( !is_single() ): ?>
-            <h1 class="page-title"><?php wp_title("", true); ?></h1>
+        <?php elseif( is_page() ): ?>
+            <h2 class="page-title"><?php the_title(); ?></h2>
         <?php endif; ?>
 
         <?php get_template_part('entries'); ?>
diff --git a/wp-content/themes/aktiv2014/page-mailinglists.php b/wp-content/themes/aktiv2014/page-mailinglists.php
index 8c43760..1921ece 100644
--- a/wp-content/themes/aktiv2014/page-mailinglists.php
+++ b/wp-content/themes/aktiv2014/page-mailinglists.php
@@ -8,7 +8,7 @@
 
 <div class="container page-mailinglists">
 
-    <h1 class="page-title"><?php wp_title("", true); ?></h1>
+    <h2 class="page-title"><?php the_title(); ?></h2>
 
     <div class="search-about">
         <?php the_post(); the_content(); ?>
diff --git a/wp-content/themes/aktiv2014/page-profile.php b/wp-content/themes/aktiv2014/page-profile.php
index 7433db7..062927b 100644
--- a/wp-content/themes/aktiv2014/page-profile.php
+++ b/wp-content/themes/aktiv2014/page-profile.php
@@ -22,7 +22,7 @@ get_header();
 ?>
 <div class="container profile">
 
-<h1 class="page-title"><?php echo $logged_in_user ? "Min": $user->display_name." sin" ;?> aktivprofil</h1>
+<h2 class="page-title"><?php echo $logged_in_user ? "Min": $user->display_name." sin" ;?> aktivprofil</h2>
 
 <div class="profile-details">
     <div class="inner">
diff --git a/wp-content/themes/aktiv2014/page-search.php b/wp-content/themes/aktiv2014/page-search.php
index 6687ffb..9c4859b 100644
--- a/wp-content/themes/aktiv2014/page-search.php
+++ b/wp-content/themes/aktiv2014/page-search.php
@@ -9,7 +9,7 @@
 <div class="container page-user-search">
 
 <div id="content">
-    <h1 class="page-title"><?php wp_title("", true); ?></h1>
+    <h2 class="page-title"><?php the_title(); ?></h2>
     <div class="search-form">
         <form method="get">
             <input type="text" id="id_user_query" class="search-field" name="q" placeholder="Søk på navn, epost, eller brukernavn" autofocus />