Revert "(feat): publisher changes"

This reverts commit eb18635.
Minds · Oct 8, 2016 · 2fd1578 · 2fd1578
1 parent 864164a
commit 2fd1578
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/plugins/blog/app/view/infinite.ts b/plugins/blog/app/view/infinite.ts
@@ -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) => {

diff --git a/plugins/blog/app/view/view.html b/plugins/blog/app/view/view.html
@@ -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">
 
-  <pd-ad *ngIf="blog.monetized" type="banner" location="top"></pd-ad>
+  <google-ad *ngIf="blog.monetized && index == 0" type="responsive" location="top"></google-ad>
 
   <div class="mdl-grid" style="width:100%">
     <div class="mdl-cell mdl-cell--12-col">
@@ -52,20 +52,24 @@ <h1>{{blog.title}}</h1>
   </div>
 
   <div style="width:100%; padding:8px;">
-    <pd-ad *ngIf="blog.monetized && index == 0" type="square" location="inline"></pd-ad>
+    <!-- START: Google adsense block -->
+    <google-ad *ngIf="blog.monetized && index == 0"></google-ad>
+    <!-- END: Google adsense block -->
 
     <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 -->

diff --git a/plugins/blog/app/view/view.ts b/plugins/blog/app/view/view.ts
@@ -8,7 +8,6 @@ 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';
@@ -33,7 +32,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, PDAds, ShareModal, SocialIcons, InfiniteScroll, Hovercard, ConfirmModal ]
+    GoogleAds, RevContent, ShareModal, SocialIcons, InfiniteScroll, Hovercard, ConfirmModal ]
 })
 
 export class BlogView {