From 5e339405ab1b6b506418c1f6e28f36e939d986b7 Mon Sep 17 00:00:00 2001
From: Sean McGregor <gitcommit@seanbmcgregor.com>
Date: Mon, 4 Jan 2016 12:07:29 -0800
Subject: [PATCH 1/2] rendered HTML for web

---
 Message/show.html   | 188 ++++++++++++++++++++++++--------------------
 PlainPost/show.html | 188 ++++++++++++++++++++++++--------------------
 2 files changed, 206 insertions(+), 170 deletions(-)
diff --git a/Message/show.html b/Message/show.html
index a2cc463..00fba7d 100644
--- a/Message/show.html
+++ b/Message/show.html
@@ -62,6 +62,10 @@
   <meta content="../shared/css/injected/injected.css" name="PrivlyInjectedCSS"/>
  </head>
  <body data-privly-exclude="true">
+  <noscript>
+   Your browser has scripting turned off.
+    This application requires scripting to function properly.
+  </noscript>
   <script src="../vendor/bootstrap/js/bootstrap.min.js">
   </script>
   <div id="wrap">
@@ -112,7 +116,7 @@
            Post Actions
           </li>
           <li>
-           <a class="edit_link" style="display:none;cursor:pointer;">
+           <a class="edit_link" style="display:none; cursor:pointer;">
             <span class="glyphicon glyphicon-edit">
             </span>
             Edit
@@ -212,33 +216,35 @@ <h1>
           </option>
          </select>
         </div>
-        <br/>
-        <button class="btn btn-default" id="update">
-         <span class="glyphicon glyphicon-cloud-upload">
-         </span>
-         Update
-        </button>
-        <button class="btn btn-default" id="cancel_button">
-         <span class="glyphicon glyphicon-remove">
-         </span>
-         Cancel
-        </button>
-        <hr/>
+        <!-- /#destruction_select_block -->
+        <div>
+         <br/>
+         <button class="btn btn-default" id="update">
+          <span class="glyphicon glyphicon-cloud-upload">
+          </span>
+          Update
+         </button>
+         <button class="btn btn-default" id="cancel_button">
+          <span class="glyphicon glyphicon-remove">
+          </span>
+          Cancel
+         </button>
+         <hr/>
+        </div>
        </div>
        <div id="post_content">
         <div id="cleartext">
          Privly Message
          <img alt="loading" src="../shared/images/ajax-loader.gif"/>
-         <noscript>
-          Your browser has scripting turned off. 
-                      This application requires scripting to function properly.
-         </noscript>
         </div>
+        <!-- /#cleartext -->
        </div>
+       <!-- /#post_content -->
        <br class="injected_hide"/>
        <div class="injected_hide">
         <hr id="dashed_hr"/>
        </div>
+       <!-- /.injected_hide -->
       </div>
       <div class="col-md-4 injected_hide">
        <div id="side_block">
@@ -256,6 +262,7 @@ <h2>
          </p>
          <hr/>
         </div>
+        <!-- /.meta_created_at -->
         <!--Edit Content-->
         <div class="meta_canupdate" style="display:none;">
          <span class="glyphicon glyphicon-pencil">
@@ -272,6 +279,7 @@ <h2>
          </a>
          <hr/>
         </div>
+        <!-- /.meta_canupdate -->
         <!--Destruction-->
         <div class="meta_candestroy" style="display:none;">
          <span class="glyphicon glyphicon-minus">
@@ -288,6 +296,7 @@ <h2>
          </a>
          <hr/>
         </div>
+        <!-- /.meta_candestroy -->
         <!--Source + Link-->
         <div class="url-container">
          <span class="glyphicon glyphicon-link">
@@ -306,87 +315,96 @@ <h2>
           <p class="meta_source_domain">
           </p>
          </div>
+         <!-- /.topsource -->
         </div>
+        <!-- /url-container -->
        </div>
+       <!-- /sidebloack -->
       </div>
+      <!-- /.col-md-4 -->
      </div>
-     <!-- /.container -->
-     <div class="container" id="downloadmessage" style="display:none;">
-      <div class="row">
-       <div class="col-xs-12">
-        <hr/>
-       </div>
+     <!-- /.row -->
+    </div>
+    <!-- /.container -->
+    <div class="container" id="downloadmessage" style="display:none;">
+     <div class="row">
+      <div class="col-xs-12">
+       <hr/>
       </div>
-      <div class="row">
-       <div class="col-md-3">
-        <a data-privly-chrome="https://chrome.google.com/webstore/detail/pkokikcdapfpkkkjpdaamjanniaempol" data-privly-firefox="https://addons.mozilla.org/en-US/firefox/addon/privly/" href="https://">
-         <div style="position:relative;width:10em;padding:1em;height:150px">
-          <img alt="Google Chrome Logo" class="download-extension-img" id="chrome_img" src="../shared/images/chrome-logo_150.png"/>
-          <img alt="Firefox Logo" class="download-extension-img" id="firefox_img" src="../shared/images/firefox-logo_150.png"/>
-          <img alt="Privly Icon" src="../shared/images/icon_96.png" style="position:absolute;right:33px;top:15px;"/>
-         </div>
+      <!-- /.col-xs-12 -->
+     </div>
+     <!-- /row -->
+     <div class="row">
+      <div class="col-md-3">
+       <a data-privly-chrome="https://chrome.google.com/webstore/detail/pkokikcdapfpkkkjpdaamjanniaempol" data-privly-firefox="https://addons.mozilla.org/en-US/firefox/addon/privly/" href="https://">
+        <div style="position:relative; width:10em; padding:1em; height:150px">
+         <img alt="Google Chrome Logo" class="download-extension-img" id="chrome_img" src="../shared/images/chrome-logo_150.png"/>
+         <img alt="Firefox Logo" class="download-extension-img" id="firefox_img" src="../shared/images/firefox-logo_150.png"/>
+         <img alt="Privly Icon" src="../shared/images/icon_96.png" style="position:absolute; right:33px; top:15px;"/>
+        </div>
+       </a>
+      </div>
+      <!-- /.col-md-3 -->
+      <div class="col-md-9">
+       <h2>
+        <span class="referrer">
+        </span>
+       </h2>
+       <p>
+        <a href="https://priv.ly/pages/download">
+         Download
         </a>
-       </div>
-       <div class="col-md-9">
-        <h2>
-         <span class="referrer">
-         </span>
-        </h2>
-        <p>
-         <a href="https://priv.ly/pages/download">
-          Download
-         </a>
-         the Privly Extension, and you will
-         <strong>
-          see this content instead
+        the Privly Extension, and you will
+        <strong>
+         see this content instead
                  of the link
-         </strong>
-         that brought you to this page. We don't want
+        </strong>
+        . We don't want
                  you waste your time coming back to this website again.
-         <a href="https://priv.ly/pages/download">
-          Download
-         </a>
-         the extension and you won't have to.
-        </p>
-       </div>
-       <!-- /col-md-3 -->
+        <a href="https://priv.ly/pages/download">
+         Download
+        </a>
+        the extension and you won't have to.
+       </p>
       </div>
-      <!-- /row -->
+      <!-- /col-md-9 -->
      </div>
-     <!-- /container -->
+     <!-- /row -->
     </div>
-    <!-- /privlyHeightWrapper -->
+    <!-- /downloadmessage -->
    </div>
-   <!-- /wrap -->
-   <div class="injected_hide" id="footer">
-    <div class="container">
-     <p class="text-muted credit">
-      <a href="https://www.priv.ly/pages/donate.html" target="_blank">
-       <span class="glyphicon glyphicon-gift">
-       </span>
-       Donate
-      </a>
-      to build a more private web.
-          You are viewing a
-          Privly
-      <span style="vertical-align: super;font-size: xx-small">
-       ®
+   <!-- /container -->
+  </div>
+  <!-- /privlyHeightWrapper -->
+  <!-- /wrap -->
+  <div class="injected_hide" id="footer">
+   <div class="container">
+    <p class="text-muted credit">
+     <a href="https://www.priv.ly/pages/donate.html" target="_blank">
+      <span class="glyphicon glyphicon-gift">
       </span>
-      Application,
-      <a href="https://priv.ly/pages/about" target="_blank">
-       learn more
-      </a>
-      about Privly.
-      <a class="legal_nav" href="/pages/privacy" target="_blank">
-       Terms of Service
-      </a>
-      and
-      <a class="legal_nav" href="/pages/privacy" target="_blank">
-       DMCA
-      </a>
-      .
-     </p>
-    </div>
+      Donate
+     </a>
+     to build a more private web.
+        You are viewing a
+        Privly
+     <span style="vertical-align: super; font-size: xx-small">
+      ®
+     </span>
+     Application,
+     <a href="https://priv.ly/pages/about" target="_blank">
+      learn more
+     </a>
+     about Privly.
+     <a class="legal_nav" href="/pages/privacy" target="_blank">
+      Terms of Service
+     </a>
+     and
+     <a class="legal_nav" href="/pages/privacy" target="_blank">
+      DMCA
+     </a>
+     .
+    </p>
    </div>
   </div>
  </body>
diff --git a/PlainPost/show.html b/PlainPost/show.html
index 21e6c94..b5b6eed 100644
--- a/PlainPost/show.html
+++ b/PlainPost/show.html
@@ -52,6 +52,10 @@
   <meta content="../shared/css/injected/injected.css" name="PrivlyInjectedCSS"/>
  </head>
  <body data-privly-exclude="true">
+  <noscript>
+   Your browser has scripting turned off.
+    This application requires scripting to function properly.
+  </noscript>
   <script src="../vendor/bootstrap/js/bootstrap.min.js">
   </script>
   <div id="wrap">
@@ -102,7 +106,7 @@
            Post Actions
           </li>
           <li>
-           <a class="edit_link" style="display:none;cursor:pointer;">
+           <a class="edit_link" style="display:none; cursor:pointer;">
             <span class="glyphicon glyphicon-edit">
             </span>
             Edit
@@ -202,33 +206,35 @@ <h1>
           </option>
          </select>
         </div>
-        <br/>
-        <button class="btn btn-default" id="update">
-         <span class="glyphicon glyphicon-cloud-upload">
-         </span>
-         Update
-        </button>
-        <button class="btn btn-default" id="cancel_button">
-         <span class="glyphicon glyphicon-remove">
-         </span>
-         Cancel
-        </button>
-        <hr/>
+        <!-- /#destruction_select_block -->
+        <div>
+         <br/>
+         <button class="btn btn-default" id="update">
+          <span class="glyphicon glyphicon-cloud-upload">
+          </span>
+          Update
+         </button>
+         <button class="btn btn-default" id="cancel_button">
+          <span class="glyphicon glyphicon-remove">
+          </span>
+          Cancel
+         </button>
+         <hr/>
+        </div>
        </div>
        <div id="post_content">
         <div id="cleartext">
          Privly PlainPost
          <img alt="loading" src="../shared/images/ajax-loader.gif"/>
-         <noscript>
-          Your browser has scripting turned off. 
-                      This application requires scripting to function properly.
-         </noscript>
         </div>
+        <!-- /#cleartext -->
        </div>
+       <!-- /#post_content -->
        <br class="injected_hide"/>
        <div class="injected_hide">
         <hr id="dashed_hr"/>
        </div>
+       <!-- /.injected_hide -->
       </div>
       <div class="col-md-4 injected_hide">
        <div id="side_block">
@@ -246,6 +252,7 @@ <h2>
          </p>
          <hr/>
         </div>
+        <!-- /.meta_created_at -->
         <!--Edit Content-->
         <div class="meta_canupdate" style="display:none;">
          <span class="glyphicon glyphicon-pencil">
@@ -262,6 +269,7 @@ <h2>
          </a>
          <hr/>
         </div>
+        <!-- /.meta_canupdate -->
         <!--Destruction-->
         <div class="meta_candestroy" style="display:none;">
          <span class="glyphicon glyphicon-minus">
@@ -278,6 +286,7 @@ <h2>
          </a>
          <hr/>
         </div>
+        <!-- /.meta_candestroy -->
         <!--Source + Link-->
         <div class="url-container">
          <span class="glyphicon glyphicon-link">
@@ -296,87 +305,96 @@ <h2>
           <p class="meta_source_domain">
           </p>
          </div>
+         <!-- /.topsource -->
         </div>
+        <!-- /url-container -->
        </div>
+       <!-- /sidebloack -->
       </div>
+      <!-- /.col-md-4 -->
      </div>
-     <!-- /.container -->
-     <div class="container" id="downloadmessage" style="display:none;">
-      <div class="row">
-       <div class="col-xs-12">
-        <hr/>
-       </div>
+     <!-- /.row -->
+    </div>
+    <!-- /.container -->
+    <div class="container" id="downloadmessage" style="display:none;">
+     <div class="row">
+      <div class="col-xs-12">
+       <hr/>
       </div>
-      <div class="row">
-       <div class="col-md-3">
-        <a data-privly-chrome="https://chrome.google.com/webstore/detail/pkokikcdapfpkkkjpdaamjanniaempol" data-privly-firefox="https://addons.mozilla.org/en-US/firefox/addon/privly/" href="https://">
-         <div style="position:relative;width:10em;padding:1em;height:150px">
-          <img alt="Google Chrome Logo" class="download-extension-img" id="chrome_img" src="../shared/images/chrome-logo_150.png"/>
-          <img alt="Firefox Logo" class="download-extension-img" id="firefox_img" src="../shared/images/firefox-logo_150.png"/>
-          <img alt="Privly Icon" src="../shared/images/icon_96.png" style="position:absolute;right:33px;top:15px;"/>
-         </div>
+      <!-- /.col-xs-12 -->
+     </div>
+     <!-- /row -->
+     <div class="row">
+      <div class="col-md-3">
+       <a data-privly-chrome="https://chrome.google.com/webstore/detail/pkokikcdapfpkkkjpdaamjanniaempol" data-privly-firefox="https://addons.mozilla.org/en-US/firefox/addon/privly/" href="https://">
+        <div style="position:relative; width:10em; padding:1em; height:150px">
+         <img alt="Google Chrome Logo" class="download-extension-img" id="chrome_img" src="../shared/images/chrome-logo_150.png"/>
+         <img alt="Firefox Logo" class="download-extension-img" id="firefox_img" src="../shared/images/firefox-logo_150.png"/>
+         <img alt="Privly Icon" src="../shared/images/icon_96.png" style="position:absolute; right:33px; top:15px;"/>
+        </div>
+       </a>
+      </div>
+      <!-- /.col-md-3 -->
+      <div class="col-md-9">
+       <h2>
+        <span class="referrer">
+        </span>
+       </h2>
+       <p>
+        <a href="https://priv.ly/pages/download">
+         Download
         </a>
-       </div>
-       <div class="col-md-9">
-        <h2>
-         <span class="referrer">
-         </span>
-        </h2>
-        <p>
-         <a href="https://priv.ly/pages/download">
-          Download
-         </a>
-         the Privly Extension, and you will
-         <strong>
-          see this content instead
+        the Privly Extension, and you will
+        <strong>
+         see this content instead
                  of the link
-         </strong>
-         that brought you to this page. We don't want
+        </strong>
+        . We don't want
                  you waste your time coming back to this website again.
-         <a href="https://priv.ly/pages/download">
-          Download
-         </a>
-         the extension and you won't have to.
-        </p>
-       </div>
-       <!-- /col-md-3 -->
+        <a href="https://priv.ly/pages/download">
+         Download
+        </a>
+        the extension and you won't have to.
+       </p>
       </div>
-      <!-- /row -->
+      <!-- /col-md-9 -->
      </div>
-     <!-- /container -->
+     <!-- /row -->
     </div>
-    <!-- /privlyHeightWrapper -->
+    <!-- /downloadmessage -->
    </div>
-   <!-- /wrap -->
-   <div class="injected_hide" id="footer">
-    <div class="container">
-     <p class="text-muted credit">
-      <a href="https://www.priv.ly/pages/donate.html" target="_blank">
-       <span class="glyphicon glyphicon-gift">
-       </span>
-       Donate
-      </a>
-      to build a more private web.
-          You are viewing a
-          Privly
-      <span style="vertical-align: super;font-size: xx-small">
-       ®
+   <!-- /container -->
+  </div>
+  <!-- /privlyHeightWrapper -->
+  <!-- /wrap -->
+  <div class="injected_hide" id="footer">
+   <div class="container">
+    <p class="text-muted credit">
+     <a href="https://www.priv.ly/pages/donate.html" target="_blank">
+      <span class="glyphicon glyphicon-gift">
       </span>
-      Application,
-      <a href="https://priv.ly/pages/about" target="_blank">
-       learn more
-      </a>
-      about Privly.
-      <a class="legal_nav" href="/pages/privacy" target="_blank">
-       Terms of Service
-      </a>
-      and
-      <a class="legal_nav" href="/pages/privacy" target="_blank">
-       DMCA
-      </a>
-      .
-     </p>
-    </div>
+      Donate
+     </a>
+     to build a more private web.
+        You are viewing a
+        Privly
+     <span style="vertical-align: super; font-size: xx-small">
+      ®
+     </span>
+     Application,
+     <a href="https://priv.ly/pages/about" target="_blank">
+      learn more
+     </a>
+     about Privly.
+     <a class="legal_nav" href="/pages/privacy" target="_blank">
+      Terms of Service
+     </a>
+     and
+     <a class="legal_nav" href="/pages/privacy" target="_blank">
+      DMCA
+     </a>
+     .
+    </p>
    </div>
   </div>
  </body>

From 7776b78fda14139a4675ab8d700dd1660bbc725e Mon Sep 17 00:00:00 2001
From: Sean McGregor <gitcommit@seanbmcgregor.com>
Date: Tue, 5 Jan 2016 21:19:40 -0800
Subject: [PATCH 2/2] updated XPI name for jetpack selenium tests

---
 test/selenium/configurations.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/selenium/configurations.rb b/test/selenium/configurations.rb
index 21a065c..3d9cdea 100644
--- a/test/selenium/configurations.rb
+++ b/test/selenium/configurations.rb
@@ -39,7 +39,7 @@ def common_configuration_for_firefox_extension
   system("cd ../../../../../ && pwd && jpm xpi && cd chrome/content/privly-applications/test/selenium")
   # Find out the xpi file name
   json = JSON.load(File.new("../../../../../package.json"))
-  xpi_filename = "@" + json['name'] + "-" + json['version'] + ".xpi"
+  xpi_filename = "@priv.ly-" + json['version'] + ".xpi"
   # Load the Firefox driver with the extension installed
   @profile = Selenium::WebDriver::Firefox::Profile.new
   @profile["extensions.privly.integration_test"] = "true"
