sync

diff --combined 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
@@@ -24,7 -24,7 +24,7 @@@ class Pman_Reddit_DataObjects_Reddit_li
      
      /* the code above is auto generated do not remove the tag below */
      ###END_AUTOCODE
 -    /*function convertClean(){;
 +    function convertClean(){;
          require_once 'Net/URL.php';
          $data = $this->frame_body;
          libxml_use_internal_errors (true);
@@@ -41,16 -41,15 +41,16 @@@
          foreach($xpath->query('//img') as $im){
              $url = parse_url($im->getAttribute("src"));
              $file = '/assets/'. $url["host"] . $url["path"];
 -            if($url->query){
 -                $file += "--" . md5($url->query);
 +            if(array_key_exists("query",$url)){
 +                $file .= "--" . md5($url["query"]);
              }
 +            echo $file . "\n";
              $im->setAttribute("src",$file);
          }
          
          $this->frame_body_clean = $doc->saveHTML();
          $this->update();
 -    }*/
 +    }
      function createAssets(){
          require_once 'Net/URL.php';
          echo $this->url;
@@@ -176,7 -175,8 +176,7 @@@
              
              if($ext){
                  $file .= "." . $ext;
 -            }
 -            
 +            };
              //echo "\n\nFile: " .$file . "\nSrc: " . $src . "\nExts:" . print_r($exts) . "\nMeta: " . print_r($info);
              
              fclose($f);
@@@ -192,11 -192,8 +192,11 @@@
                  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 --combined Reddit/Reddit.Index.bjs
index 69d21c0,0547be1..0ddd8b9
--- 1/Reddit/Reddit.Index.bjs
--- 2/Reddit/Reddit.Index.bjs
+++ b/Reddit/Reddit.Index.bjs
@@@ -2,7 -2,7 +2,7 @@@
      "name" : "Reddit.Index",
      "parent" : "",
      "title" : "",
 -    "path" : "/home/alan/gitlive/web.Reddit/Reddit/Reddit.Index.bjs",
 +    "path" : "/home/julian/gitlive/web.Reddit/Reddit/Reddit.Index.bjs",
      "permname" : "",
      "modOrder" : "001",
      "items" : [
@@@ -12,8 -12,8 +12,8 @@@
              "items" : [
                  {
                      "$ String brand_href" : "baseURL",
-                     "String cls" : "headroom animated",
                      "String position" : "fixed-top",
+                     "String cls" : "headroom animated",
                      "xtype" : "NavHeaderbar",
                      "Boolean inverse" : true,
                      "String brand" : "Reddit Archive - Occupy Central Civil Disobedience Movement (Umbrella Revolution)",
@@@ -45,8 -45,8 +45,8 @@@
                                      "items" : [
                                          {
                                              "Number md" : 4,
-                                             "xtype" : "Column",
                                              "Number lg" : 3,
+                                             "xtype" : "Column",
                                              "$ xns" : "Roo.bootstrap",
                                              "items" : [
                                                  {
@@@ -70,8 -70,8 +70,8 @@@
                                                                      "items" : [
                                                                          {
                                                                              "xtype" : "Header",
-                                                                             "Number level" : 4,
                                                                              "$ xns" : "Roo.bootstrap",
+                                                                             "Number level" : 4,
                                                                              "String html" : "Day selector"
                                                                          },
                                                                          {
@@@ -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 --combined Reddit/Reddit.Index.js
index 78ab392,f312be4..e1fb747
--- 1/Reddit/Reddit.Index.js
--- 2/Reddit/Reddit.Index.js
+++ b/Reddit/Reddit.Index.js
@@@ -24,8 -24,8 +24,8 @@@ Reddit.Index = new Roo.XComponent(
                {
                      '|xns' : 'Roo.bootstrap',
                      brand_href : baseURL,
-                     cls : 'headroom animated',
                      position : 'fixed-top',
+                     cls : 'headroom animated',
                      xtype : 'NavHeaderbar',
                      inverse : true,
                      brand : 'Reddit Archive - Occupy Central Civil Disobedience Movement (Umbrella Revolution)',
@@@ -63,8 -63,8 +63,8 @@@
                                        {
                                              '|xns' : 'Roo.bootstrap',
                                              md : 4,
-                                             xtype : 'Column',
                                              lg : 3,
+                                             xtype : 'Column',
                                              xns : Roo.bootstrap,
                                              items : [
                                                {
@@@ -93,8 -93,8 +93,8 @@@
                                                                        {
                                                                              '|xns' : 'Roo.bootstrap',
                                                                              xtype : 'Header',
-                                                                             level : 4,
                                                                              xns : Roo.bootstrap,
+                                                                             level : 4,
                                                                              html : 'Day selector'
                                                                          },
                                                                        {
@@@ -179,7 -179,7 +179,11 @@@
                                                      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 --combined 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">
@@@ -63,13 -63,14 +67,13 @@@
              <HR></HR>
  
  
 -
 -
              <DIV class="feed-body-html"> {f.body_html:h} </DIV>
  
 +            <DIV flexy:foreach="f.embeds_ar,e">
  
 -            <DIV flexy:foreach="f.embeds,e">
 +              <IFRAME style="{e.frame_style}" src="Embed/{e.id}" height="{e.frame_height}" width="{e.frame_width}"></IFRAME>
  
 -</DIV>
 +            </DIV>
  
              <P> the image associated with it goes here </P>