sync

diff --cc Pman/Reddit/DataObjects/Reddit_livefeed_embed.php
index 7044112,bb9d4d7..9b40fca
--- 1/Pman/Reddit/DataObjects/Reddit_livefeed_embed.php
--- 2/Pman/Reddit/DataObjects/Reddit_livefeed_embed.php
+++ b/Pman/Reddit/DataObjects/Reddit_livefeed_embed.php
@@@ -192,11 -192,8 +192,11 @@@ class Pman_Reddit_DataObjects_Reddit_li
                  mkdir($dir,0775,true);
              }
              file_put_contents($file,$img);
-             $im->setAttribute("src",$file)
++            $im->setAttribute("src",$file);
              break;
          }
 +        $this->frame_body_clean = $doc->saveHTML();
 +        $this->update();
      }
      function convertHTML(){
          //var_dump($url);

diff --cc Reddit/Reddit.Index.bjs
index 69d21c0,0547be1..0ddd8b9
--- 1/Reddit/Reddit.Index.bjs
--- 2/Reddit/Reddit.Index.bjs
+++ b/Reddit/Reddit.Index.bjs
@@@ -142,7 -142,7 +142,11 @@@
                                                      "String tag" : "p",
                                                      "xtype" : "Element",
                                                      "$ xns" : "Roo.bootstrap",
++<<<<<<< HEAD
 +                                                    "String html" : "\n<!-- {feed:r} -->\n<style>\n.feed-body-html a { display:none }\n</style>\n\n<div flexy:foreach=\"feed,f\">\n\n<!-- <h3>10am</h3> -->\n<hr />\n\n<div class=\"feed-body-html\"> {f.body_html:h} </div>\n<div flexy:foreach=\"f.embeds_ar,e\">\n<iframe style=\"{e.frame_style}\" src=\"Embed/{e.id}\" height=\"{e.frame_height}\" width=\"{e.frame_width}\"></iframe>\n</div>\n<p> the image associated with it goes here </p>\n<p><a href=\"#\">{e.original url}</a> </p>\n\n\n<p> <small><B>{f.created_local_dt}</B></small> | <a href=\"#\">/reddit/{f.author}</a> |  <a href=\"#\">Download as PDF</a> </p>\n</div>"
++=======
+                                                     "String html" : "\n<!-- {feed:r} -->\n<style>\n.feed-body-html a { display:none }\n</style>\n\n\n\n<div flexy:foreach=\"feed,f\">\n\n    <!-- <h3>10am</h3> -->\n    <hr />\n\n\n\n    <div class=\"feed-body-html\"> {f.body_html:h} </div>\n\n    <div flexy:foreach=\"f.embeds,e\">\n\n    </div>\n    <p> the image associated with it goes here </p>\n    <p><a href=\"#\">{e.original url}</a> </p>\n\n\n   <p> <small><B>{f.created_local_dt}</B></small> | <a href=\"#\">/reddit/{f.author}</a> |  <a href=\"#\">Download as PDF</a> </p>\n</div>"
++>>>>>>> 52d78a4d053c6c15471b2dcfe1d14cca9551951b
                                                  }
                                              ]
                                          }

diff --cc Reddit/Reddit.Index.js
index 78ab392,f312be4..e1fb747
--- 1/Reddit/Reddit.Index.js
--- 2/Reddit/Reddit.Index.js
+++ b/Reddit/Reddit.Index.js
@@@ -179,7 -179,7 +179,11 @@@ Reddit.Index = new Roo.XComponent(
                                                      tag : 'p',
                                                      xtype : 'Element',
                                                      xns : Roo.bootstrap,
++<<<<<<< HEAD
 +                                                    html : '\n<!-- {feed:r} -->\n<style>\n.feed-body-html a { display:none }\n</style>\n\n<div flexy:foreach=\"feed,f\">\n\n<!-- <h3>10am</h3> -->\n<hr />\n\n<div class=\"feed-body-html\"> {f.body_html:h} </div>\n<div flexy:foreach=\"f.embeds_ar,e\">\n<iframe style=\"{e.frame_style}\" src=\"Embed/{e.id}\" height=\"{e.frame_height}\" width=\"{e.frame_width}\"></iframe>\n</div>\n<p> the image associated with it goes here </p>\n<p><a href=\"#\">{e.original url}</a> </p>\n\n\n<p> <small><B>{f.created_local_dt}</B></small> | <a href=\"#\">/reddit/{f.author}</a> |  <a href=\"#\">Download as PDF</a> </p>\n</div>'
++=======
+                                                     html : '\n<!-- {feed:r} -->\n<style>\n.feed-body-html a { display:none }\n</style>\n\n\n\n<div flexy:foreach=\"feed,f\">\n\n    <!-- <h3>10am</h3> -->\n    <hr />\n\n\n\n    <div class=\"feed-body-html\"> {f.body_html:h} </div>\n\n    <div flexy:foreach=\"f.embeds,e\">\n\n    </div>\n    <p> the image associated with it goes here </p>\n    <p><a href=\"#\">{e.original url}</a> </p>\n\n\n   <p> <small><B>{f.created_local_dt}</B></small> | <a href=\"#\">/reddit/{f.author}</a> |  <a href=\"#\">Download as PDF</a> </p>\n</div>'
++>>>>>>> 52d78a4d053c6c15471b2dcfe1d14cca9551951b
                                                  }
                                              ]
  

diff --cc Reddit/templates/Reddit.Index.html
index a053e73,f5e3ce0..b7dadef
--- 1/Reddit/templates/Reddit.Index.html
--- 2/Reddit/templates/Reddit.Index.html
+++ b/Reddit/templates/Reddit.Index.html
@@@ -17,7 -17,7 +17,11 @@@
      <DIV class="collapse navbar-collapse" xbuilderid="roo-gen6">
        <UL class="nav navbar-nav navbar-right" xbuilderid="roo-gen7" style="margin-right: 20px;" xtype="Roo.bootstrap.NavGroup"></UL>
      </DIV>
++<<<<<<< HEAD
 +    <DIV class="x-dlg-mask" xbuilderid="roo-gen5" style="width: 503px; height: 138px; display: none;"></DIV>
++=======
+     <DIV class="x-dlg-mask" xbuilderid="roo-gen5" style="width: 564px; height: 138px; display: none;"></DIV>
++>>>>>>> 52d78a4d053c6c15471b2dcfe1d14cca9551951b
    </HEADER>
    <DIV class="container" xbuilderid="roo-gen8" style="margin-top: 100px;" xtype="Roo.bootstrap.Container">
      <OL class=" breadcrumb" xbuilderid="roo-gen9" xtype="Roo.bootstrap.Container">