<?php - /* - * Print the <title> tag based on what is being viewed. - */ - global $page, $paged; - - wp_title( '|', true, 'right' ); - - // Add the blog name. - bloginfo( 'name' ); - - // Add the blog description for the home/front page. - $site_description = get_bloginfo( 'description', 'display' ); - if ( $site_description && ( is_home() || is_front_page() ) ) - echo " | $site_description"; - - // Add a page number if necessary: - if ( $paged >= 2 || $page >= 2 ) - echo ' | ' . 'Page ' . max( $paged, $page ); -

- */ -?> - - - - - class="no-js"> - - - -<?php - /* - * Print the <title> tag based on what is being viewed. - */ - global $page, $paged; - - wp_title( '|', true, 'right' ); - - // Add the blog name. - bloginfo( 'name' ); - - // Add the blog description for the home/front page. - $site_description = get_bloginfo( 'description', 'display' ); - if ( $site_description && ( is_home() || is_front_page() ) ) - echo " | $site_description"; - - // Add a page number if necessary: - if ( $paged >= 2 || $page >= 2 ) - echo ' | ' . 'Page ' . max( $paged, $page ); - - ?> - - - - * tag of your theme, or you will break many plugins, which - * generally use this hook to add elements to such - * as styles, scripts, and meta tags. - */ - wp_head(); -?> - - -> -

- -

- - - -

- - -

- -

- + section and everything up till

+ */ +?> + + + + + class="no-js"> + + + +<?php + /* + * Print the <title> tag based on what is being viewed. + */ + global $page, $paged; + + wp_title( '|', true, 'right' ); + + // Add the blog name. + bloginfo( 'name' ); + + // Add the blog description for the home/front page. + $site_description = get_bloginfo( 'description', 'display' ); + if ( $site_description && ( is_home() || is_front_page() ) ) + echo " | $site_description"; + + // Add a page number if necessary: + if ( $paged >= 2 || $page >= 2 ) + echo ' | ' . 'Page ' . max( $paged, $page ); + + ?> + + + + + + + + + + + + + + * tag of your theme, or you will break many plugins, which + * generally use this hook to add elements to such + * as styles, scripts, and meta tags. + */ + wp_head(); +?> + + +> +

+ +

+ + + +

+ + +

+ +

\ No newline at end of file diff --git a/js/adapt.js b/js/adapt.js new file mode 100644 index 000000000..cd2fc19c9 --- /dev/null +++ b/js/adapt.js @@ -0,0 +1,145 @@ +/* + Adapt.js licensed under GPL and MIT. + + Read more here: http://adapt.960.gs +*/ + +// Closure. +(function(w, d, config, undefined) { + // If no config, exit. + if (!config) { + return; + } + + // Empty vars to use later. + var url, url_old, timer; + + // Alias config values. + var callback = typeof config.callback === 'function' ? config.callback : undefined; + var path = config.path ? config.path : ''; + var range = config.range; + var range_len = range.length; + + // Create empty link tag: + // + var css = d.createElement('link'); + css.rel = 'stylesheet'; + css.media = 'screen'; + + // Called from within adapt(). + function change(i, width) { + // Set the URL. + css.href = url; + url_old = url; + + // Call callback, if defined. + callback && callback(i, width); + } + + // Adapt to width. + function adapt() { + // This clearTimeout is for IE. + // Really it belongs in react(), + // but doesn't do any harm here. + clearTimeout(timer); + + // Parse browser width. + var width = w.innerWidth || d.documentElement.clientWidth || d.body.clientWidth || 0; + + // While loop vars. + var arr, arr_0, val_1, val_2, is_range, file; + + // How many ranges? + var i = range_len; + var last = range_len - 1; + + while (i--) { + // Blank if no conditions met. + url = ''; + + // Turn string into array. + arr = range[i].split('='); + + // Width is to the left of "=". + arr_0 = arr[0]; + + // File name is to the right of "=". + // Presuppoes a file with no spaces. + // If no file specified, make empty. + file = arr[1] ? arr[1].replace(/\s/g, '') : undefined; + + // Assume max if "to" isn't present. + is_range = arr_0.match('to'); + + // If it's a range, split left/right sides of "to", + // and then convert each one into numerical values. + // If it's not a range, turn maximum into a number. + val_1 = is_range ? parseInt(arr_0.split('to')[0], 10) : parseInt(arr_0, 10); + val_2 = is_range ? parseInt(arr_0.split('to')[1], 10) : undefined; + + // Check for maxiumum or range. + if ((!val_2 && i === last && width > val_1) || (width > val_1 && width <= val_2)) { + // Build full URL to CSS file. + file && (url = path + file); + + // Exit the while loop. No need to continue + // if we've already found a matching range. + break; + } + } + + // Was it created yet? + if (!url_old) { + // Apply changes. + change(i, width); + + // Add the CSS, only if path is defined. + // Use faster document.head if possible. + path && (d.head || d.getElementsByTagName('head')[0]).appendChild(css); + } + else if (url_old !== url) { + // Apply changes. + change(i, width); + } + } + + // Fire off once. + adapt(); + + // Slight delay. + function react() { + // Clear the timer as window resize fires, + // so that it only calls adapt() when the + // user has finished resizing the window. + clearTimeout(timer); + + // Start the timer countdown. + timer = setTimeout(adapt, 16); + // -----------------------^^ + // Note: 15.6 milliseconds is lowest "safe" + // duration for setTimeout and setInterval. + // + // http://www.nczonline.net/blog/2011/12/14/timer-resolution-in-browsers + } + + // Do we want to watch for + // resize and device tilt? + if (config.dynamic) { + // Event listener for window resize, + // also triggered by phone rotation. + if (w.addEventListener) { + // Good browsers. + w.addEventListener('resize', react, false); + } + else if (w.attachEvent) { + // Legacy IE support. + w.attachEvent('onresize', react); + } + else { + // Old-school fallback. + w.onresize = react; + } + } + +// Pass in window, document, config, undefined. +})(this, this.document, ADAPT_CONFIG); \ No newline at end of file diff --git a/js/adapt.min.js b/js/adapt.min.js new file mode 100644 index 000000000..22d85ab99 --- /dev/null +++ b/js/adapt.min.js @@ -0,0 +1 @@ +(function(a,b,c,d){function e(){clearTimeout(i);for(var c=a.innerWidth||b.documentElement.clientWidth||b.body.clientWidth||0,e,f,o,p,q=m,u=m-1;q--;){g="",e=l[q].split("="),f=e[0],p=e[1]?e[1].replace(/\s/g,""):d,e=(o=f.match("to"))?parseInt(f.split("to")[0],10):parseInt(f,10),f=o?parseInt(f.split("to")[1],10):d;if(!f&&q===u&&c>e||c>e&&c<=f){p&&(g=k+p);break}}h?h!==g&&(h=n.href=g,j&&j(q,c)):(h=n.href=g,j&&j(q,c),k&&(b.head||b.getElementsByTagName("head")[0]).appendChild(n))}function f(){clearTimeout(i),i=setTimeout(e,16)}if(c){var g,h,i,j=typeof c.callback=="function"?c.callback:d,k=c.path?c.path:"",l=c.range,m=l.length,n=b.createElement("link");n.rel="stylesheet",n.media="screen",e(),c.dynamic&&(a.addEventListener?a.addEventListener("resize",f,!1):a.attachEvent?a.attachEvent("onresize",f):a.onresize=f)}})(this,this.document,ADAPT_CONFIG) \ No newline at end of file From 05ad5120502852b6772910c7df88d8b45c1cce53 Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Fri, 22 Jun 2012 00:11:47 -0400 Subject: [PATCH 03/13] modify style.css --- style.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/style.css b/style.css index bb9dd5555..c12a4e6d7 100644 --- a/style.css +++ b/style.css @@ -1,9 +1,9 @@ -/* -Theme Name: Argo -Description: A feature-rich starter theme designed as a foundation to extend or use in conjunction with an Argo child theme -Author: Project Argo -Version: 1.0 -*/ - -@import url(css/960.css); +/* +Theme Name: Largo +Description: A responsive news theme by Media Toybox based on the Argo theme developed at NPR by Project Argo +Author: Media Toybox +Version: 0.1 +*/ + +/*@import url(css/960.css);*/ @import url(css/foundation.css); \ No newline at end of file From 42c6f13345102bd4204b5682e581aac2eae1055b Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Tue, 26 Jun 2012 12:41:17 -0400 Subject: [PATCH 04/13] various style tweaks typography and some other issues to account for responsive layout --- css/foundation.css | 106 ++++++++++++++++++++++++++++----------------- css/master.css | 4 +- 2 files changed, 69 insertions(+), 41 deletions(-) diff --git a/css/foundation.css b/css/foundation.css index 6728ae601..67bfd4f92 100755 --- a/css/foundation.css +++ b/css/foundation.css @@ -149,7 +149,7 @@ button { width: auto; overflow: visible; } /* Basic HTML */ body { - font: 14px "Helvetica Neue", Helvetica, Arial, sans-serif; + font: 16px "Helvetica Neue", Helvetica, Arial, sans-serif; line-height: 1.5; color: #333; } @@ -187,22 +187,42 @@ hr { margin-bottom: 15px; } - h1 { - font-size: 50px; +h1, h2, h3, h4, h5, h6, h7, h8 { + font: 16px Georgia, Times, "Times New Roman", serif; + +} + +h1 { + font-size: 3.375em; line-height: 1; } h2 { - font-size: 30px; + font-size: 2.75em; font-weight: normal; line-height: 1; } h3 { - font-size: 21px; + font-size: 2.25em; font-weight: normal; line-height: 1; } +h4 { + font-size: 1.833em; + font-weight:normal; + line-height:1; +} +h5 { + font-size: 1.5em; + font-weight:normal; + line-height:1; +} +h6 { + font-size: 1.222em; + font-weight:normal; + line-height:1; +} /* lists */ @@ -480,10 +500,12 @@ margin-left: 70px; #topics-bar h4 { margin: 0; + font-size:1.5em; } #topics-bar ul { - width: 862px; + /*width: 862px;*/ + width:100%; } #topics-bar h5 { @@ -819,7 +841,7 @@ border-bottom: none; width: 610px; overflow: hidden; } - +/* #content h2 { margin: 10px 0; } @@ -846,11 +868,13 @@ border-bottom: none; line-height: 1.3; font-weight: bold; } - +*/ .post ul { list-style: disc; } - +.post ol { + list-style: decimal; +} .post li { margin: 0 0 10px 30px; } @@ -858,12 +882,12 @@ border-bottom: none; .ie8 .post li, .ie7 .post li, .ie6 .post li { margin: 0 0 10px 50px; } - +/* .entry-title { font-size: 30px; margin: 10px 0; } - +*/ #content h2 a { color: #333; font-weight: normal; @@ -914,12 +938,12 @@ margin: 10px 0; } .single .bottom-meta h5 { -padding-bottom: 10px; -border-bottom: 1px solid #ddd; + padding-bottom: 10px; + border-bottom: 1px solid #ddd; } #content .post-meta h6 { - font-size: 12px; + /*font-size: 0.815 em;*/ font-weight: normal; font-style: italic; margin: 0 0 10px 0; @@ -928,7 +952,8 @@ border-bottom: 1px solid #ddd; #content .post-meta h5 { font-weight: normal; - font-size: 12px !important; + /*font-size: 12px !important;*/ + font: 0.815em "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 5px 0 0 0; color: #666; } @@ -946,7 +971,7 @@ border-bottom: 1px solid #ddd; .meta-gestures li { float: left; margin: 5px 10px 5px 0; - font-size: 11px; + font-size: 0.815em; } .ie8 .meta-gestures li, .ie7 .meta-gestures li, .ie6 .meta-gestures li { @@ -955,9 +980,9 @@ border-bottom: 1px solid #ddd; } .meta-gestures .meta-comments { -background: transparent url(../img/comment-icon.gif) no-repeat; - height: 18px; - padding-left: 20px; + background: transparent url(../img/comment-icon.gif) no-repeat; + height: 20px; + padding-left: 22px; float: right; } @@ -1084,7 +1109,6 @@ margin: 0; padding-top: 2px; border: 1px solid #eee; border-top: 2px solid #ddd; - background: transparent url(../img/rp-background.png) repeat-y; } #related-posts a { @@ -1093,17 +1117,17 @@ margin: 0; #related-post-nav { float:left; - width: 140px; + width: 30%; margin: 0; padding: 5px 0; } #related-post-nav li { - font-size: 11px; + font-size: 0.815em; } #related-post-nav h4 { - font-size: 11px; + font-size: 1em; margin: 0 0 5px 5px; } @@ -1121,15 +1145,18 @@ margin: 0; } #related-post-nav a.selected { -color: #fff; -background: #000 url("../img/related-arrow.gif") 0 center no-repeat; border: none; font-weight: bold; } + color: #fff; + background: #000; + border:none; + font-weight:bold; +} .items div { display:none; float:left; - padding:0 10px 0 20px; - width: 445px; - font-size: 11px; + padding:0 2.5% 0 5%; + width:62.5%; + font-size: 0.815em; } .ie6 .items div { @@ -1174,7 +1201,7 @@ background: #000 url("../img/related-arrow.gif") 0 center no-repeat; border: non .post-nav, .argo-pag { clear: both; border-bottom: 1px solid #ddd; - font-size: 12px; + font-size: 1em; } .post-nav li, .argo-pag li { @@ -1183,7 +1210,7 @@ background: #000 url("../img/related-arrow.gif") 0 center no-repeat; border: non #content .post-nav h5 { margin: 0; - font-size: 14px; + font-size: 1em; } #content .post-nav a, #content .argo-pag a { @@ -1191,20 +1218,20 @@ background: #000 url("../img/related-arrow.gif") 0 center no-repeat; border: non } .p-post { - width: 300px; + width: 50%; margin: 10px 0; float: left; } .n-post { float: right; - width: 300px; + width: 50%; text-align: right; margin: 10px 0; } .argo-pag { - font-size: 14px; + font-size: 1em; padding-bottom: 20px; border: none; float: right; @@ -1294,8 +1321,8 @@ padding-right: 0; } #content .half { - width: 300px; - font-size: 11px; + width: 50%; + font-size: 0.815em; } #content .aligncenter { @@ -1317,24 +1344,25 @@ padding-right: 0; } #content .pull-quote { - width: 300px; + width: 50%; border-bottom: none; border-left: 4px solid #333; padding-left: 20px; - font-size: 24px; + font-size: 1.5em; font-style: italic; line-height: 1.3; margin: 20px; + font: 16px Georgia, Times, "Times New Roman", serif; } #content .pull-quote h6 { - font-size: 12px; + font-size: 0.815em; font-style: italic; margin: 0 } #content .pull-quote p { - font-size: 24px; + font-size: 1.5em; } /* = Customized comment form styles via the twenty eleven theme diff --git a/css/master.css b/css/master.css index 149b5148d..75e8e102e 100644 --- a/css/master.css +++ b/css/master.css @@ -9,7 +9,7 @@ body { color: #333; } -h1 { +/*h1 { background: #eee url(../images/h1.png) no-repeat right center; border-bottom: 1px solid #ccc; padding: 10px 90px 10px 15px; @@ -22,7 +22,7 @@ h4, h5, h6 { line-height: 1; -} +}*/ a { color: #06c; From 6b94c9a522e491c74028c3d6c09bce2ba8b34f73 Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Tue, 26 Jun 2012 12:42:05 -0400 Subject: [PATCH 05/13] make related posts area responsive still to-do: make tabs look a little nicer --- content-single.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content-single.php b/content-single.php index 9bb989bb0..402ac7d23 100644 --- a/content-single.php +++ b/content-single.php @@ -40,13 +40,13 @@ if ( $rel_topics = argo_get_post_related_topics( 6 ) ) : ?>

$topic ): ?>

From 2847192aa93e76625cc634d2ede0b593bf0da8f2 Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Tue, 26 Jun 2012 12:42:20 -0400 Subject: [PATCH 06/13] remove utility and second nab (for now) --- header.php | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/header.php b/header.php index 694da694a..fe39cae57 100644 --- a/header.php +++ b/header.php @@ -171,28 +171,7 @@ - +

- -

\ No newline at end of file + +

\ No newline at end of file From c331698a4044c8d2a3e02a897184684d108ca983 Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Tue, 26 Jun 2012 12:42:38 -0400 Subject: [PATCH 07/13] fix widget title formatting --- sidebar-footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sidebar-footer.php b/sidebar-footer.php index a383bca1d..30363cb56 100644 --- a/sidebar-footer.php +++ b/sidebar-footer.php @@ -30,7 +30,7 @@

Browse archives by date

+ display(); ?> + + +

+ $this->menu, + 'plugin' => $plugin['slug'], + 'plugin_name' => $plugin['name'], + 'plugin_source' => $plugin['source'], + 'tgmpa-install' => 'install-plugin', + ), + admin_url( $this->parent_url_slug ) + ), + 'tgmpa-install' + ); + $method = ''; // Leave blank so WP_Filesystem can populate it as necessary + $fields = array( sanitize_key( 'tgmpa-install' ) ); // Extra fields to pass to WP_Filesystem + + if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, $fields ) ) ) + return true; + + if ( ! WP_Filesystem( $creds ) ) { + request_filesystem_credentials( $url, $method, true, false, $fields ); // Setup WP_Filesystem + return true; + } + + require_once ABSPATH . 'wp-admin/includes/plugin-install.php'; // Need for plugins_api + require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; // Need for upgrade classes + + /** Set plugin source to WordPress API link if available */ + if ( isset( $plugin['source'] ) && 'repo' == $plugin['source'] ) { + $api = plugins_api( 'plugin_information', array( 'slug' => $plugin['slug'], 'fields' => array( 'sections' => false ) ) ); + + if ( is_wp_error( $api ) ) + wp_die( $this->strings['oops'] . var_dump( $api ) ); + + if ( isset( $api->download_link ) ) + $plugin['source'] = $api->download_link; + } + + /** Set type, based on whether the source starts with http:// or https:// */ + $type = preg_match( '|^http(s)?://|', $plugin['source'] ) ? 'web' : 'upload'; + + /** Prep variables for Plugin_Installer_Skin class */ + $title = sprintf( $this->strings['installing'], $plugin['name'] ); + $url = add_query_arg( array( 'action' => 'install-plugin', 'plugin' => $plugin['slug'] ), 'update.php' ); + if ( isset( $_GET['from'] ) ) + $url .= add_query_arg( 'from', urlencode( stripslashes( $_GET['from'] ) ), $url ); + + $nonce = 'install-plugin_' . $plugin['slug']; + + /** Prefix a default path to pre-packaged plugins */ + $source = ( 'upload' == $type ) ? $this->default_path . $plugin['source'] : $plugin['source']; + + /** Create a new instance of Plugin_Upgrader */ + $upgrader = new Plugin_Upgrader( $skin = new Plugin_Installer_Skin( compact( 'type', 'title', 'url', 'nonce', 'plugin', 'api' ) ) ); + + /** Perform the action and install the plugin from the $source urldecode() */ + $upgrader->install( $source ); + + /** Flush plugins cache so we can make sure that the installed plugins list is always up to date */ + wp_cache_flush(); + + /** Only activate plugins if the config option is set to true */ + if ( $this->is_automatic ) { + $plugin_activate = $upgrader->plugin_info(); // Grab the plugin info from the Plugin_Upgrader method + $activate = activate_plugin( $plugin_activate ); // Activate the plugin + $this->populate_file_path(); // Re-populate the file path now that the plugin has been installed and activated + + if ( is_wp_error( $activate ) ) { + echo '

' . $activate->get_error_message() . '

'; + echo '

' . __( 'Return to Required Plugins Installer', $this->domain ) . '

'; + return true; // End it here if there is an error with automatic activation + } + else { + echo '

' . $this->strings['plugin_activated'] . '

'; + } + } + + /** Display message based on if all plugins are now active or not */ + $complete = array(); + foreach ( $this->plugins as $plugin ) { + if ( ! is_plugin_active( $plugin['file_path'] ) ) { + echo '

' . __( $this->strings['return'], $this->domain ) . '

'; + $complete[] = $plugin; + break; + } + /** Nothing to store */ + else { + $complete[] = ''; + } + } + + /** Filter out any empty entries */ + $complete = array_filter( $complete ); + + /** All plugins are active, so we display the complete string and hide the plugin menu */ + if ( empty( $complete ) ) { + echo '

' . sprintf( $this->strings['complete'], '' . __( 'Return to the Dashboard', $this->domain ) . '' ) . '

'; + echo ''; + } + + return true; + } + /** Checks for actions from hover links to process the activation */ + elseif ( isset( $_GET[sanitize_key( 'plugin' )] ) && ( isset( $_GET[sanitize_key( 'tgmpa-activate' )] ) && 'activate-plugin' == $_GET[sanitize_key( 'tgmpa-activate' )] ) ) { + check_admin_referer( 'tgmpa-activate', 'tgmpa-activate-nonce' ); + + /** Populate $plugin array with necessary information */ + $plugin['name'] = $_GET[sanitize_key( 'plugin_name' )]; + $plugin['slug'] = $_GET[sanitize_key( 'plugin' )]; + $plugin['source'] = $_GET[sanitize_key( 'plugin_source' )]; + + $plugin_data = get_plugins( '/' . $plugin['slug'] ); // Retrieve all plugins + $plugin_file = array_keys( $plugin_data ); // Retrieve all plugin files from installed plugins + $plugin_to_activate = $plugin['slug'] . '/' . $plugin_file[0]; // Match plugin slug with appropriate plugin file + $activate = activate_plugin( $plugin_to_activate ); // Activate the plugin + + if ( is_wp_error( $activate ) ) { + echo '

' . $activate->get_error_message() . '

'; + echo '

' . __( $this->strings['return'], $this->domain ) . '

'; + return true; // End it here if there is an error with activation + } + else { + /** Make sure message doesn't display again if bulk activation is performed immediately after a single activation */ + if ( ! isset( $_POST[sanitize_key( 'action' )] ) ) { + $msg = sprintf( __( 'The following plugin was activated successfully: %s.', $this->domain ), '' . $plugin['name'] . '' ); + echo '

' . $msg . '

'; + } + } + } + + return false; + + } + + /** + * Echoes required plugin notice. + * + * Outputs a message telling users that a specific plugin is required for + * their theme. If appropriate, it includes a link to the form page where + * users can install and activate the plugin. + * + * @since 1.0.0 + * + * @global object $current_screen + * @return null Returns early if we're on the Install page + */ + public function notices() { + + global $current_screen; + + /** Remove nag on the install page */ + if ( $this->is_tgmpa_page() ) + return; + + $installed_plugins = get_plugins(); // Retrieve a list of all the plugins + $this->populate_file_path(); + + $message = array(); // Store the messages in an array to be outputted after plugins have looped through + $install_link = false; // Set to false, change to true in loop if conditions exist, used for action link 'install' + $install_link_count = 0; // Used to determine plurality of install action link text + $activate_link = false; // Set to false, change to true in loop if conditions exist, used for action link 'activate' + $activate_link_count = 0; // Used to determine plurality of activate action link text + + foreach ( $this->plugins as $plugin ) { + /** If the plugin is installed and active, check for minimum version argument before moving forward */ + if ( is_plugin_active( $plugin['file_path'] ) ) { + /** A minimum version has been specified */ + if ( isset( $plugin['version'] ) ) { + if ( isset( $installed_plugins[$plugin['file_path']]['Version'] ) ) { + /** If the current version is less than the minimum required version, we display a message */ + if ( version_compare( $installed_plugins[$plugin['file_path']]['Version'], $plugin['version'], '<' ) ) { + if ( current_user_can( 'install_plugins' ) ) + $message['notice_ask_to_update'][] = $plugin['name']; + else + $message['notice_cannot_update'][] = $plugin['name']; + } + } + /** Can't find the plugin, so iterate to the next condition */ + else { + continue; + } + } + /** No minimum version specified, so iterate over the plugin */ + else { + continue; + } + } + + /** Not installed */ + if ( ! isset( $installed_plugins[$plugin['file_path']] ) ) { + $install_link = true; // We need to display the 'install' action link + $install_link_count++; // Increment the install link count + if ( current_user_can( 'install_plugins' ) ) { + if ( $plugin['required'] ) + $message['notice_can_install_required'][] = $plugin['name']; + /** This plugin is only recommended */ + else + $message['notice_can_install_recommended'][] = $plugin['name']; + } + /** Need higher privileges to install the plugin */ + else { + $message['notice_cannot_install'][] = $plugin['name']; + } + } + /** Installed but not active */ + elseif ( is_plugin_inactive( $plugin['file_path'] ) ) { + $activate_link = true; // We need to display the 'activate' action link + $activate_link_count++; // Increment the activate link count + if ( current_user_can( 'activate_plugins' ) ) { + if ( ( isset( $plugin['required'] ) ) && ( $plugin['required'] ) ) + $message['notice_can_activate_required'][] = $plugin['name']; + /** This plugin is only recommended */ + else { + $message['notice_can_activate_recommended'][] = $plugin['name']; + } + } + /** Need higher privileges to activate the plugin */ + else { + $message['notice_cannot_activate'][] = $plugin['name']; + } + } + } + + /** Only process the nag messages if the user has not dismissed them already */ + if ( ! get_user_meta( get_current_user_id(), 'tgmpa_dismissed_notice', true ) ) { + /** If we have notices to display, we move forward */ + if ( ! empty( $message ) ) { + krsort( $message ); // Sort messages + $rendered = ''; // Display all nag messages as strings + + /** Grab all plugin names */ + foreach ( $message as $type => $plugin_groups ) { + $linked_plugin_groups = array(); + + /** Count number of plugins in each message group to calculate singular/plural message */ + $count = count( $plugin_groups ); + + /** Loop through the plugin names to make the ones pulled from the .org repo linked */ + foreach ( $plugin_groups as $plugin_group_single_name ) { + $external_url = $this->_get_plugin_data_from_name( $plugin_group_single_name, 'external_url' ); + $source = $this->_get_plugin_data_from_name( $plugin_group_single_name, 'source' ); + + if ( $external_url && preg_match( '|^http(s)?://|', $external_url ) ) { + $linked_plugin_groups[] = '' . $plugin_group_single_name . ''; + } + elseif ( ! $source || preg_match( '|^http://wordpress.org/extend/plugins/|', $source ) ) { + $url = add_query_arg( + array( + 'tab' => 'plugin-information', + 'plugin' => $this->_get_plugin_data_from_name( $plugin_group_single_name ), + 'TB_iframe' => 'true', + 'width' => '640', + 'height' => '500', + ), + admin_url( 'plugin-install.php' ) + ); + + $linked_plugin_groups[] = '' . $plugin_group_single_name . ''; + } + else { + $linked_plugin_groups[] = $plugin_group_single_name; // No hyperlink + } + + if ( isset( $linked_plugin_groups ) && (array) $linked_plugin_groups ) + $plugin_groups = $linked_plugin_groups; + } + + $last_plugin = array_pop( $plugin_groups ); // Pop off last name to prep for readability + $imploded = empty( $plugin_groups ) ? '' . $last_plugin . '' : '' . ( implode( ', ', $plugin_groups ) . ' and ' . $last_plugin . '' ); + + $rendered .= '

' . sprintf( translate_nooped_plural( $this->strings[$type], $count, $this->domain ), $imploded, $count ) . '

'; // All messages now stored + } + + /** Setup variables to determine if action links are needed */ + $show_install_link = $install_link ? '' . translate_nooped_plural( $this->strings['install_link'], $install_link_count, $this->domain ) . '' : ''; + $show_activate_link = $activate_link ? '' . translate_nooped_plural( $this->strings['activate_link'], $activate_link_count, $this->domain ) . '' : ''; + + /** Define all of the action links */ + $action_links = apply_filters( + 'tgmpa_notice_action_links', + array( + 'install' => ( current_user_can( 'install_plugins' ) ) ? $show_install_link : '', + 'activate' => ( current_user_can( 'activate_plugins' ) ) ? $show_activate_link : '', + 'dismiss' => '' . __( 'Dismiss this notice', $this->domain ) . '', + ) + ); + + $action_links = array_filter( $action_links ); // Remove any empty array items + if ( $action_links ) + $rendered .= '

' . implode( ' | ', $action_links ) . '

'; + + /** Register the nag messages and prepare them to be processed */ + if ( isset( $this->strings['nag_type'] ) ) + add_settings_error( 'tgmpa', 'tgmpa', $rendered, sanitize_html_class( strtolower( $this->strings['nag_type'] ), 'updated' ) ); + else + add_settings_error( 'tgmpa', 'tgmpa', $rendered, 'updated' ); + } + } + + /** Admin options pages already output settings_errors, so this is to avoid duplication */ + if ( 'options-general' !== $current_screen->parent_base ) + settings_errors( 'tgmpa' ); + + } + + /** + * Add dismissable admin notices. + * + * Appends a link to the admin nag messages. If clicked, the admin notice disappears and no longer is visible to users. + * + * @since 2.1.0 + */ + public function dismiss() { + + if ( isset( $_GET[sanitize_key( 'tgmpa-dismiss' )] ) ) + update_user_meta( get_current_user_id(), 'tgmpa_dismissed_notice', 1 ); + + } + + /** + * Add individual plugin to our collection of plugins. + * + * If the required keys are not set, the plugin is not added. + * + * @since 2.0.0 + * + * @param array $plugin Array of plugin arguments. + */ + public function register( $plugin ) { + + if ( ! isset( $plugin['slug'] ) || ! isset( $plugin['name'] ) ) + return; + + $this->plugins[] = $plugin; + + } + + /** + * Amend default configuration settings. + * + * @since 2.0.0 + * + * @param array $config + */ + public function config( $config ) { + + $keys = array( 'default_path', 'parent_menu_slug', 'parent_url_slug', 'domain', 'has_notices', 'menu', 'is_automatic', 'message', 'strings' ); + + foreach ( $keys as $key ) { + if ( isset( $config[$key] ) ) { + if ( is_array( $config[$key] ) ) { + foreach ( $config[$key] as $subkey => $value ) + $this->{$key}[$subkey] = $value; + } else { + $this->$key = $config[$key]; + } + } + } + + } + + /** + * Amend action link after plugin installation. + * + * @since 2.0.0 + * + * @param array $install_actions Existing array of actions + * @return array Amended array of actions + */ + public function actions( $install_actions ) { + + /** Remove action links on the TGMPA install page */ + if ( $this->is_tgmpa_page() ) + return false; + + return $install_actions; + + } + + /** + * Set file_path key for each installed plugin. + * + * @since 2.1.0 + */ + public function populate_file_path() { + + /** Add file_path key for all plugins */ + foreach ( $this->plugins as $plugin => $values ) + $this->plugins[$plugin]['file_path'] = $this->_get_plugin_basename_from_slug( $values['slug'] ); + + } + + /** + * Helper function to extract the file path of the plugin file from the + * plugin slug, if the plugin is installed. + * + * @since 2.0.0 + * + * @param string $slug Plugin slug (typically folder name) as provided by the developer + * @return string Either file path for plugin if installed, or just the plugin slug + */ + protected function _get_plugin_basename_from_slug( $slug ) { + + $keys = array_keys( get_plugins() ); + + foreach ( $keys as $key ) { + if ( preg_match( '|^' . $slug .'|', $key ) ) + return $key; + } + + return $slug; + + } + + /** + * Retrieve plugin data, given the plugin name. + * + * Loops through the registered plugins looking for $name. If it finds it, + * it returns the $data from that plugin. Otherwise, returns false. + * + * @since 2.1.0 + * + * @param string $name Name of the plugin, as it was registered + * @param string $data Optional. Array key of plugin data to return. Default is slug + * @return string|boolean Plugin slug if found, false otherwise. + */ + protected function _get_plugin_data_from_name( $name, $data = 'slug' ) { + + foreach ( $this->plugins as $plugin => $values ) { + if ( $name == $values['name'] && isset( $values[$data] ) ) + return $values[$data]; + } + + return false; + + } + + /** + * Determine if we're on the TGMPA Install page. + * + * We use $current_screen when it is available, and a slightly less ideal + * conditional when it isn't (like when displaying the plugin information + * thickbox). + * + * @since 2.1.0 + * + * @global object $current_screen + * @return boolean True when on the TGMPA page, false otherwise. + */ + protected function is_tgmpa_page() { + + global $current_screen; + + if ( ! is_null( $current_screen ) && $this->parent_menu_slug == $current_screen->parent_file && isset( $_GET['page'] ) && $this->menu === $_GET['page'] ) + return true; + + if ( isset( $_GET['page'] ) && $this->menu === $_GET['page'] ) + return true; + + return false; + + } + + /** + * Delete dismissable nag option when theme is switched. + * + * This ensures that the user is again reminded via nag of required + * and/or recommended plugins if they re-activate the theme. + * + * @since 2.1.1 + */ + public function update_dismiss() { + + delete_user_meta( get_current_user_id(), 'tgmpa_dismissed_notice' ); + + } + + /** + * Forces plugin activation if the parameter 'force_activation' is + * set to true. + * + * This allows theme authors to specify certain plugins that must be + * active at all times while using the current theme. + * + * Please take special care when using this parameter as it has the + * potential to be harmful if not used correctly. Setting this parameter + * to true will not allow the specified plugin to be deactivated unless + * the user switches themes. + * + * @since 2.2.0 + */ + public function force_activation() { + + /** Set file_path parameter for any installed plugins */ + $this->populate_file_path(); + + $installed_plugins = get_plugins(); + + foreach ( $this->plugins as $plugin ) { + /** Oops, plugin isn't there so iterate to next condition */ + if ( isset( $plugin['force_activation'] ) && $plugin['force_activation'] && ! isset( $installed_plugins[$plugin['file_path']] ) ) + continue; + /** There we go, activate the plugin */ + elseif ( isset( $plugin['force_activation'] ) && $plugin['force_activation'] && is_plugin_inactive( $plugin['file_path'] ) ) + activate_plugin( $plugin['file_path'] ); + } + + } + + /** + * Forces plugin deactivation if the parameter 'force_deactivation' + * is set to true. + * + * This allows theme authors to specify certain plugins that must be + * deactived upon switching from the current theme to another. + * + * Please take special care when using this parameter as it has the + * potential to be harmful if not used correctly. + * + * @since 2.2.0 + */ + public function force_deactivation() { + + /** Set file_path parameter for any installed plugins */ + $this->populate_file_path(); + + foreach ( $this->plugins as $plugin ) { + /** Only proceed forward if the paramter is set to true and plugin is active */ + if ( isset( $plugin['force_deactivation'] ) && $plugin['force_deactivation'] && is_plugin_active( $plugin['file_path'] ) ) + deactivate_plugins( $plugin['file_path'] ); + } + + } + + } +} + +/** Create a new instance of the class */ +new TGM_Plugin_Activation; + +if ( ! function_exists( 'tgmpa' ) ) { + /** + * Helper function to register a collection of required plugins. + * + * @since 2.0.0 + * @api + * + * @param array $plugins An array of plugin arrays + * @param array $config Optional. An array of configuration values + */ + function tgmpa( $plugins, $config = array() ) { + + foreach ( $plugins as $plugin ) + TGM_Plugin_Activation::$instance->register( $plugin ); + + if ( $config ) + TGM_Plugin_Activation::$instance->config( $config ); + + } +} + +/** + * WP_List_Table isn't always available. If it isn't available, + * we load it here. + * + * @since 2.2.0 + */ +if ( ! class_exists( 'WP_List_Table' ) ) + require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' ); + +if ( ! class_exists( 'TGMPA_List_Table' ) ) { + /** + * List table class for handling plugins. + * + * Extends the WP_List_Table class to provide a future-compatible + * way of listing out all required/recommended plugins. + * + * Gives users an interface similar to the Plugin Administration + * area with similar (albeit stripped down) capabilities. + * + * This class also allows for the bulk install of plugins. + * + * @since 2.2.0 + * + * @package TGM-Plugin-Activation + * @author Thomas Griffin + * @author Gary Jones + */ + class TGMPA_List_Table extends WP_List_Table { + + /** + * References parent constructor and sets defaults for class. + * + * The constructor also grabs a copy of $instance from the TGMPA class + * and stores it in the global object TGM_Plugin_Activation::$instance. + * + * @since 2.2.0 + * + * @global unknown $status + * @global string $page + */ + public function __construct() { + + global $status, $page; + + parent::__construct( + array( + 'singular' => 'plugin', + 'plural' => 'plugins', + 'ajax' => false, + ) + ); + + } + + /** + * Gathers and renames all of our plugin information to be used by + * WP_List_Table to create our table. + * + * @since 2.2.0 + * + * @return array $table_data Information for use in table + */ + protected function _gather_plugin_data() { + + /** Load thickbox for plugin links */ + TGM_Plugin_Activation::$instance->admin_init(); + TGM_Plugin_Activation::$instance->thickbox(); + + /** Prep variables for use and grab list of all installed plugins */ + $table_data = array(); + $i = 0; + $installed_plugins = get_plugins(); + + foreach ( TGM_Plugin_Activation::$instance->plugins as $plugin ) { + if ( is_plugin_active( $plugin['file_path'] ) ) + continue; // No need to display plugins if they are installed and activated + + $table_data[$i]['sanitized_plugin'] = $plugin['name']; + $table_data[$i]['slug'] = $this->_get_plugin_data_from_name( $plugin['name'] ); + + $external_url = $this->_get_plugin_data_from_name( $plugin['name'], 'external_url' ); + $source = $this->_get_plugin_data_from_name( $plugin['name'], 'source' ); + + if ( $external_url && preg_match( '|^http(s)?://|', $external_url ) ) { + $table_data[$i]['plugin'] = '' . $plugin['name'] . ''; + } + elseif ( ! $source || preg_match( '|^http://wordpress.org/extend/plugins/|', $source ) ) { + $url = add_query_arg( + array( + 'tab' => 'plugin-information', + 'plugin' => $this->_get_plugin_data_from_name( $plugin['name'] ), + 'TB_iframe' => 'true', + 'width' => '640', + 'height' => '500', + ), + admin_url( 'plugin-install.php' ) + ); + + $table_data[$i]['plugin'] = '' . $plugin['name'] . ''; + } + else { + $table_data[$i]['plugin'] = '' . $plugin['name'] . ''; // No hyperlink + } + + if ( isset( $table_data[$i]['plugin'] ) && (array) $table_data[$i]['plugin'] ) + $plugin['name'] = $table_data[$i]['plugin']; + + if ( isset( $plugin['external_url'] ) ) { + /** The plugin is linked to an external source */ + $table_data[$i]['source'] = __( 'External Link', TGM_Plugin_Activation::$instance->domain ); + } + elseif ( isset( $plugin['source'] ) ) { + /** The plugin must be from a private repository */ + if ( preg_match( '|^http(s)?://|', $plugin['source'] ) ) + $table_data[$i]['source'] = __( 'Private Repository', TGM_Plugin_Activation::$instance->domain ); + /** The plugin is pre-packaged with the theme */ + else + $table_data[$i]['source'] = __( 'Pre-Packaged', TGM_Plugin_Activation::$instance->domain ); + } + /** The plugin is from the WordPress repository */ + else { + $table_data[$i]['source'] = __( 'WordPress Repository', TGM_Plugin_Activation::$instance->domain ); + } + + $table_data[$i]['type'] = $plugin['required'] ? __( 'Required', TGM_Plugin_Activation::$instance->domain ) : __( 'Recommended', TGM_Plugin_Activation::$instance->domain ); + + if ( ! isset( $installed_plugins[$plugin['file_path']] ) ) + $table_data[$i]['status'] = sprintf( '%1$s', __( 'Not Installed', TGM_Plugin_Activation::$instance->domain ) ); + elseif ( is_plugin_inactive( $plugin['file_path'] ) ) + $table_data[$i]['status'] = sprintf( '%1$s', __( 'Installed But Not Activated', TGM_Plugin_Activation::$instance->domain ) ); + + $table_data[$i]['file_path'] = $plugin['file_path']; + $table_data[$i]['url'] = isset( $plugin['source'] ) ? $plugin['source'] : 'repo'; + + $i++; + } + + /** Sort plugins by Required/Recommended type and by alphabetical listing within each type */ + $resort = array(); + $req = array(); + $rec = array(); + + /** Grab all the plugin types */ + foreach ( $table_data as $plugin ) + $resort[] = $plugin['type']; + + /** Sort each plugin by type */ + foreach ( $resort as $type ) + if ( 'Required' == $type ) + $req[] = $type; + else + $rec[] = $type; + + /** Sort alphabetically each plugin type array, merge them and then sort in reverse (lists Required plugins first) */ + sort( $req ); + sort( $rec ); + array_merge( $resort, $req, $rec ); + array_multisort( $resort, SORT_DESC, $table_data ); + + return $table_data; + + } + + /** + * Retrieve plugin data, given the plugin name. Taken from the + * TGM_Plugin_Activation class. + * + * Loops through the registered plugins looking for $name. If it finds it, + * it returns the $data from that plugin. Otherwise, returns false. + * + * @since 2.2.0 + * + * @param string $name Name of the plugin, as it was registered + * @param string $data Optional. Array key of plugin data to return. Default is slug + * @return string|boolean Plugin slug if found, false otherwise + */ + protected function _get_plugin_data_from_name( $name, $data = 'slug' ) { + + foreach ( TGM_Plugin_Activation::$instance->plugins as $plugin => $values ) { + if ( $name == $values['name'] && isset( $values[$data] ) ) + return $values[$data]; + } + + return false; + + } + + /** + * Create default columns to display important plugin information + * like type, action and status. + * + * @since 2.2.0 + * + * @param array $item + * @param string $column_name + */ + public function column_default( $item, $column_name ) { + + switch ( $column_name ) { + case 'source': + case 'type': + case 'status': + return $item[$column_name]; + } + + } + + /** + * Create default title column along with action links of 'Install' + * and 'Activate'. + * + * @since 2.2.0 + * + * @param array $item + * @return string The action hover links + */ + public function column_plugin( $item ) { + + $installed_plugins = get_plugins(); + + /** No need to display any hover links */ + if ( is_plugin_active( $item['file_path'] ) ) + $actions = array(); + + /** We need to display the 'Install' hover link */ + if ( ! isset( $installed_plugins[$item['file_path']] ) ) { + $actions = array( + 'install' => sprintf( + 'Install', + wp_nonce_url( + add_query_arg( + array( + 'page' => TGM_Plugin_Activation::$instance->menu, + 'plugin' => $item['slug'], + 'plugin_name' => $item['sanitized_plugin'], + 'plugin_source' => $item['url'], + 'tgmpa-install' => 'install-plugin', + ), + admin_url( TGM_Plugin_Activation::$instance->parent_url_slug ) + ), + 'tgmpa-install' + ), + $item['sanitized_plugin'] + ), + ); + } + /** We need to display the 'Activate' hover link */ + elseif ( is_plugin_inactive( $item['file_path'] ) ) { + $actions = array( + 'activate' => sprintf( + 'Activate', + add_query_arg( + array( + 'page' => TGM_Plugin_Activation::$instance->menu, + 'plugin' => $item['slug'], + 'plugin_name' => $item['sanitized_plugin'], + 'plugin_source' => $item['url'], + 'tgmpa-activate' => 'activate-plugin', + 'tgmpa-activate-nonce' => wp_create_nonce( 'tgmpa-activate' ), + ), + admin_url( TGM_Plugin_Activation::$instance->parent_url_slug ) + ), + $item['sanitized_plugin'] + ), + ); + } + + return sprintf( '%1$s %2$s', $item['plugin'], $this->row_actions( $actions ) ); + + } + + /** + * Required for bulk installing. + * + * Adds a checkbox for each plugin. + * + * @since 2.2.0 + * + * @param array $item + * @return string The input checkbox with all necessary info + */ + public function column_cb( $item ) { + + $value = $item['file_path'] . ',' . $item['url'] . ',' . $item['sanitized_plugin']; + return sprintf( '', $this->_args['singular'], $value, $item['sanitized_plugin'] ); + + } + + /** + * Sets default message within the plugins table if no plugins + * are left for interaction. + * + * Hides the menu item to prevent the user from clicking and + * getting a permissions error. + * + * @since 2.2.0 + */ + public function no_items() { + + printf( __( 'No plugins to install or activate. Return to the Dashboard', TGM_Plugin_Activation::$instance->domain ), admin_url() ); + echo ''; + + } + + /** + * Output all the column information within the table. + * + * @since 2.2.0 + * + * @return array $columns The column names + */ + public function get_columns() { + + $columns = array( + 'cb' => '', + 'plugin' => __( 'Plugin', TGM_Plugin_Activation::$instance->domain ), + 'source' => __( 'Source', TGM_Plugin_Activation::$instance->domain ), + 'type' => __( 'Type', TGM_Plugin_Activation::$instance->domain ), + 'status' => __( 'Status', TGM_Plugin_Activation::$instance->domain ) + ); + + return $columns; + + } + + /** + * Defines all types of bulk actions for handling + * registered plugins. + * + * @since 2.2.0 + * + * @return array $actions The bulk actions for the plugin install table + */ + public function get_bulk_actions() { + + $actions = array( + 'tgmpa-bulk-install' => __( 'Install', TGM_Plugin_Activation::$instance->domain ), + 'tgmpa-bulk-activate' => __( 'Activate', TGM_Plugin_Activation::$instance->domain ), + ); + + return $actions; + + } + + /** + * Processes bulk installation and activation actions. + * + * The bulk installation process looks either for the $_POST + * information or for the plugin info within the $_GET variable if + * a user has to use WP_Filesystem to enter their credentials. + * + * @since 2.2.0 + */ + public function process_bulk_actions() { + + /** Bulk installation process */ + if ( 'tgmpa-bulk-install' === $this->current_action() ) { + check_admin_referer( 'bulk-' . $this->_args['plural'] ); + + /** Prep variables to be populated */ + $plugins_to_install = array(); + $plugin_installs = array(); + $plugin_path = array(); + $plugin_name = array(); + + /** Look first to see if information has been passed via WP_Filesystem */ + if ( isset( $_GET[sanitize_key( 'plugins' )] ) ) + $plugins = explode( ',', stripslashes( $_GET[sanitize_key( 'plugins' )] ) ); + /** Looks like the user can use the direct method, take from $_POST */ + elseif ( isset( $_POST[sanitize_key( 'plugin' )] ) ) + $plugins = (array) $_POST[sanitize_key( 'plugin' )]; + /** Nothing has been submitted */ + else + $plugins = array(); + + $a = 0; // Incremental variable + + /** Grab information from $_POST if available */ + if ( isset( $_POST[sanitize_key( 'plugin' )] ) ) { + foreach ( $plugins as $plugin_data ) + $plugins_to_install[] = explode( ',', $plugin_data ); + + foreach ( $plugins_to_install as $plugin_data ) { + $plugin_installs[] = $plugin_data[0]; + $plugin_path[] = $plugin_data[1]; + $plugin_name[] = $plugin_data[2]; + } + } + /** Information has been passed via $_GET */ + else { + foreach ( $plugins as $key => $value ) { + /** Grab plugin slug for each plugin */ + if ( 0 == $key % 3 || 0 == $key ) { + $plugins_to_install[] = $value; + $plugin_installs[] = $value; + } + $a++; + } + } + + /** Look first to see if information has been passed via WP_Filesystem */ + if ( isset( $_GET[sanitize_key( 'plugin_paths' )] ) ) + $plugin_paths = explode( ',', stripslashes( $_GET[sanitize_key( 'plugin_paths' )] ) ); + /** Looks like the user doesn't need to enter his FTP creds */ + elseif ( isset( $_POST[sanitize_key( 'plugin' )] ) ) + $plugin_paths = (array) $plugin_path; + /** Nothing has been submitted */ + else + $plugin_paths = array(); + + /** Look first to see if information has been passed via WP_Filesystem */ + if ( isset( $_GET[sanitize_key( 'plugin_names' )] ) ) + $plugin_names = explode( ',', stripslashes( $_GET[sanitize_key( 'plugin_names' )] ) ); + /** Looks like the user doesn't need to enter his FTP creds */ + elseif ( isset( $_POST[sanitize_key( 'plugin' )] ) ) + $plugin_names = (array) $plugin_name; + /** Nothing has been submitted */ + else + $plugin_names = array(); + + $b = 0; // Incremental variable + + /** Loop through plugin slugs and remove already installed plugins from the list */ + foreach ( $plugin_installs as $key => $plugin ) { + if ( preg_match( '|.php$|', $plugin ) ) { + unset( $plugin_installs[$key] ); + + /** If the plugin path isn't in the $_GET variable, we can unset the corresponding path */ + if ( ! isset( $_GET[sanitize_key( 'plugin_paths' )] ) ) + unset( $plugin_paths[$b] ); + + /** If the plugin name isn't in the $_GET variable, we can unset the corresponding name */ + if ( ! isset( $_GET[sanitize_key( 'plugin_names' )] ) ) + unset( $plugin_names[$b] ); + } + $b++; + } + + /** No need to proceed further if we have no plugins to install */ + if ( empty( $plugin_installs ) ) + return false; + + /** Reset array indexes in case we removed already installed plugins */ + $plugin_installs = array_values( $plugin_installs ); + $plugin_paths = array_values( $plugin_paths ); + $plugin_names = array_values( $plugin_names ); + + /** If we grabbed our plugin info from $_GET, we need to decode it for use */ + $plugin_installs = array_map( 'urldecode', $plugin_installs ); + $plugin_paths = array_map( 'urldecode', $plugin_paths ); + $plugin_names = array_map( 'urldecode', $plugin_names ); + + /** Pass all necessary information via URL if WP_Filesystem is needed */ + $url = wp_nonce_url( + add_query_arg( + array( + 'page' => TGM_Plugin_Activation::$instance->menu, + 'tgmpa-action' => 'install-selected', + 'plugins' => urlencode( implode( ',', $plugins ) ), + 'plugin_paths' => urlencode( implode( ',', $plugin_paths ) ), + 'plugin_names' => urlencode( implode( ',', $plugin_names ) ), + ), + admin_url( TGM_Plugin_Activation::$instance->parent_url_slug ) + ), + 'bulk-plugins' + ); + $method = ''; // Leave blank so WP_Filesystem can populate it as necessary + $fields = array( sanitize_key( 'action' ), sanitize_key( '_wp_http_referer' ), sanitize_key( '_wpnonce' ) ); // Extra fields to pass to WP_Filesystem + + if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, $fields ) ) ) + return true; + + if ( ! WP_Filesystem( $creds ) ) { + request_filesystem_credentials( $url, $method, true, false, $fields ); // Setup WP_Filesystem + return true; + } + + require_once ABSPATH . 'wp-admin/includes/plugin-install.php'; // Need for plugins_api + require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; // Need for upgrade classes + + /** Store all information in arrays since we are processing a bulk installation */ + $api = array(); + $sources = array(); + $install_path = array(); + + $c = 0; // Incremental variable + + /** Loop through each plugin to install and try to grab information from WordPress API, if not create 'tgmpa-empty' scalar */ + foreach ( $plugin_installs as $plugin ) { + $api[$c] = plugins_api( 'plugin_information', array( 'slug' => $plugin, 'fields' => array( 'sections' => false ) ) ) ? plugins_api( 'plugin_information', array( 'slug' => $plugin, 'fields' => array( 'sections' => false ) ) ) : (object) $api[$c] = 'tgmpa-empty'; + $c++; + } + + if ( is_wp_error( $api ) ) + wp_die( TGM_Plugin_Activation::$instance->strings['oops'] . var_dump( $api ) ); + + $d = 0; // Incremental variable + + /** Capture download links from $api or set install link to pre-packaged/private repo */ + foreach ( $api as $object ) { + $sources[$d] = isset( $object->download_link ) && 'repo' == $plugin_paths[$d] ? $object->download_link : $plugin_paths[$d]; + $d++; + } + + /** Finally, all the data is prepared to be sent to the installer */ + $url = add_query_arg( array( 'page' => TGM_Plugin_Activation::$instance->menu ), admin_url( TGM_Plugin_Activation::$instance->parent_url_slug ) ); + $nonce = 'bulk-plugins'; + $names = $plugin_names; + + /** Create a new instance of TGM_Bulk_Installer */ + $installer = new TGM_Bulk_Installer( $skin = new TGM_Bulk_Installer_Skin( compact( 'url', 'nonce', 'names' ) ) ); + + /** Wrap the install process with the appropriate HTML */ + echo '

'; + screen_icon( apply_filters( 'tgmpa_default_screen_icon', 'themes' ) ); + echo '

' . esc_html( get_admin_page_title() ) . '

'; + /** Process the bulk installation submissions */ + $installer->bulk_install( $sources ); + echo '

'; + + return true; + } + + /** Bulk activation process */ + if ( 'tgmpa-bulk-activate' === $this->current_action() ) { + check_admin_referer( 'bulk-' . $this->_args['plural'] ); + + /** Grab plugin data from $_POST */ + $plugins = isset( $_POST[sanitize_key( 'plugin' )] ) ? (array) $_POST[sanitize_key( 'plugin' )] : array(); + $plugins_to_activate = array(); + + /** Split plugin value into array with plugin file path, plugin source and plugin name */ + foreach ( $plugins as $i => $plugin ) + $plugins_to_activate[] = explode( ',', $plugin ); + + foreach ( $plugins_to_activate as $i => $array ) { + if ( ! preg_match( '|.php$|', $array[0] ) ) // Plugins that haven't been installed yet won't have the correct file path + unset( $plugins_to_activate[$i] ); + } + + /** Return early if there are no plugins to activate */ + if ( empty( $plugins_to_activate ) ) + return; + + $plugins = array(); + $plugin_names = array(); + + foreach ( $plugins_to_activate as $plugin_string ) { + $plugins[] = $plugin_string[0]; + $plugin_names[] = $plugin_string[2]; + } + + $count = count( $plugin_names ); // Count so we can use _n function + $last_plugin = array_pop( $plugin_names ); // Pop off last name to prep for readability + $imploded = empty( $plugin_names ) ? '' . $last_plugin . '' : '' . ( implode( ', ', $plugin_names ) . ' and ' . $last_plugin . '.' ); + + /** Now we are good to go - let's start activating plugins */ + $activate = activate_plugins( $plugins ); + + if ( is_wp_error( $activate ) ) + echo '

' . $activate->get_error_message() . '

'; + else + printf( '

%1$s %2$s

', _n( 'The following plugin was activated successfully:', 'The following plugins were activated successfully:', $count, TGM_Plugin_Activation::$instance->domain ), $imploded ); + + /** Update recently activated plugins option */ + $recent = (array) get_option( 'recently_activated' ); + + foreach ( $plugins as $plugin => $time ) + if ( isset( $recent[$plugin] ) ) + unset( $recent[$plugin] ); + + update_option( 'recently_activated', $recent ); + + unset( $_POST ); // Reset the $_POST variable in case user wants to perform one action after another + } + } + + /** + * Prepares all of our information to be outputted into a usable table. + * + * @since 2.2.0 + */ + public function prepare_items() { + + $per_page = 100; // Set it high so we shouldn't have to worry about pagination + $columns = $this->get_columns(); // Get all necessary column information + $hidden = array(); // No columns to hide, but we must set as an array + $sortable = array(); // No reason to make sortable columns + $this->_column_headers = array( $columns, $hidden, $sortable ); // Get all necessary column headers + + /** Process our bulk actions here */ + $this->process_bulk_actions(); + + /** Store all of our plugin data into $items array so WP_List_Table can use it */ + $this->items = $this->_gather_plugin_data(); + + } + + } +} + +/** + * The WP_Upgrader file isn't always available. If it isn't available, + * we load it here. + * + * We check to make sure no action or activation keys are set so that WordPress + * doesn't try to re-include the class when processing upgrades or installs outside + * of the class. + * + * @since 2.2.0 + */ +if ( ! class_exists( 'WP_Upgrader' ) && ( isset( $_GET[sanitize_key( 'page' )] ) && TGM_Plugin_Activation::$instance->menu = $_GET[sanitize_key( 'page' )] ) ) { + require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + + if ( ! class_exists( 'TGM_Bulk_Installer' ) ) { + /** + * Installer class to handle bulk plugin installations. + * + * Extends WP_Upgrader and customizes to suit the installation of multiple + * plugins. + * + * @since 2.2.0 + * + * @package TGM-Plugin-Activation + * @author Thomas Griffin + * @author Gary Jones + */ + class TGM_Bulk_Installer extends WP_Upgrader { + + /** + * Holds result of bulk plugin installation. + * + * @since 2.2.0 + * + * @var string + */ + public $result; + + /** + * Flag to check if bulk installation is occurring or not. + * + * @since 2.2.0 + * + * @var boolean + */ + public $bulk = false; + + /** + * Processes the bulk installation of plugins. + * + * @since 2.2.0 + * + * @param array $packages The plugin sources needed for installation + * @return string|boolean Install confirmation messages on success, false on failure + */ + public function bulk_install( $packages ) { + + /** Pass installer skin object and set bulk property to true */ + $this->init(); + $this->bulk = true; + + /** Set install strings and automatic activation strings (if config option is set to true) */ + $this->install_strings(); + if ( TGM_Plugin_Activation::$instance->is_automatic ) + $this->activate_strings(); + + /** Run the header string to notify user that the process has begun */ + $this->skin->header(); + + /** Connect to the Filesystem */ + $res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) ); + if ( ! $res ) { + $this->skin->footer(); + return false; + } + + /** Set the bulk header and prepare results array */ + $this->skin->bulk_header(); + $results = array(); + + /** Get the total number of packages being processed and iterate as each package is successfully installed */ + $this->update_count = count( $packages ); + $this->update_current = 0; + + /** Loop through each plugin and process the installation */ + foreach ( $packages as $plugin ) { + $this->update_current++; // Increment counter + + /** Do the plugin install */ + $result = $this->run( + array( + 'package' => $plugin, // The plugin source + 'destination' => WP_PLUGIN_DIR, // The destination dir + 'clear_destination' => false, // Do we want to clear the destination or not? + 'clear_working' => true, // Remove original install file + 'is_multi' => true, // Are we processing multiple installs? + 'hook_extra' => array( 'plugin' => $plugin, ), // Pass plugin source as extra data + ) + ); + + /** Store installation results in result property */ + $results[$plugin] = $this->result; + + /** Prevent credentials auth screen from displaying multiple times */ + if ( false === $result ) + break; + } + + /** Pass footer skin strings */ + $this->skin->bulk_footer(); + $this->skin->footer(); + + /** Return our results */ + return $results; + + } + + /** + * Performs the actual installation of each plugin. + * + * This method also activates the plugin in the automatic flag has been + * set to true for the TGMPA class. + * + * @since 2.2.0 + * + * @param array $options The installation cofig options + * @return null/array Return early if error, array of installation data on success + */ + public function run( $options ) { + + /** Default config options */ + $defaults = array( + 'package' => '', + 'destination' => '', + 'clear_destination' => false, + 'clear_working' => true, + 'is_multi' => false, + 'hook_extra' => array(), + ); + + /** Parse default options with config options from $this->bulk_upgrade and extract them */ + $options = wp_parse_args( $options, $defaults ); + extract( $options ); + + /** Connect to the Filesystem */ + $res = $this->fs_connect( array( WP_CONTENT_DIR, $destination ) ); + if ( ! $res ) + return false; + + /** Return early if there is an error connecting to the Filesystem */ + if ( is_wp_error( $res ) ) { + $this->skin->error( $res ); + return $res; + } + + /** Call $this->header separately if running multiple times */ + if ( ! $is_multi ) + $this->skin->header(); + + /** Set strings before the package is installed */ + $this->skin->before(); + + /** Download the package (this just returns the filename of the file if the package is a local file) */ + $download = $this->download_package( $package ); + if ( is_wp_error( $download ) ) { + $this->skin->error( $download ); + $this->skin->after(); + return $download; + } + + /** Don't accidentally delete a local file */ + $delete_package = ( $download != $package ); + + /** Unzip file into a temporary working directory */ + $working_dir = $this->unpack_package( $download, $delete_package ); + if ( is_wp_error( $working_dir ) ) { + $this->skin->error( $working_dir ); + $this->skin->after(); + return $working_dir; + } + + /** Install the package into the working directory with all passed config options */ + $result = $this->install_package( + array( + 'source' => $working_dir, + 'destination' => $destination, + 'clear_destination' => $clear_destination, + 'clear_working' => $clear_working, + 'hook_extra' => $hook_extra, + ) + ); + + /** Pass the result of the installation */ + $this->skin->set_result( $result ); + + /** Set correct strings based on results */ + if ( is_wp_error( $result ) ) { + $this->skin->error( $result ); + $this->skin->feedback( 'process_failed' ); + } + /** The plugin install is successful */ + else { + $this->skin->feedback( 'process_success' ); + } + + /** Only process the activation of installed plugins if the automatic flag is set to true */ + if ( TGM_Plugin_Activation::$instance->is_automatic ) { + /** Flush plugins cache so we can make sure that the installed plugins list is always up to date */ + wp_cache_flush(); + + /** Get the installed plugin file and activate it */ + $plugin_info = $this->plugin_info( $package ); + $activate = activate_plugin( $plugin_info ); + + /** Re-populate the file path now that the plugin has been installed and activated */ + TGM_Plugin_Activation::$instance->populate_file_path(); + + /** Set correct strings based on results */ + if ( is_wp_error( $activate ) ) { + $this->skin->error( $activate ); + $this->skin->feedback( 'activation_failed' ); + } + /** The plugin activation is successful */ + else { + $this->skin->feedback( 'activation_success' ); + } + } + + /** Flush plugins cache so we can make sure that the installed plugins list is always up to date */ + wp_cache_flush(); + + /** Set install footer strings */ + $this->skin->after(); + if ( ! $is_multi ) + $this->skin->footer(); + + return $result; + + } + + /** + * Sets the correct install strings for the installer skin to use. + * + * @since 2.2.0 + */ + public function install_strings() { + + $this->strings['no_package'] = __( 'Install package not available.', TGM_Plugin_Activation::$instance->domain ); + $this->strings['downloading_package'] = __( 'Downloading install package from %s…', TGM_Plugin_Activation::$instance->domain ); + $this->strings['unpack_package'] = __( 'Unpacking the package…', TGM_Plugin_Activation::$instance->domain ); + $this->strings['installing_package'] = __( 'Installing the plugin…', TGM_Plugin_Activation::$instance->domain ); + $this->strings['process_failed'] = __( 'Plugin install failed.', TGM_Plugin_Activation::$instance->domain ); + $this->strings['process_success'] = __( 'Plugin installed successfully.', TGM_Plugin_Activation::$instance->domain ); + + } + + /** + * Sets the correct activation strings for the installer skin to use. + * + * @since 2.2.0 + */ + public function activate_strings() { + + $this->strings['activation_failed'] = __( 'Plugin activation failed.', TGM_Plugin_Activation::$instance->domain ); + $this->strings['activation_success'] = __( 'Plugin activated successfully.', TGM_Plugin_Activation::$instance->domain ); + + } + + /** + * Grabs the plugin file from an installed plugin. + * + * @since 2.2.0 + * + * @return string|boolean Return plugin file on success, false on failure + */ + public function plugin_info() { + + /** Return false if installation result isn't an array or the destination name isn't set */ + if ( ! is_array( $this->result ) ) + return false; + if ( empty( $this->result['destination_name'] ) ) + return false; + + /** Get the installed plugin file or return false if it isn't set */ + $plugin = get_plugins( '/' . $this->result['destination_name'] ); + if ( empty( $plugin ) ) + return false; + + /** Assume the requested plugin is the first in the list */ + $pluginfiles = array_keys( $plugin ); + + return $this->result['destination_name'] . '/' . $pluginfiles[0]; + + } + + } + } + + if ( ! class_exists( 'TGM_Bulk_Installer_Skin' ) ) { + /** + * Installer skin to set strings for the bulk plugin installations.. + * + * Extends Bulk_Upgrader_Skin and customizes to suit the installation of multiple + * plugins. + * + * @since 2.2.0 + * + * @package TGM-Plugin-Activation + * @author Thomas Griffin + * @author Gary Jones + */ + class TGM_Bulk_Installer_Skin extends Bulk_Upgrader_Skin { + + /** + * Holds plugin info for each individual plugin installation. + * + * @since 2.2.0 + * + * @var array + */ + public $plugin_info = array(); + + /** + * Holds names of plugins that are undergoing bulk installations. + * + * @since 2.2.0 + * + * @var array + */ + public $plugin_names = array(); + + /** + * Integer to use for iteration through each plugin installation. + * + * @since 2.2.0 + * + * @var integer + */ + public $i = 0; + + /** + * Constructor. Parses default args with new ones and extracts them for use. + * + * @since 2.2.0 + * + * @param array $args Arguments to pass for use within the class + */ + public function __construct( $args = array() ) { + + /** Parse default and new args */ + $defaults = array( 'url' => '', 'nonce' => '', 'names' => array() ); + $args = wp_parse_args( $args, $defaults ); + + /** Set plugin names to $this->plugin_names property */ + $this->plugin_names = $args['names']; + + /** Extract the new args */ + parent::__construct( $args ); + + } + + /** + * Sets install skin strings for each individual plugin. + * + * Checks to see if the automatic activation flag is set and uses the + * the proper strings accordingly. + * + * @since 2.2.0 + */ + public function add_strings() { + + /** Automatic activation strings */ + if ( TGM_Plugin_Activation::$instance->is_automatic ) { + $this->upgrader->strings['skin_upgrade_start'] = __( 'The installation and activation process is starting. This process may take a while on some hosts, so please be patient.', TGM_Plugin_Activation::$instance->domain ); + $this->upgrader->strings['skin_update_successful'] = __( '%1$s installed and activated successfully.', TGM_Plugin_Activation::$instance->domain ) . ' ' . __( 'Show Details', TGM_Plugin_Activation::$instance->domain ) . '.'; + $this->upgrader->strings['skin_upgrade_end'] = __( 'All installations and activations have been completed.', TGM_Plugin_Activation::$instance->domain ); + $this->upgrader->strings['skin_before_update_header'] = __( 'Installing and Activating Plugin %1$s (%2$d/%3$d)', TGM_Plugin_Activation::$instance->domain ); + } + /** Default installation strings */ + else { + $this->upgrader->strings['skin_upgrade_start'] = __( 'The installation process is starting. This process may take a while on some hosts, so please be patient.', TGM_Plugin_Activation::$instance->domain ); + $this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while installing %1$s: %2$s.', TGM_Plugin_Activation::$instance->domain ); + $this->upgrader->strings['skin_update_failed'] = __( 'The installation of %1$s failed.', TGM_Plugin_Activation::$instance->domain ); + $this->upgrader->strings['skin_update_successful'] = __( '%1$s installed successfully.', TGM_Plugin_Activation::$instance->domain ) . ' ' . __( 'Show Details', TGM_Plugin_Activation::$instance->domain ) . '.'; + $this->upgrader->strings['skin_upgrade_end'] = __( 'All installations have been completed.', TGM_Plugin_Activation::$instance->domain ); + $this->upgrader->strings['skin_before_update_header'] = __( 'Installing Plugin %1$s (%2$d/%3$d)', TGM_Plugin_Activation::$instance->domain ); + } + + } + + /** + * Outputs the header strings and necessary JS before each plugin installation. + * + * @since 2.2.0 + */ + public function before() { + + /** We are currently in the plugin installation loop, so set to true */ + $this->in_loop = true; + + printf( '

' . $this->upgrader->strings['skin_before_update_header'] . '

', $this->plugin_names[$this->i], $this->upgrader->update_current, $this->upgrader->update_count ); + echo ''; + echo '

'; + + /** Flush header output buffer */ + $this->before_flush_output(); + + } + + /** + * Outputs the footer strings and necessary JS after each plugin installation. + * + * Checks for any errors and outputs them if they exist, else output + * success strings. + * + * @since 2.2.0 + */ + public function after() { + + /** Close install strings */ + echo '

'; + + /** Output error strings if an error has occurred */ + if ( $this->error || ! $this->result ) { + if ( $this->error ) + echo '

' . sprintf( $this->upgrader->strings['skin_update_failed_error'], $this->plugin_names[$this->i], $this->error ) . '

'; + else + echo '

' . sprintf( $this->upgrader->strings['skin_update_failed'], $this->plugin_names[$this->i] ) . '

'; + + echo ''; + } + + /** If the result is set and there are no errors, success! */ + if ( ! empty( $this->result ) && ! is_wp_error( $this->result ) ) { + echo '

' . sprintf( $this->upgrader->strings['skin_update_successful'], $this->plugin_names[$this->i], 'jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').toggle();jQuery(\'span\', this).toggle(); return false;' ) . '

'; + echo ''; + } + + /** Set in_loop and error to false and flush footer output buffer */ + $this->reset(); + $this->after_flush_output(); + + } + + /** + * Outputs links after bulk plugin installation is complete. + * + * @since 2.2.0 + */ + public function bulk_footer() { + + /** Serve up the string to say installations (and possibly activations) are complete */ + parent::bulk_footer(); + + /** Flush plugins cache so we can make sure that the installed plugins list is always up to date */ + wp_cache_flush(); + + /** Display message based on if all plugins are now active or not */ + $complete = array(); + foreach ( TGM_Plugin_Activation::$instance->plugins as $plugin ) { + if ( ! is_plugin_active( $plugin['file_path'] ) ) { + echo '

' . __( TGM_Plugin_Activation::$instance->strings['return'], TGM_Plugin_Activation::$instance->domain ) . '

'; + $complete[] = $plugin; + break; + } + /** Nothing to store */ + else { + $complete[] = ''; + } + } + + /** Filter out any empty entries */ + $complete = array_filter( $complete ); + + /** All plugins are active, so we display the complete string and hide the menu to protect users */ + if ( empty( $complete ) ) { + echo '

' . sprintf( TGM_Plugin_Activation::$instance->strings['complete'], '' . __( 'Return to the Dashboard', TGM_Plugin_Activation::$instance->domain ) . '' ) . '

'; + echo ''; + } + + } + + /** + * Flush header output buffer. + * + * @since 2.2.0 + */ + public function before_flush_output() { + + wp_ob_end_flush_all(); + flush(); + + } + + /** + * Flush footer output buffer and iterate $this->i to make sure the + * installation strings reference the correct plugin. + * + * @since 2.2.0 + */ + public function after_flush_output() { + + wp_ob_end_flush_all(); + flush(); + $this->i++; + + } + + } + } +} \ No newline at end of file diff --git a/inc/plugins/.DS_Store b/inc/plugins/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fd3918967cf0c47cf2e4dd30e410bfd7b2b9989d GIT binary patch literal 6148 zcmeHKyH3ME5S)b+ktm3$DDMX-_ya2n1vNhafe0ZPl7dK-?)Yq&eSokG5)}oSmGwddtzCY}-`&$@iGASShq<|EV0#e|&3V7|M&5sf_N&zV#1wIw< z??aZVpC<`(3n>K5dbrf25qheq%)@HDshd9=6q zePtA32ml%&!oUH96GKrAkil+%o=b3ia7lhqD##?h{uaNW7Kll2XYBPmY#`#ce|B0& z%LJQ+eR7cwk9gOtQZW3^dh3#tcI!6gsaDSzE0-6@*0(yHIxwZ{o^q^gbYK1(o`0MS zk~!(+4a@-wkx36ZSQopNC1e(z*?5>`{fz}S^IkvcNZx-)IsS-JTZl zFf5xpNAC33%UfdnC)(ZGeQaynmD0)YgXYI)?px}1#<2PL=4)I2EPn3%Cepmbr2Mb} z&tsd3OCBw{ohZ>(*mUIU!OM;7CbhnmoGbsOaLaP$SXJ)%r(ev`%W$u@x)5q4uKVz* z^N(kLpSsGtefeRzru4C!7rcuK|L_0*_g}umF?+X94>K$dJa1j#dMA7Dv5NbQcg|k4 zV@Y|Lo+uyxb{=2J)Esuk!!Nq{1H9Qe{&KyR5M^XwV3A+|2R9_XPDi5#HzzQ-ea-a_%J=FSCCNv zONp>F-5TPX|JY2xc75GZ87>RXoRjw!wD&fbY|We_;URNfp0~(IBU43ismIhMYouKN z|K`(Fb&J~0n&YgNes7QYXSeJ2S5swO#196Uuuk8QAR2e@*+0&A{}MuV1$K3B|NSpM{n4iX{X8t?-sOy7Fmt+RjM_&u0Xk&HnDA>Xp}E z=fm`E>Z^4vp#d6t+zCz>^SxaUOnc$^Ri|&k1gc)SpBN`nQP|5&lN_E`!yLY4tEtYhF{?PQ5AK( zQh>qX`rWA2PMc4aT3+u+2+50HR>;ME)xm4-^(kp&-sjew)0f z>1o;4nz;L|4A~_|E-3$LuP?fv9W;O8(wnp5erfw27qFe^c=DS^u-C-*oifc+d_MhW z{-7bh?fH$;?bUb0!=sW}45r z^ozhg&E(h@!8`{4Y-aYjPd;sUvtoCj?VRtG2R7v#4`Q!kV}4(@@|NtW9D|ld-Bq%= zN7h-*xPNrr_X!JU>lfH9mEFnlfXR>D@!p9o#r#Kitp9%g_R3;^-5Uoh)@Cj?_2OnT zeag?HBR}ojuMZ^=|37iOpK;erO(W#>=eQ~7rb+cyelO2IGL=6jAmW(MOpRqHJ#4fu zSXuR*4L_XP^>_7AdDny1J1OVPM`lST)R0%s^-v^5Q81-^5?kUx%a}& z>-##D8QD<+Qa^ixjT;0wHXT=5F=5jpy93#^-S13xSHvfmOjg}}IrCv@$bFt=2jlNE zf^w?YPZfJ-W(EcmHhekNgkZ5jT&Bfch7@W7%aGHO9ZY?SijF+j#ojl*n!$YJPKK9+ z;G;(;f9|a6WM#EnS*5sARCQhD$)B1tD_=UCymREqnLU&KJmSe_1{XW)imQ7LBHhqa zJ=2ewE!cSgu<3qr4U7Sds6vy`BO2~?os?jq5>;UN8_0{4)k@IJ=)s`BCL;{q=b|YZLW>Dp6b`gF?G=31CP2$VGO# bKgniXRj_eX6^-X~Vq63=A<+Z_M_}LszwRo5 literal 0 HcmV?d00001 diff --git a/inc/plugins/tgm-example-plugin/tgm-example-plugin.php b/inc/plugins/tgm-example-plugin/tgm-example-plugin.php new file mode 100644 index 000000000..c8d18ea81 --- /dev/null +++ b/inc/plugins/tgm-example-plugin/tgm-example-plugin.php @@ -0,0 +1,43 @@ +You are running on PHP ' . phpversion() . ' and MySQL ' . $wpdb->db_version() . '.

'; +} \ No newline at end of file diff --git a/inc/tgm-plugin-init.php b/inc/tgm-plugin-init.php new file mode 100755 index 000000000..0a221b388 --- /dev/null +++ b/inc/tgm-plugin-init.php @@ -0,0 +1,109 @@ + + * @author Gary Jones + * @copyright Copyright (c) 2012, Thomas Griffin + * @license http://opensource.org/licenses/gpl-2.0.php GPL v2 or later + * @link https://github.com/thomasgriffin/TGM-Plugin-Activation + */ + +/** + * Include the TGM_Plugin_Activation class. + */ +require_once dirname( __FILE__ ) . '/class-tgm-plugin-activation.php'; + +add_action( 'tgmpa_register', 'my_theme_register_required_plugins' ); +/** + * Register the required plugins for this theme. + * + * In this example, we register two plugins - one included with the TGMPA library + * and one from the .org repo. + * + * The variable passed to tgmpa_register_plugins() should be an array of plugin + * arrays. + * + * This function is hooked into tgmpa_init, which is fired within the + * TGM_Plugin_Activation class constructor. + */ +function my_theme_register_required_plugins() { + + /** + * Array of plugin arrays. Required keys are name and slug. + * If the source is NOT from the .org repo, then source is also required. + */ + $plugins = array( + + // This is an example of how to include a plugin pre-packaged with a theme + array( + 'name' => 'TGM Example Plugin', // The plugin name + 'slug' => 'tgm-example-plugin', // The plugin slug (typically the folder name) + 'source' => get_stylesheet_directory() . '/inc/plugins/tgm-example-plugin.zip', // The plugin source + 'required' => true, // If false, the plugin is only 'recommended' instead of required + 'version' => '', // E.g. 1.0.0. If set, the active plugin must be this version or higher, otherwise a notice is presented + 'force_activation' => false, // If true, plugin is activated upon theme activation and cannot be deactivated until theme switch + 'force_deactivation' => false, // If true, plugin is deactivated upon theme switch, useful for theme-specific plugins + 'external_url' => '', // If set, overrides default API URL and points to an external URL + ), + + // This is an example of how to include a plugin from the WordPress Plugin Repository + array( + 'name' => 'BuddyPress', + 'slug' => 'buddypress', + 'required' => false, + ), + + ); + + // Change this to your theme text domain, used for internationalising strings + $theme_text_domain = 'tgmpa'; + + /** + * Array of configuration settings. Amend each line as needed. + * If you want the default strings to be available under your own theme domain, + * leave the strings uncommented. + * Some of the strings are added into a sprintf, so see the comments at the + * end of each line for what each argument will be. + */ + $config = array( + 'domain' => $theme_text_domain, // Text domain - likely want to be the same as your theme. + 'default_path' => '', // Default absolute path to pre-packaged plugins + 'parent_menu_slug' => 'themes.php', // Default parent menu slug + 'parent_url_slug' => 'themes.php', // Default parent URL slug + 'menu' => 'install-required-plugins', // Menu slug + 'has_notices' => true, // Show admin notices or not + 'is_automatic' => false, // Automatically activate plugins after installation or not + 'message' => '', // Message to output right before the plugins table + 'strings' => array( + 'page_title' => __( 'Install Required Plugins', $theme_text_domain ), + 'menu_title' => __( 'Install Plugins', $theme_text_domain ), + 'installing' => __( 'Installing Plugin: %s', $theme_text_domain ), // %1$s = plugin name + 'oops' => __( 'Something went wrong with the plugin API.', $theme_text_domain ), + 'notice_can_install_required' => _n_noop( 'This theme requires the following plugin: %1$s.', 'This theme requires the following plugins: %1$s.' ), // %1$s = plugin name(s) + 'notice_can_install_recommended' => _n_noop( 'This theme recommends the following plugin: %1$s.', 'This theme recommends the following plugins: %1$s.' ), // %1$s = plugin name(s) + 'notice_cannot_install' => _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s) + 'notice_can_activate_required' => _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s) + 'notice_can_activate_recommended' => _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s) + 'notice_cannot_activate' => _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s) + 'notice_ask_to_update' => _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this theme: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this theme: %1$s.' ), // %1$s = plugin name(s) + 'notice_cannot_update' => _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s) + 'install_link' => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ), + 'activate_link' => _n_noop( 'Activate installed plugin', 'Activate installed plugins' ), + 'return' => __( 'Return to Required Plugins Installer', $theme_text_domain ), + 'plugin_activated' => __( 'Plugin activated successfully.', $theme_text_domain ), + 'complete' => __( 'All plugins installed and activated successfully. %s', $theme_text_domain ), // %1$s = dashboard link + 'nag_type' => 'updated' // Determines admin notice type - can only be 'updated' or 'error' + ) + ); + + tgmpa( $plugins, $config ); + +} \ No newline at end of file From 5dea90b5898e8f8498b23fbf4e09e348d591069f Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Thu, 28 Jun 2012 18:46:27 -0400 Subject: [PATCH 10/13] make nav menus responsive-ish still need to work on a solution for phones --- header.php | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/header.php b/header.php index fe39cae57..490cb3d5e 100644 --- a/header.php +++ b/header.php @@ -94,8 +94,8 @@

Skip to content @@ -114,17 +114,17 @@ if ( 'blank' == get_header_textcolor() || '' == get_header_textcolor()): $style = ' style="display:none;"'; ?> -

@@ -144,31 +144,14 @@ -

- have_posts() ) : $featured->the_post(); ?> - -

- - -

+ From 982205cd7c93c6aefdbfaee642d2fdb169c1e9db Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Thu, 28 Jun 2012 18:46:51 -0400 Subject: [PATCH 11/13] add tgm plugin init function --- functions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/functions.php b/functions.php index bf79e1cc8..c88346ec3 100644 --- a/functions.php +++ b/functions.php @@ -45,6 +45,7 @@ require_once( TEMPLATEPATH . '/inc/related-content.php' ); require_once( TEMPLATEPATH . '/inc/featured-content.php' ); require_once( TEMPLATEPATH . '/inc/special-functionality.php' ); +require_once( TEMPLATEPATH . '/inc/tgm-plugin-init.php' ); /** * Tell WordPress to run argo_setup() when the 'after_setup_theme' hook is run. From 7e42efdf237e199fe7cfc658ae678a4929a91d89 Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Thu, 28 Jun 2012 18:47:33 -0400 Subject: [PATCH 12/13] make nav menus responsive-ish to-do: account for smaller screens (< 480px) --- inc/nav-menus.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/nav-menus.php b/inc/nav-menus.php index ca7d72a72..0ae18beb0 100644 --- a/inc/nav-menus.php +++ b/inc/nav-menus.php @@ -51,19 +51,19 @@ function start_el( &$output, $item, $depth, $args ) { $li_class = ( $output ) ? '' : ' class="first"'; $output .= '' . $item->title . ''; - $output .= '

'; + $output .= '
- '; - $output .= '
  '; + $output .= '
  '; $cat = get_category( $item->object_id ); $output .= '
  ' . $cat->description . '
  '; $output .= '
  '; - $output .= '
  '; + $output .= '
  '; $output .= '
  RELATED TOPICS
  '; $output .= argo_get_related_topics_for_category( $item ); $output .= '
  '; - $output .= '
  '; + $output .= '
  '; $output .= '
  LATEST POSTS
  '; $output .= argo_get_latest_posts_for_category( $item ); $output .= '
  '; From 3f1f182b5ec0ec21db29a47d3fe61569f6036507 Mon Sep 17 00:00:00 2001 From: Adam Schweigert Date: Thu, 28 Jun 2012 18:47:55 -0400 Subject: [PATCH 13/13] apply modular typography scale and some general cleanup --- css/foundation.css | 233 +++++++++++++++++++++------------------------ 1 file changed, 109 insertions(+), 124 deletions(-) diff --git a/css/foundation.css b/css/foundation.css index 67bfd4f92..27be5100a 100755 --- a/css/foundation.css +++ b/css/foundation.css @@ -356,9 +356,6 @@ form.inline p { margin-bottom:0; } } .global-nav { - margin-left: auto; - margin-right: auto; - width: 940px; color: #fff; font-size: 11px; position: relative; @@ -535,17 +532,17 @@ margin-left: 70px; } .search-submit { -font-family: helvetica, arial, sans-serif; -font-weight: bold; -color: #eee; -font-size: 12px; -background-color: #000; -border: none; -padding: 4px 3px; + font-family: helvetica, arial, sans-serif; + font-weight: bold; + color: #eee; + font-size: 12px; + background-color: #000; + border: none; + padding: 4px 3px; } .search-submit:hover { -background-color: #333; + background-color: #333; } #searchform-footer { @@ -581,7 +578,7 @@ background-color: #333; } .ie6 #follow-us { -display: none; + display: none; } #follow-us li { @@ -624,12 +621,9 @@ display: none; /* mega menu */ #main-nav { - margin-left: auto; - margin-right: auto; margin-top: 5px; margin-bottom: 10px; - width: 940px; - min-height: 32px; + min-height: 38px; position: relative; z-index: 100; } @@ -653,7 +647,7 @@ display: none; #topnav li a { float: left; - padding: 5px 22px 5px 5px; + padding: 8px 25px 8px 8px; margin: 0 5px; color: #000; background: transparent url(../img/arrow-down.png) no-repeat 95% 50%; @@ -676,7 +670,6 @@ display: none; top: 31px; left: -5px; float: left; - width: 925px; display: none; border: 4px solid #999; } @@ -690,8 +683,8 @@ display: none; #topnav li .sub ul{ list-style: none; - margin: 0; padding: 0; - width: 915px; + margin: 0; + padding: 0; float: left; background-color: #fff; } @@ -701,7 +694,6 @@ display: none; color: #333; border: none; background-color: #fff !important; - padding: 5px; } #topnav .sub ul li a { @@ -724,8 +716,7 @@ display: none; } .inner-menu { - width: 920px; - padding: 10px; + padding: 10px 0; } #topnav .sub .inner-menu a { @@ -740,13 +731,12 @@ display: none; .mega-feature { - width: 320px; float: left; } .mega-feature h2 { - font-size: 24px; - line-height: 1.2; + font-size: 1.5em; + line-height: 1.222; color: #666; padding-bottom: 15px; } @@ -757,8 +747,8 @@ display: none; } .mega-feature h3 { - font-size: 16px; - line-height: 1.2; + font-size: 1.222em; + line-height: 1; margin: 0 0 5px 0; } @@ -769,18 +759,16 @@ display: none; .mega-feature .read-more { font-weight: bold; - font-size: 11px; + font-size: 0.815em; } .category-articles { - width: 320px; float: left; - margin-left: 20px; } .category-articles h4 { - font-size: 14px; - line-height: 1.2; + font-size: 1em; + line-height: 1; margin: 0 0 10px 0; padding-bottom: 8px !important; border-bottom: 1px solid #ddd; @@ -793,7 +781,7 @@ display: none; } .category-articles h5 a { - font-size: 12px; + font-size: 0.815em; line-height: 1; margin: 0 0 5px 0; display: block; @@ -801,20 +789,18 @@ display: none; } #topnav .category-topics ul { - width: 200px !important; padding: 0; } #topnav .category-topics li { + font: 1em Georgia, Times, "Times New Roman", serif; margin: 0 0 10px 0 !important; - font-size: 15px; - padding: 0 0 10px !important; + line-height:1; + padding-bottom: 8px !important; border-bottom: 1px solid #ddd !important; } .category-topics { - width: 210px; - margin-left: 20px; float: left; } @@ -833,8 +819,8 @@ display: none; } .single .post, .page .post { -padding-bottom: 0; -border-bottom: none; + padding-bottom: 0; + border-bottom: none; } .ie6 #content { @@ -869,11 +855,11 @@ border-bottom: none; font-weight: bold; } */ -.post ul { - list-style: disc; +.post ul li { + list-style: disc !important; } -.post ol { - list-style: decimal; +.post ol li { + list-style: decimal !important; } .post li { margin: 0 0 10px 30px; @@ -882,12 +868,11 @@ border-bottom: none; .ie8 .post li, .ie7 .post li, .ie6 .post li { margin: 0 0 10px 50px; } -/* -.entry-title { -font-size: 30px; -margin: 10px 0; + +h2.entry-title { + font-size: 2.75em; + margin: 10px 0; } -*/ #content h2 a { color: #333; font-weight: normal; @@ -912,7 +897,7 @@ margin: 10px 0; } #content .intro { /*style the first paragraph in a long post */ - font-size: 18px; + font-size: 1.222em; font-style: italic; color: #999; line-height: 1.3; @@ -952,7 +937,6 @@ margin: 10px 0; #content .post-meta h5 { font-weight: normal; - /*font-size: 12px !important;*/ font: 0.815em "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 5px 0 0 0; color: #666; @@ -967,7 +951,9 @@ margin: 10px 0; margin: 0 0 10px 0; position: relative; } - +.post ul.meta-gestures li { + list-style:none !important; +} .meta-gestures li { float: left; margin: 5px 10px 5px 0; @@ -1003,7 +989,7 @@ margin: 10px 0; #content .labels a { background-color: #eeeeee; color: #999; - font-size: 11px; + font-size: 0.815em; padding: 3px 6px; text-decoration: none; -moz-border-radius: 3px; @@ -1018,7 +1004,7 @@ margin: 10px 0; } #term-view { -font-weight: bold; + font-weight: bold; } .subscribe {/* RSS Icon */ @@ -1039,67 +1025,66 @@ font-weight: bold; /* blog hosts */ .hosts img { -float: left; -margin-right: 10px; -border: 1px solid #ddd; + float: left; + margin-right: 10px; + border: 1px solid #ddd; } .hosts div { -margin-bottom: 10px; + margin-bottom: 10px; } #site-footer .hosts img { -float: none; -border: none; + float: none; + border: none; } .hosts h4 { -font-size: 16px; -margin: 0; + font-size: 1em; + margin: 0; } .hosts p { -margin-bottom: 0; + margin-bottom: 0; } #site-footer .hosts h4 { -font-size: 12px; + font-size: 1em; } #site-footer .hosts p { -font-size: 11px; + font-size: 0.815em; } #page .hosts h4 a { -font-weight: bold; + font-weight: bold; } /* author archive page */ .author #page .vcard a { -color: #333; + color: #333; } /* guest author bio */ .navis-author-bio { -border-top: 4px solid #ddd; -margin-bottom: 20px; -padding-top: 10px; -font-style: italic; + border-top: 4px solid #ddd; + margin-bottom: 20px; + padding-top: 10px; + font-style: italic; } #content .navis-author-bio h4 { -font-size: 14px; -margin: 0 0 5px 0; + font: 1.222em "Helvetica Neue", Helvetica, Arial, sans-serif; + margin: 0 0 5px 0; } #content .navis-author-bio p { -font-size: 12px; -color: #666; -background: none; -padding: 0; -margin: 0; + color: #666; + background: none; + padding: 0; + margin: 0; } /* related posts */ @@ -1187,7 +1172,7 @@ margin: 0; } #related-posts .top-related h3 { - font-size: 14px; + font-size: 1em; font-weight: normal; margin: 0 0 5px 0; } @@ -1256,11 +1241,11 @@ margin: 0; } #content .argo-next { -margin-right: 0; + margin-right: 0; } #content .argo-next a { -padding-right: 0; + padding-right: 0; } /* post page content modules */ @@ -1281,7 +1266,7 @@ padding-right: 0; } #content .module dt { - font-size: 14px; + font-size: 1em; margin-bottom: 10px; } @@ -1290,7 +1275,7 @@ padding-right: 0; } #content .aside p { - font-size: 11px; + font-size: 0.815em; } .image p { @@ -1303,7 +1288,7 @@ padding-right: 0; } #content .wp-media-credit { - font-size: 10px; + font-size: 0.667em; margin: 0; text-align: right; color: #666; @@ -1312,7 +1297,7 @@ padding-right: 0; } #content .wp-caption-text { - font-size: 12px; + font-size: 0.815em; margin: 5px 0 0 0; color: #666; font-style: italic; @@ -1370,7 +1355,7 @@ http://wordpress.org/extend/themes/twentyeleven ----------------------------------------------- */ #content #comments-title { - font-size: 24px; + font-size: 1.5em; margin-bottom: 20px; font-weight: bold; } @@ -1378,7 +1363,7 @@ http://wordpress.org/extend/themes/twentyeleven .nopassword, .nocomments { color: #aaa; - font-size: 24px; + font-size: 1.5em; font-weight: 100; margin: 26px 0; text-align: center; @@ -1423,7 +1408,7 @@ http://wordpress.org/extend/themes/twentyeleven } .comment-meta { color: #666; - font-size: 12px; + font-size: 0.815em; line-height: 2.2em; } .commentlist .children li.comment .comment-meta { @@ -1546,7 +1531,7 @@ a.comment-reply-link > span { box-shadow: 1px 2px 2px rgba(204,204,204,0.8); color: #555; display: inline-block; - font-size: 13px; + font-size: 0.815em; left: 4px; min-width: 60px; padding: 4px 10px; @@ -1575,7 +1560,7 @@ a.comment-reply-link > span { } #respond .comment-notes, #respond .logged-in-as { - font-size: 13px; + font-size: 0.815em; } #respond p { margin: 10px 0; @@ -1612,7 +1597,7 @@ background: #555; } #respond #cancel-comment-reply-link { color: #666; - margin-left: 10px; + margin-left: 0.667em; text-decoration: none; } #respond .logged-in-as a:hover, @@ -1625,14 +1610,14 @@ background: #555; } #reply-title { color: #373737; - font-size: 24px; + font-size: 1.5em; font-weight: bold; line-height: 30px; } #cancel-comment-reply-link { color: #888; display: block; - font-size: 10px; + font-size: 0.667em; font-weight: normal; line-height: 2.2em; letter-spacing: 0.05em; @@ -1656,7 +1641,7 @@ background: #555; width: 75%; } #respond p { - font-size: 12px; + font-size: 0.815em; } p.comment-form-comment { margin: 0; @@ -1683,7 +1668,7 @@ p.comment-form-comment { border-bottom: 1px solid #ccc; padding-bottom: 5px; color: #666; - font-size: 12px; + font-size: 0.815em; } #content .sticky img { @@ -1705,7 +1690,7 @@ p.comment-form-comment { #content .sticky h2 { - font-size: 22px; + font-size: 1.5em; margin-bottom: 10px; margin-top: -2px; } @@ -1713,7 +1698,7 @@ p.comment-form-comment { #content .sticky p { margin-bottom: 0; - font-size: 14px; + font-size: 1em; } #content .sticky a { @@ -1772,21 +1757,21 @@ p.comment-form-comment { /**************** ARCHIVE PAGE ***********************/ #archive-intro { -border-bottom: 4px solid #ddd; -margin-bottom: 20px; -padding-bottom: 10px; + border-bottom: 4px solid #ddd; + margin-bottom: 20px; + padding-bottom: 10px; } #archive-intro h3 { -font-size: 20px; -margin-bottom: 5px; + font-size: 1.5em; + margin-bottom: 5px; } #archive-intro p { -font-size: 12px; -color: #666; -font-style: italic; -margin-bottom: 5px; + font-size: 1em; + color: #666; + font-style: italic; + margin-bottom: 5px; } .archive-dropdown { @@ -1794,7 +1779,7 @@ margin-bottom: 5px; } #content .recent-posts, .tag #content .recent-posts { - font-size: 14px; + font-size: 1em; color: #666; margin-bottom: 10px; padding: 10px 0; @@ -1816,7 +1801,7 @@ margin-bottom: 5px; } #content .category-description p { - font-size:14px; + font-size:1em; color: #666; font-style: italic; } @@ -1824,14 +1809,14 @@ margin-bottom: 5px; .related-topics { margin: 0; - padding: 0 0 10px 0; + padding: 10px 0; } #content .related-topics h4 { - color: #333; - font-size: 13px; - margin: 0 0 5px 0; - font-weight: bold; + color: #666; + font-size:0.815em; + margin: 0 0 0.75em 0; + text-transform:uppercase; } .related-topics ul { @@ -1842,7 +1827,7 @@ margin-bottom: 5px; float: left; margin: 0 10px 0 0; font-style: italic; - font-size: 12px; + font-size: 0.815em; border-right: 1px solid #999; padding-right: 10px; line-height: 1; @@ -1857,7 +1842,7 @@ margin-bottom: 5px; /************** SEARCH RESULTS ******************/ .search-term { - font-size: 16px; + font-size: 1em; font-style: italic; color: #666; } @@ -1867,13 +1852,13 @@ margin-bottom: 5px; } #content .search-results h2 { - font-size: 20px; + font-size: 1.5em; margin: 10px 0; } #content .search-results { color: #666; - font-size: 13px; + font-size: 0.815em; } .search-pagination a { @@ -1899,19 +1884,19 @@ margin-bottom: 5px; } .tag #content h3 { - font-size: 18px; + font-size: 1.222em; font-weight: normal; } .topic-background { margin: 0 0 20px 0; color: #666; - font-size: 14px; + font-size: 1em; font-style: italic; } .topic-background p { - font-size: 12px; + font-size: 0.815em; } .tag-subscribe { @@ -1930,11 +1915,11 @@ margin-bottom: 5px; /**************** SIDEBARS ***********************/ #sidebar { -font-size: 13px; +font-size: 0.815em; } #sidebar .widgettitle, #sidebar widget-title { -font-size: 21px; +font-size: 1.833em; margin: 0 0 10px 0; } @@ -2517,4 +2502,4 @@ margin: 10px 0; /* Prevent iOS, WinMobile from adjusting font size html { -webkit-text-size-adjust:none; -ms-text-size-adjust:none; } */ - } \ No newline at end of file + }

MORE POSTS ABOUT

Browse archives by date

Browse archives by date

' . esc_html( get_admin_page_title() ) . '

' . $this->upgrader->strings['skin_before_update_header'] . '

' . $cat->description . '

RELATED TOPICS

LATEST POSTS