build.py file is now compatible with both Python2 and Python3

.gitignore

@@ -2,5 +2,6 @@
 *.swp
 .idea
 *~
+test/sauce.json
 test/node_modules/*
 test/coverage

.travis.yml

@@ -34,14 +34,12 @@ env:
   - secure: HAqHN7zeSbDR7BP0pn6qH6ODOwuMD7eIR9t4h1gHkRy6WAQBrhQb1+kTzkGbhfKB1mftxN/0ERTK6xv+iBj4QylqOOXChnuthuHMZiAuwPJncj8FYE4LHt2Eh48+HnzSQUgzjxv11hvkLz4utaj0J4fub2q/tWzoAXucA13UGQU=
 script:
 - cd test
-- "if [ ${TRAVIS_PULL_REQUEST} = 'false' ]; then ./run_each.sh karma.conf-ci.js; fi"
+- export BROWSERS_TO_TEST=Chrome,Firefox,Safari # test all the browsers
+- "if [ ${TRAVIS_PULL_REQUEST} = 'false' ]; then ./run_each.sh karma.conf-ci.js; fi" # Run the unit tests
+- "if [ ${TRAVIS_PULL_REQUEST} = 'false' ]; then ./node_modules/.bin/lcov-result-merger 'coverage/*.lcov' 'coverage/combined.lcov'; fi" # Merge the coverage results
 - "cd .."
-# Move the lcov.info file to the root
-- "find . -name lcov.info -exec mv {} . \\;"
-# Send the file to CodeClimate
-- "if [ \"$CODECLIMATE_REPO_TOKEN\" ]; then codeclimate <  lcov.info; fi"
+- "if [ ${TRAVIS_PULL_REQUEST} = 'false' ]; then cat ./test/coverage/combined.lcov | ./test/node_modules/coveralls/bin/coveralls.js; fi" # Send the coverage results to coveralls
 before_script:
 - "cd test/ && npm install -g karma-cli && npm install && cd .."
-- npm install -g codeclimate-test-reporter
 addons:
   sauce_connect: true

Help/content_server.html

@@ -6,25 +6,32 @@
       This was likely rendered from the Privly-application templating system
       See: https://github.com/privly/privly-applications/pull/19
      -->
-  <title>
-   Help
-  </title>
   <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
-  <!-- Top Styles -->
-  <link class="top" href="../vendor/bootstrap/css/bootstrap.min.css" media="screen" rel="stylesheet"/>
-  <link class="top" href="../shared/css/top/top.css" rel="stylesheet"/>
-  <!-- Common Styles -->
   <link href="../shared/css/common.css" media="screen" rel="stylesheet" type="text/css"/>
-  <link href="../shared/css/tooltip.css" media="screen" rel="stylesheet" type="text/css"/>
   <script src="../shared/javascripts/meta_loader.js" type="text/javascript">
   </script>
   <script src="../shared/javascripts/parameters.js" type="text/javascript">
   </script>
+  <script src="../shared/javascripts/local_storage.js" type="text/javascript">
+  </script>
+  <script src="../shared/javascripts/context_messenger.js" type="text/javascript">
+  </script>
+  <script src="../shared/javascripts/glyph.js" type="text/javascript">
+  </script>
+  <script src="../shared/javascripts/storage.js" type="text/javascript">
+  </script>
+  <script src="../shared/javascripts/options.js" type="text/javascript">
+  </script>
   <script src="../shared/javascripts/network_service.js" type="text/javascript">
   </script>
-  <script src="../shared/javascripts/extension_integration.js" type="text/javascript">
+  <title>
+   Help
+  </title>
+  <link class="top" href="../vendor/bootstrap/css/bootstrap.min.css" media="screen" rel="stylesheet"/>
+  <link class="top" href="../shared/css/top/top.css" rel="stylesheet"/>
+  <script src="../shared/javascripts/event_emitter.js" type="text/javascript">
   </script>
-  <script src="../shared/javascripts/local_storage.js" type="text/javascript">
+  <script src="../shared/javascripts/viewAdapters/new.js" type="text/javascript">
   </script>
   <script src="../vendor/jquery.min.js" type="text/javascript">
   </script>
@@ -59,23 +66,23 @@
       <ul class="nav navbar-nav">
        <li class="logged_in_nav" style="display:none;">
         <a href="../History/new.html">
-         History
          <span class="glyphicon glyphicon-list-alt">
          </span>
+         History
         </a>
        </li>
        <li class="logged_out_nav">
         <a class="login_url" href="../Login/new.html">
-         Login
          <span class="glyphicon glyphicon-log-in">
          </span>
+         Login
         </a>
        </li>
        <li class="dropdown logged_in_nav" style="display:none;">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-         New Link
          <b class="caret">
          </b>
+         New Link
         </a>
         <ul class="dropdown-menu">
          <li class="dropdown-header">
@@ -106,9 +113,9 @@
        </li>
        <li class="logged_in_nav" style="display:none;">
         <a class="logout_url" href="#" id="logout_link">
-         Logout
          <span class="glyphicon glyphicon-log-out">
          </span>
+         Logout
         </a>
        </li>
       </ul>
@@ -119,32 +126,35 @@
    <div class="container">
     <div class="row">
      <div class="col-lg-12">
-      <p class="flash notice" id="messages">
+      <p class="alert alert-info" id="messages">
        Pending server check. The application is checking its connection 
               with the remote server.
       </p>
-      <p class="flash notice" id="login_message" style="display:none;">
+      <p class="alert alert-warning" id="login_message" style="display:none;">
        You are not currently signed into your content server. Please
        <a class="login_url btn btn-default" href="../Login/new.html">
         login
        </a>
       </p>
       <div id="copy_message" style="display:none;">
-       <p class="flash notice">
-        Copy and paste the address found below to any website
-                you want to share this information through.
-       </p>
-       <p class="flash notice">
+       <p class="alert alert-warning">
+        <span id="step1_message">
+         <strong>
+          Step 1.
+         </strong>
+         Copy and paste the address found below to any website
+                  you want to share this information through.
+        </span>
         <span class="glyphicon glyphicon-link">
         </span>
         <span class="privlyUrl" data-privly-exclude="true">
         </span>
        </p>
-       <p class="flash notice open-app-button" style="display:none;">
+       <p class="alert alert-warning open-app-button" style="display:none;">
         <strong>
-         Now copy/paste
+         Step 2.
         </strong>
-        the highlighted address anywhere you want to share it. You can also
+        Copy/paste the highlighted address anywhere you want to share it. You can also
         <a class="btn btn-default" href="" id="local_address" target="_blank">
          open the link
         </a>
@@ -202,6 +212,8 @@ <h2>
          control. If you are not inclined to self-host, it is possible to host your content with other service providers. Remember that trusting others to host your data could be perilous to your privacy if you use an application that doesn't encrypt your data.
         </li>
        </ul>
+       <p>
+       </p>
        <p>
         Your content server may have information we can't display here. To view information presented by your content server you can visit your content server.
         <br/>

Help/js/help.js

@@ -22,10 +22,7 @@ var callbacks = {
   pendingLogin: function() {
 
     // Save to local storage the app to redirect to after succesful log in
-    ls.setItem("Login:redirect_to_app", window.location.href);
-
-    // Set the nav bar to the proper domain
-    privlyNetworkService.initializeNavigation();
+    Privly.storage.set("Login:redirect_to_app", window.location.href);
 
     var domain = privlyNetworkService.contentServerDomain();
     $("#current_content_server").text(domain.split("/")[2]);
@@ -35,14 +32,6 @@ var callbacks = {
       $(".chrome_options_link").show();
     }
 
-    // Add listeners to show loading animation while making ajax requests
-    $(document).ajaxStart(function() {
-      $('#loadingDiv').show(); 
-    });
-    $(document).ajaxStop(function() {
-      $('#loadingDiv').hide();
-    });
-
     privlyNetworkService.initPrivlyService(
       privlyNetworkService.contentServerDomain(),
       callbacks.pendingPost,
@@ -77,14 +66,19 @@ var callbacks = {
 
 };
 
-// Initialize the application
-document.addEventListener('DOMContentLoaded',
-  function() {
-
-    // Don't start the script if it is running in a Headless
-    // browser
-    if( document.getElementById("logout_link") ) {
-      callbacks.pendingLogin();
-    }
+document.addEventListener('DOMContentLoaded', function () {
+  // Don't start the script if it is running in a Headless
+  // browser
+  if (!document.getElementById("logout_link")) {
+    return;
   }
-);
+
+  var adapter = new Privly.app.viewAdapter.New({});
+
+  adapter.on('beforePendingLogin', function () {
+    callbacks.pendingLogin();
+    return true;
+  });
+
+  adapter.start();
+});

Help/new.html

@@ -6,25 +6,32 @@
       This was likely rendered from the Privly-application templating system
       See: https://github.com/privly/privly-applications/pull/19
      -->
-  <title>
-   Help
-  </title>
   <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
-  <!-- Top Styles -->
-  <link class="top" href="../vendor/bootstrap/css/bootstrap.min.css" media="screen" rel="stylesheet"/>
-  <link class="top" href="../shared/css/top/top.css" rel="stylesheet"/>
-  <!-- Common Styles -->
   <link href="../shared/css/common.css" media="screen" rel="stylesheet" type="text/css"/>
-  <link href="../shared/css/tooltip.css" media="screen" rel="stylesheet" type="text/css"/>
   <script src="../shared/javascripts/meta_loader.js" type="text/javascript">
   </script>
   <script src="../shared/javascripts/parameters.js" type="text/javascript">
   </script>
+  <script src="../shared/javascripts/local_storage.js" type="text/javascript">
+  </script>
+  <script src="../shared/javascripts/context_messenger.js" type="text/javascript">
+  </script>
+  <script src="../shared/javascripts/glyph.js" type="text/javascript">
+  </script>
+  <script src="../shared/javascripts/storage.js" type="text/javascript">
+  </script>
+  <script src="../shared/javascripts/options.js" type="text/javascript">
+  </script>
   <script src="../shared/javascripts/network_service.js" type="text/javascript">
   </script>
-  <script src="../shared/javascripts/extension_integration.js" type="text/javascript">
+  <title>
+   Help
+  </title>
+  <link class="top" href="../vendor/bootstrap/css/bootstrap.min.css" media="screen" rel="stylesheet"/>
+  <link class="top" href="../shared/css/top/top.css" rel="stylesheet"/>
+  <script src="../shared/javascripts/event_emitter.js" type="text/javascript">
   </script>
-  <script src="../shared/javascripts/local_storage.js" type="text/javascript">
+  <script src="../shared/javascripts/viewAdapters/new.js" type="text/javascript">
   </script>
   <script src="../vendor/jquery.min.js" type="text/javascript">
   </script>
@@ -59,23 +66,23 @@
       <ul class="nav navbar-nav">
        <li class="logged_in_nav" style="display:none;">
         <a href="../History/new.html">
-         History
          <span class="glyphicon glyphicon-list-alt">
          </span>
+         History
         </a>
        </li>
        <li class="logged_out_nav">
         <a class="login_url" href="../Login/new.html">
-         Login
          <span class="glyphicon glyphicon-log-in">
          </span>
+         Login
         </a>
        </li>
        <li class="active dropdown logged_in_nav" style="display:none;">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-         New Link
          <b class="caret">
          </b>
+         New Link
         </a>
         <ul class="dropdown-menu">
          <li class="dropdown-header">
@@ -106,9 +113,9 @@
        </li>
        <li class="logged_in_nav" style="display:none;">
         <a class="logout_url" href="#" id="logout_link">
-         Logout
          <span class="glyphicon glyphicon-log-out">
          </span>
+         Logout
         </a>
        </li>
       </ul>
@@ -119,32 +126,35 @@
    <div class="container">
     <div class="row">
      <div class="col-lg-12">
-      <p class="flash notice" id="messages">
+      <p class="alert alert-info" id="messages">
        Pending server check. The application is checking its connection 
               with the remote server.
       </p>
-      <p class="flash notice" id="login_message" style="display:none;">
+      <p class="alert alert-warning" id="login_message" style="display:none;">
        You are not currently signed into your content server. Please
        <a class="login_url btn btn-default" href="../Login/new.html">
         login
        </a>
       </p>
       <div id="copy_message" style="display:none;">
-       <p class="flash notice">
-        Copy and paste the address found below to any website
-                you want to share this information through.
-       </p>
-       <p class="flash notice">
+       <p class="alert alert-warning">
+        <span id="step1_message">
+         <strong>
+          Step 1.
+         </strong>
+         Copy and paste the address found below to any website
+                  you want to share this information through.
+        </span>
         <span class="glyphicon glyphicon-link">
         </span>
         <span class="privlyUrl" data-privly-exclude="true">
         </span>
        </p>
-       <p class="flash notice open-app-button" style="display:none;">
+       <p class="alert alert-warning open-app-button" style="display:none;">
         <strong>
-         Now copy/paste
+         Step 2.
         </strong>
-        the highlighted address anywhere you want to share it. You can also
+        Copy/paste the highlighted address anywhere you want to share it. You can also
         <a class="btn btn-default" href="" id="local_address" target="_blank">
          open the link
         </a>
@@ -219,10 +229,10 @@ <h1>
         <strong>
          <span class="glyphicon glyphicon-eye-open">
          </span>
-         Experts Only:
+         Indie Hosts Only:
         </strong>
-        Other applications built on Privly provide privacy only in special 
-      circumstances and should be viewed as "experts only."
+        These applications provide privacy if you host your own content server.
+      If you don't know what that means, you should not use these apps.
        </p>
        <div class="col-md-3">
         <form action="../PlainPost/new.html" style="display:inline;">