Skip to content

Commit

Permalink
Fixed some silly things I g'borked
Browse files Browse the repository at this point in the history
  • Loading branch information
bnvk committed Oct 16, 2014
1 parent 0575e3d commit fde66ed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 5 additions & 1 deletion static/default/html/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@
<!-- JS Global Libraries -->
<script src="/static/js/jquery.min.js"></script>
<script src="/static/js/libraries.min.js"></script>
{% if state.command_url not in ("/auth/login/", "/auth/logout/") %}
{% if state.command_url not in ("/auth/login/", "/auth/logout/", "/setup/welcome/") %}
<script src="/api/0/jsapi/as.js"></script>
{% if state.command_url in ("/message/draft/", "/message/") %}
<script src="/static/js/plupload.full.min.js"></script>
{% endif %}

<!-- JS - App Specific -->
{% if state.command_url not in ("/setup/crypto/") %}
<script>
{% if result.data and result.data.addresses %}
{% set addresses_json = result.data.addresses|json %}
Expand Down Expand Up @@ -76,4 +79,5 @@
);
</script>
<script src="/api/0/jsapi/app.js"></script>
{% endif %}
{% endif %}
4 changes: 1 addition & 3 deletions static/default/html/setup/crypto.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h3 class="text-center">{{_("Creating Encryption Keys")}}</h3>
<div id="setup-passphrase-authenticated" class="hide text-center half-top">
<h3 class="half-bottom">{{_("Successfully Authenticated")}}</h3>
<p>{{_("Below is the unique fingerprint of your encryption key. Use this to help other people verify your encryption key by reading it to them in person, phone, or video chat, and have them compare it to the fingerprint on the encryption key they have!")}}</p>
<ul class="setup-list-items">
<ul class="setup-list-items add-bottom">
<li class="setup-item">
<div class="setup-cryto-fingerprint-icon">
<span class="icon-fingerprint"></span>
Expand Down Expand Up @@ -122,8 +122,6 @@ <h3 class="text-center">{{_("Create your passphrase")}}</h3>
</form>
</div>



<script src="/api/0/jsapi/setup.js"></script>
<script>
$(document).ready(function() {
Expand Down

0 comments on commit fde66ed

Please sign in to comment.