Merge lp:~canonical-website-editors/resource-centre/remove-mobile into lp:resource-centre

Proposed by Graham Bancroft
Status: Merged
Approved by: Graham Bancroft
Approved revision: 97
Merged at revision: 97
Proposed branch: lp:~canonical-website-editors/resource-centre/remove-mobile
Merge into: lp:resource-centre
Diff against target: 50 lines (+0/-29)
2 files modified
includes/_site_nav.php (+0/-1)
index.php (+0/-28)
To merge this branch: bzr merge lp:~canonical-website-editors/resource-centre/remove-mobile
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Review via email: mp+322669@code.launchpad.net

Description of the change

## Done

Remove 'Phone and Tablet' from main nav and the latest from phone and tablet section from the homepage

## QA

Go to http://insights.canonicalwebteam.com/ and see that 'Phone and Tablet' has been removed from main nav and the latest from phone and tablet section has been removed from the homepage

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Code and QA +1. I noticed there is still "Phone and tablet" in the All topics aside. Is this planned to stay?

review: Approve
Revision history for this message
Graham Bancroft (gbancroft-canonical) wrote :

It is for now, Peter asked for it to stay

Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Thanks. In that case, good to go.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'includes/_site_nav.php'
2--- includes/_site_nav.php 2016-08-23 15:32:40 +0000
3+++ includes/_site_nav.php 2017-04-18 10:58:31 +0000
4@@ -5,7 +5,6 @@
5 <li class="nav-cloud-and-server<?php if ( $current_tax == "cloud-and-server" ) : echo ' active'; endif; ?>"><a href="<?php echo get_site_url(); ?>/cloud-and-server/">Cloud and server</a></li>
6 <li class="nav-iot<?php if ( $current_tax == "internet-of-things" ) : echo ' active'; endif; ?>"><a href="<?php echo get_site_url(); ?>/internet-of-things/">IoT</a></li>
7 <li class="nav-desktop<?php if ( $current_tax == "desktop" ) : echo ' active'; endif; ?>"><a href="<?php echo get_site_url(); ?>/desktop/">Desktop</a></li>
8- <li class="nav-phone-and-tablet<?php if ( $current_tax == "phone-and-tablet" ) : echo ' active'; endif; ?>"><a href="<?php echo get_site_url(); ?>/phone-and-tablet/">Phone and tablet</a></li>
9 <li class="nav-press-center<?php if ( $current_tax == "press-center" ) : echo ' active'; endif; ?>"><a href="<?php echo get_site_url(); ?>/press-centre/">Press centre</a></li>
10 </ul>
11
12
13=== modified file 'index.php'
14--- index.php 2016-08-23 07:58:03 +0000
15+++ index.php 2017-04-18 10:58:31 +0000
16@@ -144,34 +144,6 @@
17 wp_reset_query();
18 /* ============== end pull in latest desktop articles ============== */ ?>
19
20-<?php /* ============== pull in latest phone and tablet articles ============== */
21-$paged = (get_query_var('paged')) ? get_query_var('paged') : 1; // Needed for pagination
22-$exclude_cat = 'downloads';
23-$category = get_category_by_slug($exclude_cat);
24-$query = new WP_Query( array(
25- 'cat' => -$category->cat_ID,
26- 'order' => 'DESC',
27- 'paged' => $paged,
28- 'post__not_in' => $do_not_duplicate,
29- 'post_type' => 'post',
30- 'posts_per_page' => 5,
31- 'group' => 'phone-and-tablet'
32- ));
33-?><?php if (have_posts()) : ?>
34-<section class="box eight-col">
35-<h2 class="section-title"><a href="/phone-and-tablet">Phone and Tablet</a></h2>
36-
37- <?php
38- while( $query->have_posts() ):
39- $query->the_post();
40- $do_not_duplicate[] = $post->ID ?>
41- <?php get_template_part("content_home"); ?>
42- <?php endwhile; ?>
43-</section><!-- ./eight-col -->
44-<?php endif; // if have_posts ends
45-wp_reset_query();
46-/* ============== end pull in latest phone articles ============== */ ?>
47-
48 <?php /* ============== pull in latest events ============== */
49 $paged = (get_query_var('paged')) ? get_query_var('paged') : 1; // Needed for pagination
50 $exclude_cat = 'downloads';

Subscribers

People subscribed via source and target branches

to all changes: