Skip to content

Commit

Permalink
Merge pull request #353 from PublicRadioInternational/BUG-351
Browse files Browse the repository at this point in the history 
No more 'null' items in embed HTML
  • Loading branch information
@rpeterman-gp
rpeterman-gp authored Dec 23, 2016
2 parents 590a8e8 + 57f1dc9 commit e9c563e
Show file tree
Hide file tree
Showing 19 changed files with 564 additions and 225 deletions.
90 changes: 45 additions & 45 deletions src/contents/less/priEmbeds/externalLinkEmbed.less
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
.external-link-embed
.external_link
{
display: inline-block;
width: auto;
padding: 10px;

border: solid 1px #D0D0D0;
padding: 10px;

text-align: left;
}

img
{
width: 200px;
}
.external_link-teaser
{
display: flex;
flex-wrap: wrap;
justify-content: center;

.text-container
{
width: 250px;
display: inline-block;
margin: 0;
padding: 0;
margin-left: 10px;

.display-title
{
width: inherit;
text-transform: uppercase;
font-weight: bold;
margin: 0;
padding: 0;
margin-bottom: 10px;
}

.teaser
{
width: inherit;
font-style: italic;
margin: 0;
padding: 0;
margin-bottom: 10px;
}
}
margin-bottom: 1em;
}

a
{
.btn();
.btn-primary();
width: 100%;
border-radius: 20px;
}
.external_link-teaser-image
{
max-width: 200px;
}

.entity-embed-wide
.external_link-teaser-text
{
.external-link-embed
max-width: 250px;

margin-left: 1em;

text-align: center;

.external_link-teaser-image + &
{
width: 100%;
text-align: left;
}
}

.external_link-teaser-title
{
text-transform: uppercase;
font-weight: bold;

margin-bottom: 0.8em;
}

.external_link-teaser-teaser
{
font-style: italic;
}

.external_link-link
{
.btn();
.btn-primary();
.btn-block();

border-radius: 20px;
}
19 changes: 17 additions & 2 deletions src/contents/less/priEmbeds/newsletterSubscribeEmbed.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,47 @@
display: inline-block;
min-width: 200px;

background-color: #fff;

border: solid 1px #D0D0D0;
padding: 10px;
text-align: left;
// text-align: center;

.display-title
{
text-transform: uppercase;
font-weight: bold;
margin-bottom: 5px;
}

.subscribe-form
{
padding: 10px;
background-color: #f4f4f4;

.teaser
.teaser
{
margin-bottom: 5px;
}
}

.subscribe-input
{
text-align: inherit;
}

.subscribe-btn
{
border-radius: 10px;
text-transform: uppercase;
}

.entity-embed-center &,
.entity-embed-left &,
.entity-embed-right &,
.entity-embed-wide & {
text-align: left;
}
}

.entity-embed-wide
Expand Down
59 changes: 41 additions & 18 deletions src/html/modal/modal_externalLink.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,70 @@
<div class="embed-modal-row">
<div class="embed-modal-full-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="upload">Image Thumbnail File</label>
<input class="embed-modal-input embed-modal-file-input" type="file" name="upload" accept="image/*" />
<span class="fa fa-times cancel-upload-image-btn"></span>
<span class="fa fa-cog edit-chosen-file-btn"></span>
<div class="uploaded-image-file"></div>
<label class="embed-modal-label" for="title">Title</label>
<input name="title" type="text" placeholder ="Enter a title for internal use" class="embed-modal-form-control"/>
</div>
</div>
</div>
<div class="embed-modal-row">
<div class="embed-modal-half-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="title">Title</label>
<input name="title" type="text" placeholder ="Enter a title for internal use" class="embed-modal-form-control"/>
<label class="embed-modal-label" for="linkText">External Link Text</label>
<input name="linkText" type="text" placeholder="Enter link text" class="embed-modal-form-control"/>
</div>
</div>
<div class="embed-modal-half-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="displayTitle">Display Title</label>
<input name="displayTitle" type="text" placeholder="Enter a title for display purposes" class="embed-modal-form-control"/>
<label class="embed-modal-label" for="url">External Link Url</label>
<input name="url" type="url" placeholder="Enter URL" class="embed-modal-form-control"/>
</div>
</div>
</div>

<hr>

<div class="embed-modal-row">
<div class="embed-modal-half-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="linkText">External Link Text</label>
<input name="linkText" type="text" placeholder="Enter link text" class="embed-modal-form-control"/>
<label class="embed-modal-label" for="upload">Teaser Image</label>
<div class="image_editor">
<div class="image_editor-intro">
<div class="image_editor-intro_inner">
<input class="embed-modal-input embed-modal-file-input" type="file" name="upload" accept="image/*" />
</div>
</div>

<div class="image_editor-preview">
<img class="image_editor-preview_image">
</div>

<div class="image_editor-toolbar">
<ul class="image_editor-toolbar_list">
<li class="image_editor-toolbar_item js-upload">
<a class="image_editor-tollbar_btn"><span class="fa fa-upload" aria-label="Select Another Image"></span></a>
</li>
<li class="image_editor-toolbar_item js-upload-undo">
<a class="image_editor-tollbar_btn"><span class="fa fa-undo" aria-label="Revert Selected Image"></span></a>
</li>
<li class="image_editor-toolbar_item js-upload-cancel">
<a class="image_editor-tollbar_btn"><span class="fa fa-arrow-left" aria-label="Cancel Image Select"></span></a>
</li>
<li class="image_editor-toolbar_item js-upload-remove">
<a class="image_editor-tollbar_btn"><span class="fa fa-close" aria-label="Remove Image"></span></a>
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="embed-modal-half-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="url">External Link Url</label>
<input name="url" type="url" placeholder="Enter URL" class="embed-modal-form-control"/>
<label class="embed-modal-label" for="display title">Teaser Title</label>
<input name="displayTitle" type="text" placeholder="Enter a title for display purposes" class="embed-modal-form-control js-input-teaser_title"/>
</div>
</div>
</div>
<div class="embed-modal-row">
<div class="embed-modal-full-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="teaser">Teaser</label>
<textarea name="teaser" type="text" placeholder="Enter teaser" rows="3" class="embed-modal-form-control"></textarea>
<textarea name="teaser" type="text" placeholder="Enter teaser" rows="5" class="embed-modal-form-control"></textarea>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/html/modal/modal_globalBuzz.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

<div class="embed-modal-half-column">
<div class="embed-modal-form">
<label clas="embed-modal-label" for="quoteText">Quote Url Text</label>
<label clas="embed-modal-label" for="quoteText">Quote URL Text</label>
<input name="quoteUrlText" type="text" placeholder="Enter URL label" class="embed-modal-form-control" />
</div>
<div class="embed-modal-form">
<label clas="embed-modal-label" for="quoteUrl">Quote Url</label>
<label clas="embed-modal-label" for="quoteUrl">Quote URL</label>
<input name="quoteUrl" type="url" placeholder="Enter URL" class="embed-modal-form-control"/>
</div>
</div>
Expand All @@ -30,8 +30,8 @@
<div class="embed-modal-full-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="credit">Credit</label>
<input name="credit" type="text" placeholder="Attribute the source" class="embed-modal-form-control" />
<input name="credit" type="text" placeholder="Attribute the source" class="embed-modal-form-control" />
</div>
</div>
</div>
</div>
</form>
21 changes: 12 additions & 9 deletions src/html/modal/modal_newsletterSubscribe.html
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
<form>
<div class="embed-modal-row">
<div class="embed-modal-half-column">
<div class="embed-modal-full-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="title">Title</label>
<input name="title" type="text" placeholder="Enter a title for internal use" class="embed-modal-form-control embed-modal-input" />
</div>
</div>
<div class="embed-modal-half-column">
</div>
<div class="embed-modal-row">
<div class="embed-modal-full-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="displayTitle">Display Title</label>
<input name="displayTitle" type="text" placeholder="Enter a title for display purposes" class="embed-modal-input embed-modal-form-control" />
<label class="embed-modal-label" for="newsletter">Select Newsletter</label>
<select name="newsletter" class="embed-modal-form-control"></select>
</div>
</div>
</div>
<hr>
<div class="embed-modal-row">
<div class="embed-modal-full-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="teaser">Teaser</label>
<textarea name="teaser" type="text" placeholder="Enter teaser" rows="3" class="embed-modal-form-control"></textarea>
<label class="embed-modal-label" for="displayTitle">Teaser Title</label>
<input name="displayTitle" type="text" placeholder="Enter a title for display purposes" class="embed-modal-input embed-modal-form-control" />
</div>
</div>
</div>
</div>
<div class="embed-modal-row">
<div class="embed-modal-full-column">
<div class="embed-modal-form">
<label class="embed-modal-label" for="newsletter">Select Newsletter</label>
<select name="newsletter" class="embed-modal-form-control"></select>
<label class="embed-modal-label" for="teaser">Teaser</label>
<textarea name="teaser" type="text" placeholder="Enter teaser" rows="3" class="embed-modal-form-control"></textarea>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit e9c563e

Please sign in to comment.