Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

- Change default URLs to blank;

Browse Source 
- Fix image, button, social icon URL placeholders;
- Remove links to example.org.
This commit is contained in:
Tautvidas Sipavičius
2016-08-09 14:32:10 +03:00
parent 7a9402f5b5
commit f744305834
17 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletter_editor/blocks/button.js
View File

@ -19,7 +19,7 @@ define([
return this._getDefaults({
type: 'button',
text: 'Button',
url: 'http://google.com',
url: '',
styles: {
block: {
backgroundColor: '#ff0000',

4
assets/js/src/newsletter_editor/blocks/image.js
View File

@ -17,8 +17,8 @@ define([
defaults: function() {
return this._getDefaults({
type: 'image',
link: 'http://example.org',
src: 'no-image.png',
link: '',
src: '',
alt: 'An image of...',
fullWidth: true, // true | false
width: '64px',

4
assets/js/src/newsletter_editor/blocks/social.js
View File

@ -383,7 +383,7 @@ define([
{
type: 'socialIcon',
iconType: 'facebook',
link: 'http://example.com',
link: 'http://www.facebook.com',
image: App.getAvailableStyles().get('socialIconSets.default.facebook'),
height: '32px',
width: '32px',
@ -392,7 +392,7 @@ define([
{
type: 'socialIcon',
iconType: 'twitter',
link: 'http://example.com',
link: 'http://www.twitter.com',
image: App.getAvailableStyles().get('socialIconSets.default.twitter'),
height: '32px',
width: '32px',

BIN
assets/js/src/newsletter_editor/no-image.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
assets/js/src/newsletter_editor/pigeon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

2
lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php
View File

@ -102,7 +102,7 @@ class NewsletterBlank121Column {
),
array(
"type" => "image",
"link" => "http://example.org",
"link" => "",
"src" => $this->template_image_url . "/fake-logo.png",
"alt" => __("Fake logo"),
"fullWidth" => false,

2
lib/Config/PopulatorData/Templates/NewsletterBlank12Column.php
View File

@ -102,7 +102,7 @@ class NewsletterBlank12Column {
),
array(
"type" => "image",
"link" => "http://example.org",
"link" => "",
"src" => $this->template_image_url . "/fake-logo.png",
"alt" => __("Fake Logo"),
"fullWidth" => false,

2
lib/Config/PopulatorData/Templates/NewsletterBlank13Column.php
View File

@ -102,7 +102,7 @@ class NewsletterBlank13Column {
),
array(
"type" => "image",
"link" => "http://example.org",
"link" => "",
"src" => $this->template_image_url . "/fake-logo.png",
"alt" => __("Fake logo"),
"fullWidth" => false,

2
lib/Config/PopulatorData/Templates/NewsletterBlank1Column.php
View File

@ -102,7 +102,7 @@ class NewsletterBlank1Column {
),
array(
"type" => "image",
"link" => "http://example.org",
"link" => "",
"src" => $this->template_image_url . "/fake-logo.png",
"alt" => __("Fake logo"),
"fullWidth" => false,

2
lib/Config/PopulatorData/Templates/PostNotificationsBlank1Column.php
View File

@ -102,7 +102,7 @@ class PostNotificationsBlank1Column {
),
array(
"type" => "image",
"link" => "http://example.org",
"link" => "",
"src" => $this->template_image_url . "/fake-logo.png",
"alt" => "fake-logo",
"fullWidth" => false,

2
lib/Config/PopulatorData/Templates/SimpleText.php
View File

@ -61,7 +61,7 @@ class SimpleText {
),
array(
"type" => "image",
"link" => "http://example.org",
"link" => "",
"src" => $this->template_image_url . "/fake-logo.png",
"alt" => __("Fake logo"),
"fullWidth" => false,

2
lib/Config/PopulatorData/Templates/WelcomeBlank12Column.php
View File

@ -102,7 +102,7 @@ class WelcomeBlank12Column {
),
array(
"type" => "image",
"link" => "http://example.org",
"link" => "",
"src" => $this->template_image_url . "/fake-logo.png",
"alt" => __("Fake logo"),
"fullWidth" => false,

2
lib/Config/PopulatorData/Templates/WelcomeBlank1Column.php
View File

@ -102,7 +102,7 @@ class WelcomeBlank1Column {
),
array(
"type" => "image",
"link" => "http://example.org",
"link" => "",
"src" => $this->template_image_url . "/fake-logo.png",
"alt" => __("Fake logo"),
"fullWidth" => false,

12
views/newsletter/editor.html
View File

@ -990,7 +990,7 @@
},
button: {
text: '<%= __('Button') %>',
url: 'http://example.org',
url: '',
styles: {
block: {
backgroundColor: '#2ea1cd',
@ -1045,10 +1045,8 @@
},
},
image: {
link: 'http://example.org',
src: '<%= image_url(
'newsletter_editor/pigeon.png'
) %>',
link: '',
src: '',
alt: '<%= __('An image of...') %>',
fullWidth: false,
width: '281px',
@ -1118,7 +1116,7 @@
{
type: 'socialIcon',
iconType: 'facebook',
link: 'http://example.com',
link: 'http://www.facebook.com',
image: '<%= image_url(
'newsletter_editor/social-icons/01-social/Facebook.png'
) %>',
@ -1129,7 +1127,7 @@
{
type: 'socialIcon',
iconType: 'twitter',
link: 'http://example.com',
link: 'http://www.twitter.com',
image: '<%= image_url(
'newsletter_editor/social-icons/01-social/Twitter.png'
) %>',

2
views/newsletter/templates/blocks/button/settings.hbs
View File

@ -13,7 +13,7 @@
<label>
<div class="mailpoet_form_field_title mailpoet_form_field_title_inline"><%= __('Link') %></div>
<div class="mailpoet_form_field_input_option">
<input type="text" name="url" class="mailpoet_input mailpoet_field_button_url" value="{{ model.url }}" />
<input type="text" name="url" class="mailpoet_input mailpoet_field_button_url" value="{{ model.url }}" placeholder="http://" />
</div>
</label>
</div>

2
views/newsletter/templates/blocks/image/settings.hbs
View File

@ -11,7 +11,7 @@
<label>
<div class="mailpoet_form_field_title"><%= __('Address') %></div>
<div class="mailpoet_form_field_input_option">
<input type="text" name="src" class="mailpoet_input mailpoet_field_image_address" value="{{ src }}" /><br />
<input type="text" name="src" class="mailpoet_input mailpoet_field_image_address" value="{{ src }}" placeholder="http://" /><br />
</div>
</label>
</div>

6
views/newsletter/templates/blocks/social/settingsIcon.hbs
View File

@ -27,7 +27,7 @@
<%= __('Image') %>
</div>
<div class="mailpoet_social_icon_settings_form_element">
<input type="text" name="image" class="mailpoet_social_icon_field_image" value="{{ model.image }}" />
<input type="text" name="image" class="mailpoet_social_icon_field_image" value="{{ model.image }}" placeholder="http://" />
</div>
</label>
</div>
@ -40,9 +40,9 @@
</div>
<div class="mailpoet_social_icon_settings_form_element">
{{#ifCond iconType '==' 'email'}}
<input type="text" name="link" class="mailpoet_social_icon_field_link" value="{{emailFromMailto model.link }}" /><br />
<input type="text" name="link" class="mailpoet_social_icon_field_link" value="{{emailFromMailto model.link }}" placeholder="example@example.org" /><br />
{{else}}
<input type="text" name="link" class="mailpoet_social_icon_field_link" value="{{ model.link }}" /><br />
<input type="text" name="link" class="mailpoet_social_icon_field_link" value="{{ model.link }}" placeholder="http://" /><br />
{{/ifCond}}
</div>
</label>