diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-03-29 05:37:53 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-03-29 05:37:53 +0400 |
| commit | 6684ca294e961ba4c45a351a1f347c2a18faa055 (patch) | |
| tree | 4dc1a6c9711124538324cb64ef55677dd2455aa4 | |
| parent | db0dab9235a5ac0dd1216708a58f17483e3b4213 (diff) | |
refs #3734 better integration of Majesticseo.com links1.12-b2
* linking on metric value
* Display + linking on "Majestic"
| -rw-r--r-- | core/Version.php | 2 | ||||
| -rw-r--r-- | lang/en.php | 4 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/styles.css | 4 | ||||
| -rw-r--r-- | plugins/SEO/templates/index.tpl | 12 |
4 files changed, 15 insertions, 7 deletions
diff --git a/core/Version.php b/core/Version.php index d6e1bca6ba..20f3052322 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,5 +20,5 @@ final class Piwik_Version * Current Piwik version * @var string */ - const VERSION = '1.12-b1'; + const VERSION = '1.12-b2'; } diff --git a/lang/en.php b/lang/en.php index 526eb354bb..4f36dea2e2 100644 --- a/lang/en.php +++ b/lang/en.php @@ -1289,8 +1289,8 @@ And thank you for using Piwik!', 'SEO_Bing_IndexedPages' => 'Bing indexed pages', 'SEO_Dmoz' => 'DMOZ entries', 'SEO_SEORankingsFor' => 'SEO Rankings for %s', - 'SEO_ExternalBacklinks' => 'External Backlinks', - 'SEO_ReferrerDomains' => 'Referrer Domains', + 'SEO_ExternalBacklinks' => 'External Backlinks (Majestic)', + 'SEO_ReferrerDomains' => 'Referrer Domains (Majestic)', 'SEO_ViewBacklinksOnMajesticSEO' => 'View External Backlinks report on MajesticSEO.com', 'SitesManager_PluginDescription' => 'Websites Management in Piwik: Add a new Website, Edit an existing one, Show the JavaScript code to include on your pages. All the actions are also available through the API.', 'SitesManager_Sites' => 'Websites', diff --git a/plugins/CoreHome/templates/styles.css b/plugins/CoreHome/templates/styles.css index 005e8840bc..0b679f48b9 100644 --- a/plugins/CoreHome/templates/styles.css +++ b/plugins/CoreHome/templates/styles.css @@ -233,3 +233,7 @@ a.Piwik_Popover_Error_Back { #header_message #checkForUpdates:hover { text-decoration: none; } + +/* Used to link within content text, without adding visual clutter */ +.linkContent { color:#333; text-decoration:none} +.linkContent:hover { text-decoration:underline;}
\ No newline at end of file diff --git a/plugins/SEO/templates/index.tpl b/plugins/SEO/templates/index.tpl index 721ca46ee5..0a100bddb3 100644 --- a/plugins/SEO/templates/index.tpl +++ b/plugins/SEO/templates/index.tpl @@ -17,23 +17,27 @@ {'General_Error'|translate} {else} {capture name=cleanUrl} - <a href='{$urlToRank|escape:'html'}' target='_blank'>{$urlToRank|escape:'html'}</a> + <a href='http://{$urlToRank|escape:'html'}' target='_blank'>{$urlToRank|escape:'html'}</a> {/capture} {'SEO_SEORankingsFor'|translate:$smarty.capture.cleanUrl} <table cellspacing='2' style='margin:auto;line-height:1.5em;padding-top:10px'> {foreach from=$ranks item=rank} <tr> - <td>{if !empty($rank.logo_link)}<a href="{$rank.logo_link}" target="_blank" - {if !empty($rank.logo_tooltip)}title="{$rank.logo_tooltip}"{/if}>{/if}<img + {capture assign=seoLink}<a class="linkContent" href="?module=Proxy&action=redirect&url={$rank.logo_link|urlencode}" target="_blank" + {if !empty($rank.logo_tooltip)}title="{$rank.logo_tooltip}"{/if}>{/capture} + {capture assign=majesticLink}{$seoLink}Majestic</a>{/capture} + <td>{if !empty($rank.logo_link)}{$seoLink}{/if}<img style='vertical-align:middle;margin-right:6px;' src='{$rank.logo}' border='0' - alt="{$rank.label}">{if !empty($rank.logo_link)}</a>{/if} {$rank.label} + alt="{$rank.label}">{if !empty($rank.logo_link)}</a>{/if} {$rank.label|replace:"Majestic":$majesticLink} </td> <td> <div style='margin-left:15px'> + {if !empty($rank.logo_link)}{$seoLink}{/if} {if isset($rank.rank)}{$rank.rank}{else}-{/if} {if $rank.id=='pagerank'} /10 {elseif $rank.id=='google-index' || $rank.id=='bing-index'} {'SEO_Pages'|translate} {/if} + {if !empty($rank.logo_link)}</a>{/if} </div> </td> </tr> |