Commit 6cbb5799 authored by Aaron Wells's avatar Aaron Wells
Browse files

Removing straightfoward instances of target="_blank"

Bug 1558361

behatnotneeded

Change-Id: Idc139a671137cbde6958fdc8406bc56f8c395f08
parent 97d5846a
......@@ -217,7 +217,7 @@ $smarty->assign('introtext1', get_string('cookieconsentintro1', 'cookieconsent')
$smarty->assign('introtext2', get_string('cookieconsentintro2', 'cookieconsent'));
$smarty->assign('introtext3', get_string('cookieconsentintro3', 'cookieconsent'));
$smarty->assign('introtext4', get_string('cookieconsentintro4', 'cookieconsent'));
$smarty->assign('introtext5', get_string('cookieconsentintro51', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/" target="_blank">', '</a>'));
$smarty->assign('introtext5', get_string('cookieconsentintro51', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/">', '</a>'));
// Official EU languages
$smarty->assign('languages', array('BG','CS','DA','DE','EL','EN','ES','ET','FI','FR','HU','IT','LT','LV','MT','NL','PL','PT','RO','SK','SL','SV'));
$smarty->assign('PAGEHEADING', TITLE);
......
......@@ -158,7 +158,7 @@ $data = array(
'code1' => $examplesocialbefore,
'code2' => $examplesocialafter,
'help1' => get_string('itdidntwork1', 'cookieconsent', 'cc-onconsent-social', 'cc-onconsent-inline-social'),
'help2' => get_string('itdidntwork2', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/documentation/code-examples#examples-social" target="_blank">', '</a>', '<a href="http://www.linkedin.com/groups/Cookie-Consent-developers-4980594?trk=groups_management_submission_queue-h-dsc" target="_blank">', '</a>')
'help2' => get_string('itdidntwork2', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/documentation/code-examples#examples-social">', '</a>', '<a href="http://www.linkedin.com/groups/Cookie-Consent-developers-4980594?trk=groups_management_submission_queue-h-dsc">', '</a>')
),
'analytics' => array(
'title' => get_string('cookietypesanalytics', 'cookieconsent'),
......@@ -168,7 +168,7 @@ $data = array(
'code1' => $exampleanalyticsbefore,
'code2' => $exampleanalyticsafter,
'help1' => get_string('itdidntwork1', 'cookieconsent', 'cc-onconsent-analytics', 'cc-onconsent-inline-analytics'),
'help2' => get_string('itdidntwork2', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/documentation/code-examples#examples-analytics" target="_blank">', '</a>', '<a href="http://www.linkedin.com/groups/Cookie-Consent-developers-4980594?trk=groups_management_submission_queue-h-dsc" target="_blank">', '</a>')
'help2' => get_string('itdidntwork2', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/documentation/code-examples#examples-analytics">', '</a>', '<a href="http://www.linkedin.com/groups/Cookie-Consent-developers-4980594?trk=groups_management_submission_queue-h-dsc">', '</a>')
),
'advertising' => array(
'title' => get_string('cookietypesadvertising', 'cookieconsent'),
......@@ -178,7 +178,7 @@ $data = array(
'code1' => $exampleadvertisingbefore,
'code2' => $exampleadvertisingafter,
'help1' => get_string('itdidntwork1', 'cookieconsent', 'cc-onconsent-advertising', 'cc-onconsent-inline-advertising'),
'help2' => get_string('itdidntwork2', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/documentation/code-examples#examples-advertising" target="_blank">', '</a>', '<a href="http://www.linkedin.com/groups/Cookie-Consent-developers-4980594?trk=groups_management_submission_queue-h-dsc" target="_blank">', '</a>')
'help2' => get_string('itdidntwork2', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/documentation/code-examples#examples-advertising">', '</a>', '<a href="http://www.linkedin.com/groups/Cookie-Consent-developers-4980594?trk=groups_management_submission_queue-h-dsc">', '</a>')
),
'necessary' => array(
'title' => get_string('cookietypesnecessary', 'cookieconsent'),
......@@ -188,7 +188,7 @@ $data = array(
'code1' => $examplenecessarybefore,
'code2' => $examplenecessaryafter,
'help1' => get_string('itdidntwork1', 'cookieconsent', 'cc-onconsent-necessary', 'cc-onconsent-inline-necessary'),
'help2' => get_string('itdidntwork2', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/documentation/code-examples#examples-necessary" target="_blank">', '</a>', '<a href="http://www.linkedin.com/groups/Cookie-Consent-developers-4980594?trk=groups_management_submission_queue-h-dsc" target="_blank">', '</a>')
'help2' => get_string('itdidntwork2', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/documentation/code-examples#examples-necessary">', '</a>', '<a href="http://www.linkedin.com/groups/Cookie-Consent-developers-4980594?trk=groups_management_submission_queue-h-dsc">', '</a>')
)
);
......
......@@ -34,7 +34,7 @@ if (!empty($font)) {
$fonttitle = $fontdata->title;
if (!empty($fontdata->licence) && !is_null($fontdata->licence)) {
$fontpath = get_config('wwwroot') . 'skins/fonts/' . $fontdata->name . '/';
$fontlicence = '<a href="' . $fontpath . $fontdata->licence . '" target="_blank">' . get_string('fontlicence', 'skin') . '</a>';
$fontlicence = '<a href="' . $fontpath . $fontdata->licence . '">' . get_string('fontlicence', 'skin') . '</a>';
}
else {
$fontlicence = get_string('fontlicencenotfound', 'skin');
......
......@@ -83,7 +83,7 @@ if (empty($edit)) {
else {
$elements['name']['value'] = $edit->name;
$elements['name']['type'] = 'hidden';
$elements['name2']['value'] = '<a href="' . hsc($edit->name) . '" target="_blank">' . hsc($edit->name) . '</a>';
$elements['name2']['value'] = '<a href="' . hsc($edit->name) . '">' . hsc($edit->name) . '</a>';
unset($elements['name2']['ignore']);
foreach (array('displayname', 'shortname', 'icon') as $f) {
$elements[$f]['defaultvalue'] = $edit->{$f};
......
{if ($editing)}
<div class="shortcut">
<span> <a class="btn" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}" target="_blank">{str tag='shortcutnewentry' section='artefact.blog'}</a> </span>
<span> <a class="btn" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}">{str tag='shortcutnewentry' section='artefact.blog'}</a> </span>
</div>
{/if}
{if !$options.hidetitle}
......
{foreach $files file}
<div class="filedownload-item" title="{$file.title}">
<div class="fl"><a href="{$file.downloadurl}" target="_blank"><img src="{$file.iconsrc}" alt=""></a></div>
<div class="fl"><a href="{$file.downloadurl}"><img src="{$file.iconsrc}" alt=""></a></div>
<div style="margin-left: 30px;">
<h3 class="title"><a href="{$file.downloadurl}" target="_blank">{$file.title}</a></h3>
<h3 class="title"><a href="{$file.downloadurl}">{$file.title}</a></h3>
{if $file.description}<div class="detail">{$file.description}</div>{/if}
<div class="description">{$file.size|display_size} | {$file.ctime|format_date:'strftimedaydate'}
| <a href="{$WWWROOT}artefact/artefact.php?artefact={$file.id}&view={$viewid}">{str tag=Details section=artefact.file}</a></div>
......
......@@ -42,13 +42,13 @@ $string['previewwidthdesc'] = 'Set the maximum width to which the photos will be
// Flickr
$string['flickrsettings'] = 'Flickr settings';
$string['flickrapikey'] = 'Flickr API key';
$string['flickrapikeydesc'] = 'To show photo sets from Flickr, you\'ll need a valid Flickr API key. <a href="https://www.flickr.com/services/api/keys/apply/" target="_blank">Apply for your key online</a>.';
$string['flickrapikeydesc'] = 'To show photo sets from Flickr, you\'ll need a valid Flickr API key. <a href="https://www.flickr.com/services/api/keys/apply/">Apply for your key online</a>.';
$string['flickrsets'] = 'Flickr sets';
// Photobucket
$string['pbsettings'] = 'Photobucket settings';
$string['pbapikey'] = 'Photobucket API key';
$string['pbapikeydesc'] = 'To show photo albums from Photobucket, you\'ll need a valid API key and API private key.<br>Go to the <a href="http://developer.photobucket.com/" target="_blank">Photobucket developer website</a>, agree to the terms of service, sign up, and get the API keys.';
$string['pbapikeydesc'] = 'To show photo albums from Photobucket, you\'ll need a valid API key and API private key.<br>Go to the <a href="http://developer.photobucket.com/">Photobucket developer website</a>, agree to the terms of service, sign up, and get the API keys.';
$string['pbapiprivatekey'] = 'Photobucket API private key';
$string['photobucketphotosandalbums'] = 'Photobucket user photos and albums';
......
......@@ -223,9 +223,9 @@ class PluginBlocktypeGallery extends PluginBlocktype {
$thumb = str_replace('/original/', '/thumbnail/', $photo['photo_file_url']);
}
$title = (!empty($photo['photo_title']) ? $photo['photo_title'] : get_string('Photo', 'blocktype.file/gallery'));
$description = '<a href="' . $photo['photo_url'] . '" target="_blank">' . $title . '</a>'
$description = '<a href="' . $photo['photo_url'] . '">' . $title . '</a>'
. '&nbsp;' . get_string('by', 'blocktype.file/gallery') . '&nbsp;'
. '<a href="' . $photo['owner_url'] . '" target="_blank">' . $photo['owner_name'] . '</a>';
. '<a href="' . $photo['owner_url'] . '">' . $photo['owner_name'] . '</a>';
$images[] = array(
'link' => $link,
......
......@@ -8,7 +8,7 @@
</td>
<td>
{foreach from=$images item=image key=k name=images}
<a href="{$image.link}" target="_blank"><img src="{$image.source}" alt="{$image.title}" title="{$image.title}" style="max-width: {$width}px;{if !$dwoo.foreach.images.first} display:none;{/if}"></a>
<a href="{$image.link}"><img src="{$image.source}" alt="{$image.title}" title="{$image.title}" style="max-width: {$width}px;{if !$dwoo.foreach.images.first} display:none;{/if}"></a>
{if $showdescription && $image.title}<div class="caption" id="description_{$instanceid}_{$k}" style="{if !$dwoo.foreach.images.first} display:none;{/if}">{$image.title}</div>{/if}
{/foreach}
</td>
......@@ -32,4 +32,4 @@ $j(function() {
</script>
{else}
{str tag=noimagesfound section=artefact.file}
{/if}
\ No newline at end of file
{/if}
<div class="thumbnails" id="thumbnails{$instanceid}">
{foreach from=$images item=image}
<div style="float:left;{if $frame} padding: 3px;{/if}" class="thumb">
<a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}" target="_blank">
<a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}">
<img src="{$image.source}" alt="{$image.title}" title="{$image.title}" width="{$width}" height="{$width}" {if $frame}class="frame"{/if}/>
</a>
{if $showdescription && $image.title}<div class="caption" style="width: {$captionwidth}px;">{$image.title|safe}</div>{/if}
......
<a href="https://www.flickr.com/" target="_blank">
<a href="https://www.flickr.com/">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/flickr.png" border="0" width="16" height="16" title="{str tag=flickrsets section=blocktype.file/gallery}">
</a>
<a href="http://picasaweb.google.com/" target="_blank">
<a href="http://picasaweb.google.com/">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/picasa.png" border="0" width="16" height="16" title="{str tag=picasaalbums section=blocktype.file/gallery}">
</a>
<a href="http://www.panoramio.com/" target="_blank">
<a href="http://www.panoramio.com/">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/panoramio.png" border="0" width="16" height="16" title="{str tag=panoramiouserphotos section=blocktype.file/gallery}">
</a>
<a href="http://www.photobucket.com/" target="_blank">
<a href="http://www.photobucket.com/">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/photobucket.png" border="0" width="16" height="16" title="{str tag=photobucketphotosandalbums section=blocktype.file/gallery}">
</a>
<a href="http://www.live.com/" target="_blank">
<a href="http://www.live.com/">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/windowslive.png" border="0" width="16" height="16" title="{str tag=windowslivephotoalbums section=blocktype.file/gallery}">
</a>
<div class="thumbnails" id="thumbnails{$instanceid}">
{foreach from=$images item=image}
<div style="float:left;{if $frame} padding: 3px;{/if}" class="thumb">
<a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}" target="_blank">
<a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}">
<img src="{$image.source}" {if $image.height}height="{$image.height}"{/if} alt="{$image.title}" title="{$image.title}" {if $frame}class="frame"{/if} />
</a>
{if $showdescription && $image.title}<div class="caption" style="width: {$captionwidth}px;">{$image.title|safe}</div>{/if}
......
{if $images}
<center><div width="100" height="115" style="width:100px;height:115px;padding:0;background-color:#fcfcfc;"><center><a href="http://{$images.user}.photos.live.com/play.aspx/{$images.album}?ref=1" target="_blank"><img src="{$WWWROOT}/artefact/file/blocktype/gallery/thumb.png" width="96" height="96" border="0"></a><br />{$images.album}</center></div></center>
<center><div width="100" height="115" style="width:100px;height:115px;padding:0;background-color:#fcfcfc;"><center><a href="http://{$images.user}.photos.live.com/play.aspx/{$images.album}?ref=1"><img src="{$WWWROOT}/artefact/file/blocktype/gallery/thumb.png" width="96" height="96" border="0"></a><br />{$images.album}</center></div></center>
{else}
{str tag=cannotdisplayslideshow section=blocktype.file/gallery}
{/if}
......@@ -47,7 +47,7 @@
{elseif !$publishable}
{$displaytitle}
{else}
<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" target="_blank" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}">{$displaytitle}</a>
<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}">{$displaytitle}</a>
{/if}
</td>
<td class="filedescription">{$file->description}</td>
......
......@@ -16,7 +16,7 @@
<img src="{if $file->artefacttype == 'image' || $file->artefacttype == 'profileicon'}{$WWWROOT}artefact/file/download.php?file={$file->id}&size=24x24{else}{theme_url filename=images/`$file->artefacttype`.png}{/if}">
</td>
<td class="filename">
{if $selectfolders}{$displaytitle}{else}<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" target="_blank" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}">{$displaytitle}</a>{/if}
{if $selectfolders}{$displaytitle}{else}<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}">{$displaytitle}</a>{/if}
</td>
<td class="filedescription">{$file->description}</td>
<td class="right s">
......
......@@ -20,7 +20,7 @@ $string['introtext'] = 'Introduction text';
$string['useintroductioninstead'] = 'You can use your introduction profile field instead by enabling that and leaving this field blank';
$string['dontshowprofileicon'] = "Don't show a profile picture";
$string['dontshowemail'] = "Don't show email address";
$string['uploadaprofileicon'] = "You have no profile pictures. <a href=\"%sartefact/file/profileicons.php\" target=\"_blank\">Upload one</a>.";
$string['uploadaprofileicon'] = "You have no profile pictures. <a href=\"%sartefact/file/profileicons.php\">Upload one</a>.";
$string['dontshowsocialprofiles'] = "Don't show social media accounts";
$string['showsocialprofiles'] = "Show selected social media accounts";
......@@ -16,7 +16,7 @@
<ul>
{foreach from=$profileinfo.socialprofiles item=item}
<li><strong>{$item.description}:</strong>
{if $item.link}<a href="{$item.link}" title="{$item.link}" target="_blank">{/if}{$item.title|clean_html|safe}{if $item.link}</a>{/if}
{if $item.link}<a href="{$item.link}" title="{$item.link}">{/if}{$item.title|clean_html|safe}{if $item.link}</a>{/if}
</li>
{/foreach}
</ul>
......
<p>
{foreach from=$profiles item=p}
{if $p->link}<a href="{$p->link}" title="{$p->link}" class="btn socialbtn" target="_blank">
{if $p->link}<a href="{$p->link}" title="{$p->link}" class="btn socialbtn">
{if $showicon}<img src="{$p->icon}" alt="{$p->link}" class="valign-top">{/if}
{if $showicon && $showtext}&nbsp;{/if}
{if $showtext}{$p->description}{/if}
</a>{/if}
{/foreach}
{if $email}
<a href="mailto:{$email}" title="{$email}" class="btn socialbtn" target="_blank">
<a href="mailto:{$email}" title="{$email}" class="btn socialbtn">
{if $showicon}<img src="{$WWWROOT}artefact/internal/blocktype/socialprofile/theme/raw/static/images/email.png" alt="{$email}" class="valign-top">{/if}
{if $showicon && $showtext}&nbsp;{/if}
{if $showtext}{str tag='email'}{/if}
......
......@@ -17,7 +17,7 @@
<tr class="{cycle values='r0,r1'}">
<td class="center"><img src="{$row->icon}" alt="{$row->description}"></td>
<td><span>{$row->description}</span></td>
<td>{if $row->link}<a href="{$row->link}" title="{$row->link}" target="_blank" class="socialprofile">{/if}{$row->title}{if $row->link}</a>{/if}</td>
<td>{if $row->link}<a href="{$row->link}" title="{$row->link}" class="socialprofile">{/if}{$row->title}{if $row->link}</a>{/if}</td>
{if $controls}<td class="right buttonscell btns2">
<a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}" title="{str tag='edit'}"><img src="{theme_url filename='images/btn_edit.png'}" alt="{str tag='edit'}"></a>
{if $candelete}
......
......@@ -30,7 +30,7 @@
<div class="expandable-body">
<div class="compositedesc">
{$row->description}
{if $row->url}<p><a href="{$row->url}" target="_blank">{$row->url}</a></p>{/if}
{if $row->url}<p><a href="{$row->url}">{$row->url}</a></p>{/if}
</div>
{if $row->attachments}
<table class="cb attachments fullwidth">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment