website Changeset - 034a60be9b5c · Conservancy Kallithea

Changeset - 034a60be9b5c

Parent rev.

Child rev.

[Not reviewed]

0 4 1

Brett Smith (brett) - 7 years ago 2016-12-31 19:46:10
brett@sfconservancy.org

js: Split whole-site JS from Supporter-specific JS.

5 files changed with 93 insertions and 102 deletions:

www/conservancy/static/js/conservancy.js

www/conservancy/static/js/supporter-page.js

101

www/conservancy/static/supporter/original-supporter-appeal.html

www/conservancy/templates/base_conservancy.html

www/conservancy/templates/supporter/index.html

0 comments (0 inline, 0 general)

www/conservancy/static/js/conservancy.js

➞

Show inline comments

 new file 100644
 /* Copyright (C) 2012-2013 Denver Gingerich,
 ** Copyright (C) 2013-2014 Bradley M. Kuhn,
 ** Copyright (C) 2016 Brett Smith.
 ** License: GPLv3-or-later
 **  Find a copy of GPL at https://sfconservancy.org/GPLv3
 */
 $(document).ready(function() {
     /* Set up the fundraiser multiprogressbar near the top of each page. */
     var siteFinalGoal = $('span#site-fundraiser-final-goal').text();
     var noCommaSiteFinalGoal = parseInt(siteFinalGoal.replace(/,/g, ""));
     var siteMatchCount = $('span#site-fundraiser-match-count').text();
     var noCommaSiteMatchCount = parseInt(siteMatchCount.replace(/,/g, ""));
     if (! noCommaSiteMatchCount) {
         noCommaSiteMatchCount = "0";
+    }
     var barParts = [{
         value: (noCommaSiteMatchCount / noCommaSiteFinalGoal) * 100,
         text: noCommaSiteMatchCount.toLocaleString() + " matched!",
         barClass: "progress",
         textClass: "soFarText",
     }];
     if (barParts[0].value < 100) {
         var matchesLeft = noCommaSiteFinalGoal - noCommaSiteMatchCount;
         barParts.push({
             value: 100,
             text: matchesLeft.toLocaleString() + " to go!",
             barClass: "final-goal",
             textClass: "goalText",
         });
+    }
     $('#siteprogressbar').empty().multiprogressbar({parts: barParts});
     $('span#fundraiser-percentage').css({ 'color'        : 'green',
                                           'font-weight'  : 'bold',
                                           'float'        : 'right',
                                           'margin-right' : '40%',
                                           'margin-top'   : '2.5%',
                                           'text-align'   : 'inherit'});
     /* Set up donation form elements used across the whole site. */
     $('.toggle-content').hide();
     $('.toggle-control')
      .addClass('clickable')
      .bind('click', function() {
         var $control = $(this);
         var $parent = $control.parents('.toggle-unit');
         $parent.toggleClass('expanded');
         $parent.find('.toggle-content').slideToggle();
         // if control has HTML5 data attributes, use to update text
         if ($parent.hasClass('expanded')) {
             $control.html($control.attr('data-expanded-text'));
         } else {
             $control.html($control.attr('data-text'));
+        }
     });
     $('a.donate-now')
       .addClass('clickable')
       .bind('click', function() {
         var $control = $('#donate-box');
         var $otherTextControl = $('.donate-sidebar');
         setTimeout(function() { $control.find('.toggle-content').slideUp(100);
                                 $control.toggleClass('expanded');
                                 $control.find('.toggle-content').slideDown(800).fadeOut(10);
                                 $otherTextControl.find('.donate-box-highlight').fadeOut(100);
                               }, 300);
           setTimeout(function() { $control.find('.toggle-content').fadeIn(2000);
                                   $otherTextControl.find('.donate-box-highlight')
                                   .css({'font-weight': 'bold', 'font-size' : '110%' });
                                   $otherTextControl.find('.donate-box-highlight').fadeIn(10000);
                                 }, 500);
     });
     $(".t-shirt-size-selector").hide();
     $('input[name=on0]:radio').change(function() {
         var input=$(this);
         var tShirtSelector = input.parent().children('.t-shirt-size-selector')
         var noShippingSelector = input.parent().children('input#no_shipping');
         var value = input.val();
         if (value == "wantGiftYes") {
             tShirtSelector.show();
             noShippingSelector.val("2");
         } else {
             tShirtSelector.hide();
             noShippingSelector.val("0");
+        }
     });
 });

www/conservancy/static/js/supporter-page.js

➞

Show inline comments

@@ ... / @@ -3,129 +3,48 @@ @@
 ** Copyright (C) 2016 Brett Smith.
 ** License: GPLv3-or-later
 **  Find a copy of GPL at https://sfconservancy.org/GPLv3
 */
 var supportTypeSelector = function(supportTypeHash) {
     return $(".supporter-type-selector a[href=" + supportTypeHash + "]");
 };
 var $window = $(window);
 $window.load(function() {
     /* We've sometimes published links that say #renew instead of #renewal.
        Rewrite that to work as intended. */
     if (window.location.hash === "#renew") {
         window.location.hash = "#renewal";
+    }
     var $selectorLink = supportTypeSelector(window.location.hash);
     if ($selectorLink.length > 0) {
         $window.scrollTop($selectorLink.offset().top);
+    }
 });
 $(document).ready(function() {
     var siteFinalGoal = $('span#site-fundraiser-final-goal').text();
     var noCommaSiteFinalGoal = parseInt(siteFinalGoal.replace(/,/g, ""));
     var siteMatchCount = $('span#site-fundraiser-match-count').text();
     var noCommaSiteMatchCount = parseInt(siteMatchCount.replace(/,/g, ""));
     if (! noCommaSiteMatchCount) {
         noCommaSiteMatchCount = "0";
+    }
     var barParts = [{
         value: (noCommaSiteMatchCount / noCommaSiteFinalGoal) * 100,
         text: noCommaSiteMatchCount.toLocaleString() + " matched!",
         barClass: "progress",
         textClass: "soFarText",
     }];
     if (barParts[0].value < 100) {
         var matchesLeft = noCommaSiteFinalGoal - noCommaSiteMatchCount;
         barParts.push({
             value: 100,
             text: matchesLeft.toLocaleString() + " to go!",
             barClass: "final-goal",
             textClass: "goalText",
         });
+    }
     $('#siteprogressbar').empty().multiprogressbar({parts: barParts});
     $('span#fundraiser-percentage').css({ 'color'        : 'green',
                                           'font-weight'  : 'bold',
                                           'float'        : 'right',
                                           'margin-right' : '40%',
                                           'margin-top'   : '2.5%',
                                           'text-align'   : 'inherit'});
     $('.toggle-content').hide();
     $('.toggle-control')
      .addClass('clickable')
      .bind('click', function() {
         var $control = $(this);
         var $parent = $control.parents('.toggle-unit');
         $parent.toggleClass('expanded');
         $parent.find('.toggle-content').slideToggle();
         // if control has HTML5 data attributes, use to update text
         if ($parent.hasClass('expanded')) {
             $control.html($control.attr('data-expanded-text'));
         } else {
             $control.html($control.attr('data-text'));
+        }
     });
     $('a.donate-now')
       .addClass('clickable')
       .bind('click', function() {
         var $control = $('#donate-box');
         var $otherTextControl = $('.donate-sidebar');
         setTimeout(function() { $control.find('.toggle-content').slideUp(100);
                                 $control.toggleClass('expanded');
                                 $control.find('.toggle-content').slideDown(800).fadeOut(10);
                                 $otherTextControl.find('.donate-box-highlight').fadeOut(100);
                               }, 300);
           setTimeout(function() { $control.find('.toggle-content').fadeIn(2000);
                                   $otherTextControl.find('.donate-box-highlight')
                                   .css({'font-weight': 'bold', 'font-size' : '110%' });
                                   $otherTextControl.find('.donate-box-highlight').fadeIn(10000);
                                 }, 500);
     });
     $(".t-shirt-size-selector").hide();
     $('input[name=on0]:radio').change(function() {
         var input=$(this);
         var tShirtSelector = input.parent().children('.t-shirt-size-selector')
         var noShippingSelector = input.parent().children('input#no_shipping');
         var value = input.val();
         if (value == "wantGiftYes") {
             tShirtSelector.show();
             noShippingSelector.val("2");
         } else {
             tShirtSelector.hide();
             noShippingSelector.val("0");
+        }
     });
     // Forms start in "invalid" form, with the errors shown, so that
     // non-Javascript users see the errors by default and know what they must
     // enter.  The following two lines correct that.
     $('*#amount').addClass("valid");
     $('.supporter-form-inputs .form-error-show')
         .removeClass('form-error-show').addClass('form-error');
     $('.dinner-form-inputs .form-error-show')
         .removeClass('form-error-show').addClass('form-error');
     $('*#amount').on('input', function() {
         var input=$(this);
         var value = input.val();
         var errorElement=$("span#error", input.parent());
         var noCommaValue = value;
         noCommaValue = value.replace(/,/g, "");
         var re = /^((\d{1,3}(,?\d{3})*?(\.\d{0,2})?)|\d+(\.\d{0,2})?)$/;
         var isValid = ( re.test(value) &&
                         parseInt(noCommaValue) >= parseInt(input.attr("min")));
         if (isValid)  {
            input.removeClass("invalid").addClass("valid");
            errorElement.removeClass("form-error-show").addClass("form-error");
            $("#form-correction-needed").removeClass("form-error-show").addClass("form-error");
+        }
         else {
@@ ... / @@ -164,45 +83,25 @@ $(document).ready(function() { @@
             var $element = $(element);
             if (event.target.href.endsWith("#" + element.id)) {
                 $element.show();
             } else {
                 $element.hide();
+            }
         });
         $("#form-correction-needed").removeClass("form-error-show").addClass("form-error");
         return false;
     };
     $(".supporter-type-selector a").bind("click", selectSupportType);
     var selectSupportTypeFromHash = function() {
         return supportTypeSelector(window.location.hash).click();
     };
     $window.bind("hashchange", selectSupportTypeFromHash);
     var $selectorLink = selectSupportTypeFromHash();
     if (parseFloat($("form#annual").get(0).dataset.upgradeFromAmount) > 0) {
         supportTypeSelector("#annual").click();
         $(".supporter-type-selector").hide();
+    }
     else if ($selectorLink.length === 0) {
         supportTypeSelector("#annual").click();
+    }
     $( ".footnote-mark" ).tooltip({
         items: "a",
         hide: { duration: 5000 },
         position: {
             my: "center bottom-20",
             at: "center left",
             using: function( position, feedback ) {
                 $( this ).css( position );
                 $( "<div>" )
                     .addClass( "arrow" )
                     .addClass( feedback.vertical )
                     .addClass( feedback.horizontal )
                     .appendTo( this );
+            }
         },
         content: function() {
             return $('.footnote-1-text').text();
+        }
     });
 });

www/conservancy/static/supporter/original-supporter-appeal.html

➞

Show inline comments

 {% extends "base_conservancy.html" %}
 {% block subtitle %}Support Conservancy - {% endblock %}
 {% block category %}supporter{% endblock %}
 {% block head %}
 <script type="text/javascript" src="/js/supporter-page.js"></script>
 <link href="/css/forms.css" rel="stylesheet" type="text/css"/>
 {% endblock %}
 {% block content %}
 <div class="donate-sidebar">
 <table style="background-color:#afe478;width:100%;">
 <tr><td style="text-align:center;padding:10px;padding-bottom:10px;">
 <div id="donate-box" class="toggle-unit"><h1 class="toggle-content">Support
     Now!</h1></div>
 <h3 class="donate-box-highlight">Become a Supporter Now:</h3>
 <p>Support us now!</p>
 <h4><a href="#annual"><span class="donate-box-highlight">Annual supporter</span> via PayPal, ACH, or credit card.</a></h4>
 <h4><a href="#monthly"><span class="donate-box-highlight">Monthly supporter</span> via PayPal, ACH, or credit card.</a></h4>
 <span class="donate-box-highlight">Other annual supporters methods:</span>
 <div class="toggle-unit">
     <h4 class="toggle-control" data-text="Wire Transfer"
     data-expanded-text="Wire Transfer:">Wire Transfer</h4>
     <div class="toggle-content">
        Contact <a href="mailto:accounting@sfconservancy.org">Conservancy

www/conservancy/templates/base_conservancy.html

➞

Show inline comments

 {% load humanize %}
 {% load subtract %}
 {% load min %}
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <title>{% block title %}{% block subtitle %}{% endblock %}Software Freedom Conservancy{% endblock %}</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta name="description" content="The Software Freedom Conservancy provides a non-profit home and services to Free, Libre and Open Source Software (FLOSS) projects." />
     <meta name="keywords" content="software, freedom, conservancy, open source, gnu, GNU, Open Source, Free and Open Source, Free and Open Source Software, FLOSS, FOSS, protect, protection, help, policy, linux, non-profit" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" media="screen" href="/css/conservancy.css" />
     <link rel="stylesheet" type="text/css" media="(min-width: 67em)" href="/css/conservancy-bigscreen.css" />
     <link rel="stylesheet" href="/css/jquery-ui-1.8.22.custom.css" />
     <link rel="stylesheet" href="/css/jquery.ui.multiprogressbar.css" />
     <script type="text/javascript" src="/js/jquery-1.7.2.js"></script>
     <script type="text/javascript" src="/js/jquery-ui-1.8.22.custom.min.js"></script>
     <script type="text/javascript" src="/js/jquery.outerhtml.js"></script>
     <script type="text/javascript" src="/js/jquery.ui.multiprogressbar.js"></script>
-    <script type="text/javascript" src="/js/supporter-page.js"></script>
+    <script type="text/javascript" src="/js/conservancy.js"></script>
     {% block head %}{% endblock %}
   </head>
   <body class="conservancy-{% block category %}other{% endblock %}">
     <h1 id="conservancyheader"><a id="logobutton" href="/">Software Freedom Conservancy</a></h1>
     <div id="navbar-outer">
       <div id="navbar">
 	<ul>
       <li class="supporter"><a href="/supporter/">Become a Supporter!</a></li>
       <li class="donate"><a href="/donate/">Donate</a></li>
       <li class="news"><a href="/news/">News</a></li>
       <li class="blog"><a href="/blog/">Blog</a></li>
       <li class="Projects"><a href="/projects/">Projects</a></li>
       <li class="compliance"><a href="/copyleft-compliance/">Copyleft Compliance</a></li>
       <li class="npoacct"><a href="/npoacct/">NPOAcct</a></li>
       <li class="sponsors"><a href="/sponsors/">Sponsors</a></li>
       <li class="About"><a href="/about/">About</a></li>
     </ul>
       </div>
       <div id="navbar-clear"></div>
     </div>
 {% comment %}

www/conservancy/templates/supporter/index.html

➞

Show inline comments

 {% extends "base_conservancy.html" %}
 {% block subtitle %}Support Conservancy - {% endblock %}
 {% block category %}supporter{% endblock %}
 {% block head %}
 <script type="text/javascript" src="/js/supporter-page.js"></script>
 <link href="/css/forms.css" rel="stylesheet" type="text/css"/>
 {% endblock %}
 {% block content %}
 <div class="donate-sidebar">
 <table style="background-color:#afe478;width:100%;">
 <tr><td style="text-align:center;padding:10px;padding-bottom:10px;">
 <div id="donate-box" class="toggle-unit"><h1 class="toggle-content">Support
     Now!</h1></div>
 <h3 class="donate-box-highlight">Become a Supporter Now:</h3>
 <p>Support us now!</p>
 <h4><a href="#annual"><span class="donate-box-highlight">Annual supporter</span> via PayPal, ACH, or credit card.</a></h4>
 <h4><a href="#monthly"><span class="donate-box-highlight">Monthly supporter</span> via PayPal, ACH, or credit card.</a></h4>
 <h4><a href="#renewal"><span class="donate-box-highlight">Renewing Annual supporter</span> via PayPal, ACH, or credit card.</a></h4>
 <span class="donate-box-highlight">Other annual supporters methods:</span>
 <div class="toggle-unit">
     <h4 class="toggle-control" data-text="Wire Transfer"
     data-expanded-text="Wire Transfer:">Wire Transfer</h4>
     <div class="toggle-content">
        Contact <a href="mailto:accounting@sfconservancy.org">Conservancy

0 comments (0 inline, 0 general)