Changeset 2105

Timestamp:

11/22/2015 03:55:11 PM (9 years ago)

Author:

ocean90

Message:

Translate: Update 'header' and 'helper functions' templates for GlotPress as a plugin.

See #1352.

Location:

sites/trunk/translate.wordpress.org/public_html/gp-templates-new

Files:

• header.php (modified) (3 diffs)
• helper-functions.php (modified) (2 diffs)

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/header.php

@@ -1 +1 @@
 <?php
-wp_enqueue_style( 'base' );
-wp_enqueue_script( 'jquery' );
-
 global $pagetitle;
 $pagetitle = gp_title();
@@ -16 +13 @@
         <a class="menu-link" href="//make.wordpress.org/polyglots/handbook/">Translator Handbook</a>
         <?php
-        if (GP::$user->logged_in()):
-            $user = GP::$user->current();
+        if ( is_user_logged_in() ):
+            $user = wp_get_current_user();
 
             printf( __('Hi, %s.'), '<a href="'.gp_url( '/profile' ).'">'.$user->user_login.'</a>' );
             ?>
-            <a href="<?php echo gp_url('/logout')?>"><?php _e('Log out'); ?></a>
+            <a href="<?php echo esc_url( wp_logout_url( home_url( '/' ) ) ); ?>"><?php _e( 'Log out' ); ?></a>
         <?php else: ?>
-            <strong><a href="<?php echo gp_url_login(); ?>"><?php _e('Log in'); ?></a></strong>
+            <strong><a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a></strong>
         <?php endif; ?>
         <?php do_action( 'after_hello' ); ?>
@@ -44 +41 @@
         <?php endif; ?>
         <?php echo gp_breadcrumb(); ?>
-        <?php do_action( 'after_notices' ); ?>
+        <?php do_action( 'gp_after_notices' ); ?>
 

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/helper-functions.php

@@ -1 +1 @@
 <?php
+wp_register_style( 'wporg-translate', 'https://wordpress.org/translate/gp-templates-new/style.css', array( 'base' ), '20151111' );
+gp_enqueue_style( 'wporg-translate' );
 
-wp_enqueue_style( 'wporg', gp_url_ssl( gp_url_public_root() ) . 'gp-templates/style.css', array( 'base' ), '20151111' );
-
-add_action( 'tmpl_load_locations', function( $locations, $template, $args, $template_path ) {
+add_action( 'gp_tmpl_load_locations', function( $locations, $template, $args, $template_path ) {
     $core_templates = GP_PATH . 'gp-templates/';
     require_once $core_templates . 'helper-functions.php';
@@ -9 +9 @@
     return $locations;
 }, 50, 4 );
-