Skip to content

Commit

Permalink
(feat): publisher changes
Browse files Browse the repository at this point in the history
  • Loading branch information
markharding committed Oct 6, 2016
1 parent 4d36b18 commit eb18635
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
4 changes: 2 additions & 2 deletions plugins/blog/app/view/infinite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ export class BlogViewInfinite {
this.error = "Sorry, we couldn't load the blog";
}
//hack: ios rerun on low memory
this.cd.markForCheck();
this.applicationRef.tick();
//this.cd.markForCheck();
//this.applicationRef.tick();
this.inProgress = false;
})
.catch((e) => {
Expand Down
12 changes: 4 additions & 8 deletions plugins/blog/app/view/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<div class="mdl-grid m-blog-container blogs-grid mdl-color--white mdl-shadow--4dp" style="max-width:660px" *ngIf="blog.guid">

<google-ad *ngIf="blog.monetized && index == 0" type="responsive" location="top"></google-ad>
<pd-ad *ngIf="blog.monetized" type="banner" location="top"></pd-ad>

<div class="mdl-grid" style="width:100%">
<div class="mdl-cell mdl-cell--12-col">
Expand Down Expand Up @@ -52,24 +52,20 @@ <h1>{{blog.title}}</h1>
</div>

<div style="width:100%; padding:8px;">
<!-- START: Google adsense block -->
<google-ad *ngIf="blog.monetized && index == 0"></google-ad>
<!-- END: Google adsense block -->
<pd-ad *ngIf="blog.monetized && index == 0" type="square" location="inline"></pd-ad>

<div class="mdl-cell mdl-cell--12-col minds-blog-body"
[innerHtml]="blog.description | safe"
[ngClass]="{ 'm-mature-text': attachment.shouldBeBlurred(blog) }"
></div>
</div>

<!-- START: Google adsense block -->
<google-ad *ngIf="blog.monetized && index == 0" type="responsive" location="bottom"></google-ad>
<!-- END: Google adsense block -->

<div style="width:100%; padding:8px;">
<!-- START: RevContent block -->
<revcontent *ngIf="blog.monetized"></revcontent>
<!--<revcontent *ngIf="blog.monetized"></revcontent>-->
<!-- END: RevContent block -->
<pd-ad *ngIf="blog.monetized" type="context" location="bottom"></pd-ad>
</div>

<!-- Additional block -->
Expand Down
3 changes: 2 additions & 1 deletion plugins/blog/app/view/view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Material } from '../../../directives/material';
import { Hovercard } from '../../../directives/hovercard';
import { GoogleAds } from '../../../components/ads/google-ads';
import { RevContent } from '../../../components/ads/revcontent';
import { PDAds } from '../../../components/ads/pd-ads';
import { MindsTitle } from '../../../services/ux/title';
import { MindsFatBanner } from '../../../components/banner';
import { Comments } from '../../../controllers/comments/comments';
Expand All @@ -32,7 +33,7 @@ import { AttachmentService } from '../../../services/attachment';
providers:[ MindsTitle, AttachmentService ],
templateUrl: 'src/plugins/blog/view/view.html',
directives: [ CORE_DIRECTIVES, ROUTER_DIRECTIVES, BUTTON_COMPONENTS, Material, Comments, MindsFatBanner,
GoogleAds, RevContent, ShareModal, SocialIcons, InfiniteScroll, Hovercard, ConfirmModal ]
GoogleAds, RevContent, PDAds, ShareModal, SocialIcons, InfiniteScroll, Hovercard, ConfirmModal ]
})

export class BlogView {
Expand Down

0 comments on commit eb18635

Please sign in to comment.