paint the walls

emails/charge_failed.spt

@@ -12,7 +12,7 @@
 
 <pre>{{ exchange.note }}</pre>
 
-<a href="{{ participant.profile_url+'routes/credit-card.html' }}"
+<a href="{{ participant.profile_url+'routes/credit-card' }}"
    style="{{ button_style }}">{{ _("Fix Credit Card") }}</a>
 
 [---] text/plain
@@ -25,4 +25,4 @@
 
 {{ exchange.note }}
 
-{{ _("Follow this link to fix your credit card:") }} {{ participant.profile_url+'routes/credit-card.html' }}
+{{ _("Follow this link to fix your credit card:") }} {{ participant.profile_url+'routes/credit-card' }}

error.spt

@@ -7,6 +7,7 @@ from gratipay.utils.i18n import HTTP_ERRORS
 
 [----------------------------------------]
 
+banner = _("Eep!")
 code = response.code
 msg = _(HTTP_ERRORS.get(code, status_strings.get(code, '')))
 try:
@@ -20,6 +21,7 @@ err = response.body
 if code == 500 and not err:
     err = _("Looks like you've found a bug! Sorry for the inconvenience, we'll get it fixed ASAP!")
 
+suppress_sidebar = True
 [----------------------------------------] text/html
 {% extends "templates/base.html" %}
 {% set title = code %}

gratipay/main.py

@@ -34,7 +34,7 @@
     'b64encode': base64.b64encode,
     'enumerate': enumerate,
     'filter': filter,
-    'filter_profile_subnav': utils.filter_profile_subnav,
+    'filter_profile_nav': utils.filter_profile_nav,
     'float': float,
     'len': len,
     'map': map,

gratipay/utils/__init__.py

@@ -214,7 +214,7 @@ def erase_cookie(cookies, key, **kw):
     set_cookie(cookies, key, '', BEGINNING_OF_EPOCH, **kw)
 
 
-def filter_profile_subnav(user, participant, pages):
+def filter_profile_nav(user, participant, pages):
     out = []
     for foo, bar, show_them, show_others in pages:
         if (user.participant == participant and show_them) \

gratipay/utils/notifications.py

@@ -1,5 +1,5 @@
 def paypal_withdrawal_failed(_, user):
-    href = '/~%s/routes/paypal.html' % user.participant.username
+    href = '/~%s/routes/paypal' % user.participant.username
     return ('error',
         ['a',
             {'href': href}, _("Your last PayPal payout failed!"),
@@ -8,7 +8,7 @@ def paypal_withdrawal_failed(_, user):
 
 
 def credit_card_failed(_, user):
-    href = '/~%s/routes/credit-card.html' % user.participant.username
+    href = '/~%s/routes/credit-card' % user.participant.username
     return ('error',
         ['span', _("Your credit card has failed!") + " ",
             ['a', {'href': href}, _("Fix your card")]
@@ -17,7 +17,7 @@ def credit_card_failed(_, user):
 
 
 def credit_card_expires(_, user):
-    href = '/~%s/routes/credit-card.html' % user.participant.username
+    href = '/~%s/routes/credit-card' % user.participant.username
     return ('error',
         ['span', _("Your credit card is about to expire!") + " ",
             ['a', {'href': href}, _("Update card")]
@@ -26,7 +26,7 @@ def credit_card_expires(_, user):
 
 
 def email_missing(_, user):
-    href = '/~%s/settings/#emails' % user.participant.username
+    href = '/~%s/emails/' % user.participant.username
     return ('notice',
         ['span', _('Your account does not have an associated email address.') + " ",
             ['a', {'href': href}, _('Add an email address')],

js/gratipay.js

@@ -12,6 +12,7 @@ Gratipay.getCookie = function(key) {
 
 Gratipay.init = function() {
     Gratipay.warnOffUsersFromDeveloperConsole();
+    Gratipay.adaptToLongUsernames();
     Gratipay.forms.initCSRF();
     Gratipay.signIn();
     Gratipay.signOut();
@@ -27,6 +28,16 @@ Gratipay.warnOffUsersFromDeveloperConsole = function() {
     console.log("%cPlease close this window now.", "color: blue;");
 };
 
+Gratipay.adaptToLongUsernames = function() {
+    var h1 = $('#banner h1');
+    var nchars = h1.text().length;
+    if (nchars > 16)
+        h1.addClass('really-long');
+    else if (nchars > 8)
+        h1.addClass('long');
+    h1.show();
+};
+
 Gratipay.error = function(jqXHR, textStatus, errorThrown) {
     var msg = null;
     try {

js/gratipay/emails.js

@@ -0,0 +1,73 @@
+Gratipay.emails = {};
+
+Gratipay.emails.post = function(e) {
+    e.preventDefault();
+    var $this = $(this);
+    var action = this.className;
+    var $inputs = $('.emails button, .emails input');
+    console.log($this);
+    var address = $this.parent().data('email') || $('input.add-email').val();
+
+    $inputs.prop('disabled', true);
+
+    $.ajax({
+        url: 'modify.json',
+        type: 'POST',
+        data: {action: action, address: address},
+        dataType: 'json',
+        success: function (msg) {
+            if (msg) {
+                Gratipay.notification(msg, 'success');
+            }
+            if (action == 'add-email') {
+                $('input.add-email').val('');
+                setTimeout(function(){ window.location.reload(); }, 3000);
+                return;
+            } else if (action == 'set-primary') {
+                $('.emails li').removeClass('primary');
+                $this.parent().addClass('primary');
+            } else if (action == 'remove') {
+                $this.parent().fadeOut();
+            }
+            $inputs.prop('disabled', false);
+        },
+        error: [
+            function () { $inputs.prop('disabled', false); },
+            Gratipay.error
+        ],
+    });
+};
+
+
+Gratipay.emails.init = function () {
+
+    // Wire up email addresses list.
+    // =============================
+
+    $('.emails button, .emails input').prop('disabled', false);
+    $('.emails button[class]').on('click', Gratipay.emails.post);
+    $('form.add-email').on('submit', Gratipay.emails.post);
+
+
+    // Wire up notification preferences
+    // ================================
+
+    $('.email-notifications input').click(function(e) {
+        var field = $(e.target).data('field');
+        var bits = $(e.target).data('bits') || 1;
+        jQuery.ajax(
+            { url: '../emails/notifications.json'
+            , type: 'POST'
+            , data: {toggle: field, bits: bits}
+            , dataType: 'json'
+            , success: function(data) {
+                Gratipay.notification(data.msg, 'success');
+                $(e.target).attr('checked', data.new_value & bits)
+            }
+            , error: [
+                Gratipay.error,
+                function(){ $(e.target).attr('checked', !$(e.target).attr('checked')) },
+            ]
+        });
+    });
+};

js/gratipay/jump.js

@@ -1,10 +1,10 @@
 $(document).ready(function() {
-    $('#jump').submit(function (e) {
+    $('.jump-box').submit(function (e) {
         e.preventDefault();
         e.stopPropagation();
 
-        var platform = Gratipay.trim($('#jump select').val()),
-            val      = Gratipay.trim($('#jump input').val());
+        var platform = Gratipay.trim($('.jump-box select').val()),
+            val      = Gratipay.trim($('.jump-box input').val());
         if (val) window.location = '/on/' + platform + '/' + val + '/';
     });
 });

js/gratipay/routes.js

@@ -22,6 +22,10 @@ Gratipay.routes.lazyLoad = function(script_url) {
     }).fail(Gratipay.error);
 }
 
+Gratipay.routes.redirectToOverview = function() {
+    window.location = './';
+};
+
 Gratipay.routes.deleteRoute = function(e) {
     e.stopPropagation();
     e.preventDefault();
@@ -35,7 +39,7 @@ Gratipay.routes.deleteRoute = function(e) {
         { url: "/~" + Gratipay.username + "/routes/delete.json"
         , data: {network: $this.data('network'), address: $this.data('address')}
         , type: "POST"
-        , success: function() { window.location.reload(); }
+        , success: Gratipay.routes.redirectToOverview
         , error: Gratipay.error
          }
     );
@@ -44,7 +48,7 @@ Gratipay.routes.deleteRoute = function(e) {
 
 Gratipay.routes.onSuccess = function(data) {
     $('button#save').prop('disabled', false);
-    window.location.reload();
+    Gratipay.routes.redirectToOverview();
 };
 
 Gratipay.routes.associate = function (network, address) {

js/gratipay/settings.js

@@ -1,43 +1,5 @@
 Gratipay.settings = {};
 
-Gratipay.settings.post_email = function(e) {
-    e.preventDefault();
-    var $this = $(this);
-    var action = this.className;
-    var $inputs = $('.emails button, .emails input');
-    console.log($this);
-    var address = $this.parent().data('email') || $('input.add-email').val();
-
-    $inputs.prop('disabled', true);
-
-    $.ajax({
-        url: '../emails/modify.json',
-        type: 'POST',
-        data: {action: action, address: address},
-        dataType: 'json',
-        success: function (msg) {
-            if (msg) {
-                Gratipay.notification(msg, 'success');
-            }
-            if (action == 'add-email') {
-                $('input.add-email').val('');
-                setTimeout(function(){ window.location.reload(); }, 3000);
-                return;
-            } else if (action == 'set-primary') {
-                $('.emails li').removeClass('primary');
-                $this.parent().addClass('primary');
-            } else if (action == 'remove') {
-                $this.parent().fadeOut();
-            }
-            $inputs.prop('disabled', false);
-        },
-        error: [
-            function () { $inputs.prop('disabled', false); },
-            Gratipay.error
-        ],
-    });
-};
-
 Gratipay.settings.init = function() {
 
     // Wire up username knob.
@@ -111,28 +73,6 @@ Gratipay.settings.init = function() {
         });
     });
 
-    // Wire up notification preferences
-    // ================================
-
-    $('.email-notifications input').click(function(e) {
-        var field = $(e.target).data('field');
-        var bits = $(e.target).data('bits') || 1;
-        jQuery.ajax(
-            { url: '../emails/notifications.json'
-            , type: 'POST'
-            , data: {toggle: field, bits: bits}
-            , dataType: 'json'
-            , success: function(data) {
-                Gratipay.notification(data.msg, 'success');
-                $(e.target).attr('checked', data.new_value & bits)
-            }
-            , error: [
-                Gratipay.error,
-                function(){ $(e.target).attr('checked', !$(e.target).attr('checked')) },
-            ]
-        });
-    });
-
     // Wire up API Key
     // ===============
 
@@ -162,14 +102,6 @@ Gratipay.settings.init = function() {
     });
 
 
-    // Wire up email addresses list.
-    // =============================
-
-    $('.emails button, .emails input').prop('disabled', false);
-    $('.emails button[class]').on('click', Gratipay.settings.post_email);
-    $('form.add-email').on('submit', Gratipay.settings.post_email);
-
-
     // Wire up close knob.
     // ===================