pageflow 15.5.0 → 15.7.0

data/app/assets/images/pageflow/themes/default/embed_opt_in.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 131 95" fill="#fff">
+  <path d="M32.0099801,0.0106331135 C46.6775918,-0.00982008087 61.3452034,0.00790602091 76.0141994,0.00108828946 C83.0067531,0.00654247462 89.9993068,-0.00982008087 96.9890918,0.0106331135 C97.00432,9.16821 97.0029357,18.3271504 96.9890918,27.4847273 C95.6323896,27.5583588 94.2826094,27.7438011 92.9411355,27.9633321 C92.9314448,19.9770414 92.9411355,11.9880237 92.9369823,4.00173311 C73.9791462,3.99900601 55.0199257,3.99900601 36.0620895,4.00173311 C36.0607051,13.6406418 36.0620895,23.2795506 36.0607051,32.9184593 C36.0717803,35.2883027 36.0385549,37.6595097 36.0773178,40.0307167 C42.2503127,40.0061729 48.4246919,40.0252626 54.5976867,40.0198084 C60.4010495,40.0307167 66.2057966,39.9979916 72.0077749,40.0334438 C71.006861,41.3124503 70.005947,42.5928202 69.1628535,43.9809104 C56.7905604,44.0054542 44.4154986,43.970002 32.0432055,44 C31.9836767,43.6345696 32.0127489,43.2650485 32.0085957,42.8996181 C32.0085957,34.4306321 32.0085957,25.9630097 32.0085957,17.4967507 C32.0155177,11.6662268 31.9850611,5.83842996 32.0099801,0.0106331135 Z M49.626717,8.01391579 C51.1992182,7.90357743 52.8085429,8.453907 53.9855321,9.50416467 C55.2593535,10.619808 56.0340115,12.3048518 55.9985518,14.0021554 C56.0408307,15.8084351 55.1543383,17.5929196 53.7359504,18.7044763 C52.4648566,19.7165923 50.7614273,20.186552 49.1534665,19.9318202 C47.8360023,19.754734 46.5826384,19.1172235 45.6743246,18.1473358 C44.2341154,16.6884175 43.6613049,14.451682 44.1986557,12.4778514 C44.7987429,10.0286124 47.1036232,8.13106515 49.626717,8.01391579 Z M71.7333866,15.7722218 C71.9142535,15.5143598 72.0647458,15.2319394 72.2801293,15 C74.6051666,18.867931 76.9633398,22.716761 79.2994223,26.5778703 C80.1913309,28.0813835 81.1495113,29.5507879 82,31.0774951 C79.998038,32.1485094 78.1079097,33.4228119 76.3544672,34.8567433 C76.1998329,35.0191009 75.9665007,34.9972713 75.7621626,35 C65.1766159,34.9863565 54.588308,35.0136435 44,34.9849922 C44.0883625,34.7571458 44.3078879,34.6179821 44.4694256,34.4433454 C48.2593467,30.6982059 52.0506485,26.9585238 55.8350471,23.2106556 C55.9330742,23.1260659 56.0518112,22.9459718 56.2009229,23.0619415 C58.8517967,24.3689883 61.5012898,25.6814926 64.1521636,26.9885395 C66.6967264,23.2597722 69.2040112,19.5091753 71.7333866,15.7722218 Z M0,21.0412296 C0.255713691,20.9839663 0.516897194,21.003054 0.77534579,21.003054 C9.94958725,21.0098711 19.1238287,20.996237 28.2980702,21.0098711 L28.3623405,21.0862222 C28.3787499,22.3937343 28.3500334,23.7039733 28.3773824,25.0128488 C22.9609015,25.0510243 17.5430532,25.0142122 12.1252048,25.0305732 C12.1142652,33.0119871 12.1115303,40.9934011 12.1265723,48.9748151 C24.0439242,48.9884492 35.9612762,48.9884492 47.8786281,48.9748151 C47.9005074,48.3012895 47.8772607,47.6250372 47.8909352,46.9515116 C51.9249212,46.9624189 55.9602747,46.9624189 59.9956282,46.9515116 C59.9983631,58.3005533 60.0052004,69.6495949 59.9928933,81 C47.911447,80.9754586 35.8300007,80.9972732 23.7485544,80.9890927 C15.8378394,80.9972732 7.92575697,80.9754586 0.0150419818,81 C-0.00410235868,61.0123798 0.0246141521,41.0247596 0,21.0412296 Z M3.43504167,25.0851096 C2.5311553,25.3209799 1.85836848,26.2371928 1.95272273,27.17113 C2.032035,28.1677842 2.94686098,29.007646 3.95193886,28.9912851 C5.31939175,28.9926485 6.6882121,29.0062826 8.05703244,28.984468 C9.09629664,28.9476559 9.98514102,27.9891772 9.93454527,26.9543475 C9.93181036,25.9576933 9.06758013,25.0578414 8.06660461,25.0292097 C6.77299418,25.0196659 5.48211865,25.0305732 4.18850821,25.0237561 C3.93689688,25.0278463 3.67844828,25.0114854 3.43504167,25.0851096 Z M3.2162492,33.1524186 C2.40124728,33.4687301 1.8433265,34.354948 1.95956,35.2275317 C2.05938406,36.1655591 2.90036759,36.9522479 3.84937989,36.9836063 C5.09923184,36.9999673 6.35045123,36.9822429 7.60167063,36.9917868 C8.04062301,36.9999673 8.50145463,36.9672454 8.88981126,36.7463726 C9.6200311,36.3564368 10.0630858,35.4893068 9.90856366,34.6712595 C9.77318583,33.7823149 8.95955135,33.0515261 8.05703244,33.0256212 C6.72923569,33.0188042 5.40417383,33.0283481 4.07774453,33.021531 C3.78647706,33.0174408 3.48837233,33.0378919 3.2162492,33.1524186 Z M3.43504167,41.0752058 C2.67337041,41.274264 2.06348642,41.9586968 1.96366235,42.7399319 C1.83648924,43.5838839 2.34791662,44.457831 3.12189495,44.8041377 C3.52529356,44.9963788 3.98065537,44.993652 4.41687284,44.9854715 C5.63390592,44.977291 6.85093899,44.9963788 8.06797207,44.977291 C9.100399,44.9295716 9.98787593,43.9792734 9.93591272,42.9430803 C9.92907546,41.9491529 9.06621268,41.0520278 8.06523716,41.0206693 C6.77299418,41.009762 5.48211865,41.0233962 4.18850821,41.0152157 C3.93689688,41.0138523 3.67981573,41.0070352 3.43504167,41.0752058 Z M3.42410204,49.0784344 C2.40671709,49.3265754 1.71888829,50.470478 2.01152321,51.4807663 C2.22211095,52.3492598 3.06856429,52.9927903 3.96287848,52.9777927 C5.32622902,52.9750659 6.68957955,52.9887 8.05293009,52.9723391 C9.07168249,52.9382538 9.95779197,52.0138604 9.93454527,50.9967551 C9.96052687,49.9796497 9.0771523,49.0388954 8.05429754,49.0157174 C6.80307814,49.0048101 5.55185875,49.0184442 4.30063935,49.0129906 C4.00937188,49.0089004 3.7098997,48.9952662 3.42410204,49.0784344 Z M51.5324623,49.0784344 C50.4152533,49.3497534 49.7424664,50.6845337 50.2087679,51.7384512 C50.5041377,52.4733303 51.2740137,52.9846098 52.0698713,52.9764293 C53.3949331,52.9791562 54.7213624,52.9791562 56.0464243,52.9764293 C57.1020979,53.0009707 58.0784593,52.0602165 58.041538,50.9981185 C58.086664,49.9755595 57.1827776,49.037532 56.1612903,49.014354 C54.9100709,49.0061735 53.6588515,49.0170808 52.4076321,49.0116272 C52.1149972,49.0116272 51.8168925,48.9952662 51.5324623,49.0784344 Z M12.1293072,53.0159683 C12.1142652,60.9973822 12.1170001,68.9774328 12.1279397,76.9588468 C24.0452917,76.9615736 35.9640111,76.9615736 47.881363,76.9588468 C47.8923027,68.9774328 47.8950376,60.9973822 47.8799956,53.0159683 C35.9626436,53.0009707 24.0452917,53.0009707 12.1293072,53.0159683 Z M3.43504167,57.0666654 C2.63781663,57.273904 2.01289066,58.0087831 1.95272273,58.8295571 C1.84059159,59.8998356 2.75815248,60.9333019 3.83570536,60.9673872 C5.20726062,60.9810213 6.57881587,60.970114 7.94900367,60.9728408 C8.98416551,60.9837481 9.92634055,60.0838962 9.93454527,59.0449762 C9.98924338,58.0115099 9.10450136,57.042124 8.06523716,57.0080387 C6.81128286,56.9971314 5.55732856,57.0107655 4.3020068,57.002585 C4.01347424,57.002585 3.71810442,56.9889509 3.43504167,57.0666654 Z M51.5434019,57.0693922 C50.5916547,57.3038991 49.9202353,58.312824 50.0870646,59.2767563 C50.2101353,60.2243276 51.1030821,60.986475 52.0589316,60.9728408 C53.3921982,60.9728408 54.7240973,60.9728408 56.0559964,60.9728408 C57.0870559,60.986475 58.0497428,60.086623 58.0401706,59.0449762 C58.1112781,58.0087831 57.2114941,57.0339435 56.1735974,57.0080387 C54.9196431,56.9971314 53.6643213,57.0107655 52.410367,57.002585 C52.120467,57.002585 51.8237297,56.9889509 51.5434019,57.0693922 Z M3.4254695,65.0658037 C2.46961992,65.3084911 1.79136329,66.3283232 1.97460198,67.300436 C2.11408217,68.200288 2.931819,68.9378939 3.84937989,68.9624353 C5.21273043,68.9733426 6.57608096,68.9624353 7.9394315,68.9678889 C8.99920749,68.9897035 9.96189432,68.0434956 9.93591272,66.9841244 C9.96326178,65.9642922 9.07578485,65.0317184 8.05429754,65.0030868 C6.84273428,64.9921795 5.62843611,65.0058136 4.41687284,65.0003599 C4.08458179,64.9989965 3.74818838,64.9785453 3.4254695,65.0658037 Z M51.5324623,65.0685305 C50.6053292,65.3003106 49.9475844,66.2642429 50.0761249,67.2090874 C50.1691117,68.1443881 51.0114627,68.9324402 51.9550052,68.9610719 C53.3197232,68.9719792 54.6844412,68.9610719 56.0477917,68.9665255 C57.1034654,68.9828865 58.0907663,68.0503126 58.041538,66.982761 C58.086664,65.960202 57.1827776,65.0249014 56.1612903,65.0017234 C54.9100709,64.9908161 53.660219,65.0044502 52.4089996,64.9989965 C52.1149972,64.9962697 51.8168925,64.9867258 51.5324623,65.0685305 Z M3.43504167,73.0567616 C2.63781663,73.2612734 2.01289066,73.9961525 1.95272273,74.8169265 C1.84195905,75.8872049 2.75541758,76.9288517 3.83570536,76.9547565 C5.20726062,76.9683907 6.57881587,76.9574834 7.94900367,76.9602102 C8.98416551,76.9765711 9.92634055,76.0685387 9.93454527,75.0323456 C9.98924338,73.9988793 9.100399,73.034947 8.06523716,72.995408 C6.81128286,72.9845007 5.55732856,72.9981349 4.3020068,72.9899544 C4.01347424,72.9913178 3.71810442,72.9804105 3.43504167,73.0567616 Z M51.5434019,73.0567616 C50.655925,73.2776343 49.9995476,74.1747594 50.0665528,75.0855187 C50.1021065,76.0603583 50.9594995,76.9233981 51.9413307,76.9547565 C53.3115185,76.9683907 54.6830737,76.9574834 56.054629,76.9602102 C57.0884234,76.9765711 58.0483753,76.0767192 58.0401706,75.0350724 C58.1112781,73.9961525 57.2073918,73.0294933 56.1722299,72.995408 C54.9182756,72.9845007 53.6629539,72.9981349 52.4089996,72.9899544 C52.120467,72.9913178 51.8237297,72.9804105 51.5434019,73.0567616 Z M96.8301076,31.0446879 C103.642669,30.6853671 110.560295,32.5010261 116.261391,36.1990363 C120.035395,38.6190077 123.282698,41.828396 125.743404,45.5413779 C128.479212,49.6640399 130.223825,54.4195967 130.786469,59.3139819 C131.411323,64.6738509 130.663434,70.1943254 128.560774,75.181263 C126.795425,79.4345872 124.062382,83.2891197 120.650572,86.4236495 C117.330001,89.4642659 113.361076,91.8257115 109.067282,93.2684391 C104.064307,94.9643245 98.6369294,95.424364 93.4113851,94.6050037 C88.6434214,93.8768346 84.0524075,92.0666198 80.0820997,89.3703525 C74.8814388,85.8560859 70.7590649,80.818789 68.3895985,75.0628504 C66.5509811,70.6366712 65.7602373,65.7926453 66.0629871,61.024839 C66.3408534,56.4040276 67.6596812,51.8485472 69.9019651,47.7816888 C71.9742114,44.0101811 74.8261421,40.655159 78.2310404,37.9833909 C83.4897629,33.8267022 90.096344,31.3631768 96.8301076,31.0446879 Z M112.430708,43.0560755 C103.887357,44.0346803 95.344007,44.988786 86.8034216,45.9755572 C86.7895974,54.128329 86.8089512,62.283823 86.795127,70.4379558 C84.469898,69.5900131 81.7797104,69.6458168 79.555398,70.7564448 C78.2255108,71.4206439 77.0615138,72.5190223 76.5583133,73.9250012 C76.0551127,75.2806206 76.2693877,76.8594546 77.0863974,78.0531075 C77.8384334,79.2072895 79.0328435,80.0307331 80.3212582,80.5179939 C81.8018291,81.0869186 83.4358485,81.1930815 85.000747,80.9698671 C86.8891315,80.6745163 88.7429556,79.7476319 89.8627151,78.1864917 C90.5331884,77.2500799 90.8276437,76.0836483 90.7571403,74.9485211 C90.7433161,67.8954888 90.7654348,60.8438175 90.7474634,53.7907852 C92.7229403,53.509045 94.7122415,53.3334678 96.6932481,53.0911984 C101.636779,52.5304402 106.577545,51.9669598 111.519693,51.4089237 C111.519693,56.7470157 111.519693,62.0823855 111.519693,67.4204775 C109.842819,66.8569971 108.013879,66.6650872 106.273413,67.0584346 C104.509446,67.4381714 102.789717,68.3773053 101.794375,69.8976135 C101.063075,70.9796592 100.822534,72.3665832 101.15708,73.6269282 C101.477801,74.8233032 102.276839,75.8699612 103.295682,76.5858808 C104.828785,77.6869813 106.769701,78.1619926 108.651174,78.0748845 C110.687477,77.9918596 112.762488,77.2323861 114.149055,75.7216053 C115.105689,74.6953632 115.588153,73.2757738 115.477559,71.8915719 C115.470647,65.1366126 115.476177,58.3816532 115.473412,51.6266939 C115.531474,48.6650191 115.470647,45.7033444 115.470647,42.7430308 C114.453187,42.7961123 113.441256,42.9553567 112.430708,43.0560755 Z"/>
+</svg>

data/app/assets/images/pageflow/themes/default/embed_opt_out_info.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="-50 -50 430 430" style="enable-background:new 0 0 330 330;" xml:space="preserve" fill="#fff">
+     <filter id="shadow" x="-50%" y="-50%" width="200%" height="200%">
+  <feDropShadow dx="0" dy="0" stdDeviation="35" flood-color="#000000" flood-opacity="1" />
+</filter>
+  <g filter="url(#shadow)">
+	<path d="M165,0C74.019,0,0,74.02,0,165.001C0,255.982,74.019,330,165,330s165-74.018,165-164.999C330,74.02,255.981,0,165,0z
+		 M165,300c-74.44,0-135-60.56-135-134.999C30,90.562,90.56,30,165,30s135,60.562,135,135.001C300,239.44,239.439,300,165,300z"/>
+    <path d="M164.998,70c-11.026,0-19.996,8.976-19.996,20.009c0,11.023,8.97,19.991,19.996,19.991
+		c11.026,0,19.996-8.968,19.996-19.991C184.994,78.976,176.024,70,164.998,70z"/>
+    <path d="M165,140c-8.284,0-15,6.716-15,15v90c0,8.284,6.716,15,15,15c8.284,0,15-6.716,15-15v-90C180,146.716,173.284,140,165,140z"/>
+  </g>
+</svg>

data/app/assets/javascripts/pageflow/admin/entries.js

@@ -86,68 +86,20 @@ jQuery(function($) {
     }
   });
 
-  $('.admin_entries form.entry').each(function() {
+  $('.admin_entries form.pageflow_entry').each(function() {
     var accountSelect = $('#entry_account_id', this);
-    var entryTypeInput = $('#entry_type_name_input', this);
-    var entryTypeSelect = $('#entry_type_name', this);
-    var entryTypeOptions = $('#entry_type_name option', this);
 
-    function updateEntryTypeOptions() {
+    function updateEntryTypeInput() {
       var selectedAccountId = accountSelect.val();
-      hideAllOptions();
 
-      $.get('/admin/entries/entry_types?account_id=' + selectedAccountId)
-        .done(function(response) {
-          var typeNames = response.map(function(item) {
-            return item.type_name;
-          });
-          updateForm(typeNames);
-          if (currentSelectedUnavailable(typeNames)) {
-            updateSelected(typeNames[0]);
-          }
-          if (response.length < 2) {
-            hideInput();
-          } else {
-            showInput();
-          }
-        });
-    }
-
-    function updateForm(entryTypes) {
-      entryTypes.forEach(showOption);
-    }
-
-    function currentSelectedUnavailable(entryTypes) {
-      var selectedEntryType = entryTypeSelect.children('option:selected').val();
-
-      return !entryTypes.includes(selectedEntryType);
-    }
-
-    function updateSelected(firstAvailable) {
-      entryTypeSelect.val(firstAvailable);
-    }
-
-    function hideInput() {
-      entryTypeInput.hide();
-    }
-
-    function showInput() {
-      entryTypeInput.show();
+      $.get('/admin/entries/entry_type_name_input' +
+            '?account_id=' + selectedAccountId +
+            '&entry_type_name=' + $('[name="entry[type_name]"]').val())
+       .done(function(response) {
+         $('#entry_type_name_input').replaceWith(response);
+       });
     }
 
-    function hideAllOptions() {
-      entryTypeOptions.each(function() {
-        $(this).hide();
-      });
-    }
-
-    function showOption(entryType) {
-      $('#entry_type_name option[value=' + entryType + ']').show();
-    }
-
-    if (entryTypeOptions.length > 1) {
-      accountSelect.on('change', updateEntryTypeOptions);
-      updateEntryTypeOptions();
-    }
+    accountSelect.on('change', updateEntryTypeInput);
   });
 });

data/app/assets/javascripts/pageflow/dist/ui.js

@@ -352,6 +352,24 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
 
   BaseObject.extend = Backbone.Model.extend;
 
+  var serverSideValidation = {
+    initialize: function initialize() {
+      var _this = this;
+
+      this.validationErrors = {};
+      this.listenTo(this, 'error', function (model, request) {
+        if (request.status === 422) {
+          _this.validationErrors = JSON.parse(request.responseText).errors;
+
+          _this.trigger('invalid');
+        }
+      });
+      this.listenTo(this, 'sync', function () {
+        _this.validationErrors = {};
+      });
+    }
+  };
+
   var CollectionView = Marionette.View.extend({
     initialize: function initialize() {
       this.rendered = false;
@@ -752,10 +770,12 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       this.configure();
     },
     configure: function configure() {},
-    tab: function tab(name, callback) {
+    tab: function tab(name, callbackOrOptions, callback) {
+      callback = callback || callbackOrOptions;
+      var options = callback ? callbackOrOptions : {};
       this.tabsView.tab(name, _.bind(function () {
         var tabView = new ConfigurationEditorTabView({
-          model: this.model,
+          model: options.model || this.model,
           placeholderModel: this.options.placeholderModel,
           tab: name,
           attributeTranslationKeyPrefixes: this.options.attributeTranslationKeyPrefixes
@@ -896,7 +916,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
   var TableHeaderCellView = TableCellView.extend({
     tagName: 'th',
     render: function render() {
-      this.$el.text(this.attributeTranslation('column_header'));
+      this.$el.text(this.options.column.headerText || this.attributeTranslation('column_header'));
       this.$el.data('columnName', this.options.column.name);
       return this;
     }
@@ -1273,6 +1293,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       return this.getAttributeBoundOption('disabled');
     },
     updateDisabled: function updateDisabled() {
+      this.$el.toggleClass('input-disabled', !!this.isDisabled());
       this.updateInlineHelp();
 
       if (this.ui.input) {
@@ -1500,6 +1521,31 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     }
   };
 
+  var viewWithValidationErrorMessages = {
+    onRender: function onRender() {
+      this.listenTo(this.model, 'invalid sync', this.updateValidationErrorMessages);
+      this.updateValidationErrorMessages();
+    },
+    updateValidationErrorMessages: function updateValidationErrorMessages() {
+      var _this = this;
+
+      var errors = this.model.validationErrors && this.model.validationErrors[this.options.propertyName] || [];
+
+      if (errors.length) {
+        this.validationErrorList = this.validationErrorList || $('<ul class="validation_error_messages" />').appendTo(this.el);
+        this.validationErrorList.html('');
+        errors.forEach(function (error) {
+          return _this.validationErrorList.append("<li>".concat(error, "</li>"));
+        });
+        this.$el.addClass('invalid');
+      } else if (this.validationErrorList) {
+        this.validationErrorList.remove();
+        this.validationErrorList = null;
+        this.$el.removeClass('invalid');
+      }
+    }
+  };
+
   function template$6(data) {
   var __p = '';
   __p += '<label>\n  <span class="name"></span>\n  <span class="inline_help"></span>\n</label>\n<input type="text" dir="auto" />\n';
@@ -1527,7 +1573,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
    */
 
   var TextInputView = Marionette.ItemView.extend({
-    mixins: [inputView, inputWithPlaceholderText],
+    mixins: [inputView, inputWithPlaceholderText, viewWithValidationErrorMessages],
     template: template$6,
     ui: {
       input: 'input'
@@ -2027,9 +2073,9 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.link_type.url') )) == null ? '' : __t) +
   '\n      </label>\n      <label>\n        <input type="radio" name="link_type" class="fragment_link_radio_button">\n        ' +
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.link_type.page_link') )) == null ? '' : __t) +
-  '\n      </label>\n    </div>\n    <div class="url_link_panel">\n      <label>\n        ' +
+  '\n      </label>\n    </div>\n    <div class="url_link_panel">\n      <label>\n        <span>\n          ' +
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.target') )) == null ? '' : __t) +
-  '\n      </label>\n      <input type="text" class="display_url">\n      <div class="open_in_new_tab_section">\n        <label>\n          <input type="checkbox" class="open_in_new_tab">\n          ' +
+  '\n        </span>\n      </label>\n      <input type="text" class="display_url">\n      <div class="open_in_new_tab_section">\n        <label>\n          <input type="checkbox" class="open_in_new_tab">\n          ' +
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.open_in_new_tab') )) == null ? '' : __t) +
   '\n        </label>\n        <span class="inline_help">\n          ' +
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.open_in_new_tab_help') )) == null ? '' : __t) +
@@ -2363,6 +2409,15 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     supportedHosts: function supportedHosts() {
       return this.options.supportedHosts;
     },
+    // Host names used to be expected to include protocols. Remove
+    // protocols for backwards compatilbity. Since supportedHosts
+    // is supposed to be overridden in subclasses, we do it in a
+    // separate method.
+    supportedHostsWithoutLegacyProtocols: function supportedHostsWithoutLegacyProtocols() {
+      return _.map(this.supportedHosts(), function (host) {
+        return host.replace(/^https?:\/\//, '');
+      });
+    },
     validate: function validate(success) {
       var view = this;
       var options = this.options;
@@ -2399,23 +2454,26 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       }
 
       function hasSupportedHost(url) {
-        return _.any(view.supportedHosts(), function (host) {
-          return url.match(new RegExp('^' + host));
+        return _.any(view.supportedHostsWithoutLegacyProtocols(), function (host) {
+          return url.match(new RegExp('^https?://' + host));
         });
       }
 
       function displayValidationError(message) {
         view.$el.addClass('invalid');
+        view.ui.input.attr('aria-invalid', 'true');
         view.ui.validation.removeClass('pending').addClass('failed').html(message).show();
       }
 
       function displayValidationPending(message) {
         view.$el.removeClass('invalid');
+        view.ui.input.removeAttr('aria-invalid');
         view.ui.validation.removeClass('failed').addClass('pending').html(message).show();
       }
 
       function resetValidationError(message) {
         view.$el.removeClass('invalid');
+        view.ui.input.attr('aria-invalid', 'false');
         view.ui.validation.hide();
       }
     }
@@ -2650,6 +2708,15 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
    *   Ignore the attribute value if the input is disabled and display
    *   an unchecked check box.
    *
+   * @param {boolean} [options.displayCheckedIfDisabled=false]
+   *   Ignore the attribute value if the input is disabled and display
+   *   an checked check box.
+   *
+   * @param {string} [options.storeInverted]
+   *   Display checked by default and store true in given attribute when
+   *   unchecked. The property name passed to `input` is only used for
+   *   translations.
+   *
    * @class
    */
 
@@ -2675,7 +2742,13 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     },
     save: function save() {
       if (!this.isDisabled()) {
-        this.model.set(this.options.propertyName, this.ui.input.is(':checked'));
+        var value = this.ui.input.is(':checked');
+
+        if (this.options.storeInverted) {
+          this.model.set(this.options.storeInverted, !value);
+        } else {
+          this.model.set(this.options.propertyName, value);
+        }
       }
     },
     load: function load() {
@@ -2686,12 +2759,49 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     displayValue: function displayValue() {
       if (this.isDisabled() && this.options.displayUncheckedIfDisabled) {
         return false;
+      } else if (this.isDisabled() && this.options.displayCheckedIfDisabled) {
+        return true;
+      } else if (this.options.storeInverted) {
+        return !this.model.get(this.options.storeInverted);
       } else {
         return this.model.get(this.options.propertyName);
       }
     }
   });
 
+  /**
+   * Render a separator in a {@link ConfigurationEditorView} tab.
+   *
+   * @example
+   *
+   * this.view(SeparatorView);
+   *
+   * @class
+   */
+
+  var SeparatorView = Marionette.View.extend({
+    className: 'separator'
+  });
+
+  /**
+   * Render an input that is only a label. Can be used to render
+   * additional inline help.
+   *
+   * See {@link inputView} for further options
+   *
+   * @class
+   */
+
+  var LabelOnlyView = Marionette.ItemView.extend({
+    mixins: [inputView],
+    template: function template() {
+      return "\n    <label>\n      <span class=\"name\"></span>\n      <span class=\"inline_help\"></span>\n    </label>\n  ";
+    },
+    ui: {
+      label: 'label'
+    }
+  });
+
   /**
    * A table cell mapping column attribute values to a list of
    * translations.
@@ -2911,7 +3021,10 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       }
     }
   };
-  Cocktail.mixin(Marionette.View, subviewContainer);
+
+  if (!Marionette.View.prototype.appendSubview) {
+    Cocktail.mixin(Marionette.View, subviewContainer);
+  }
 
   var tooltipContainer = {
     events: {
@@ -2968,10 +3081,12 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
   exports.ExtendedSelectInputView = ExtendedSelectInputView;
   exports.IconTableCellView = IconTableCellView;
   exports.JsonInputView = JsonInputView;
+  exports.LabelOnlyView = LabelOnlyView;
   exports.Object = BaseObject;
   exports.PresenceTableCellView = PresenceTableCellView;
   exports.ProxyUrlInputView = ProxyUrlInputView;
   exports.SelectInputView = SelectInputView;
+  exports.SeparatorView = SeparatorView;
   exports.SliderInputView = SliderInputView;
   exports.SortableCollectionView = SortableCollectionView;
   exports.TableCellView = TableCellView;
@@ -2989,8 +3104,10 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
   exports.i18nUtils = i18nUtils;
   exports.inputView = inputView;
   exports.inputWithPlaceholderText = inputWithPlaceholderText;
+  exports.serverSideValidation = serverSideValidation;
   exports.subviewContainer = subviewContainer;
   exports.tooltipContainer = tooltipContainer;
+  exports.viewWithValidationErrorMessages = viewWithValidationErrorMessages;
 
   return exports;
 

data/app/assets/stylesheets/pageflow/admin/active_admin_patches.scss

@@ -1,21 +1,23 @@
-#wrapper {
-  overflow: hidden;
-  position: relative;
-}
-
-.action_items {
-  form,
-  div {
-    display: inline;
+@if not $pageflow-custom-admin-theme {
+  #wrapper {
+    overflow: hidden;
+    position: relative;
   }
 
-  input[type="submit"] {
-    @include light-button;
-    padding: 12px 17px 10px;
-    margin: 0;
+  .action_items {
+    form,
+    div {
+      display: inline;
+    }
+
+    input[type="submit"] {
+      @include light-button;
+      padding: 12px 17px 10px;
+      margin: 0;
+    }
   }
-}
 
-.blank_slate_container {
-  margin: 10px 0;
+  .blank_slate_container {
+    margin: 10px 0;
+  }
 }

data/app/assets/stylesheets/pageflow/admin/badge_list.scss

@@ -1,47 +1,37 @@
+$pageflow-badge-color: #555 !default;
+$pageflow-badge-background-color: #fff !default;
+$pageflow-badge-border-color: #aaa !default;
+$pageflow-badge-border-radius: null !default;
+$pageflow-badge-margin: -4px 0 !default;
+
 .badge_list {
-  margin: -4px 0;
+  margin: $pageflow-badge-margin;
   padding: 0;
 
   li {
-    float: left;
     position: relative;
     list-style: none;
-
-    margin: 1px;
-    line-height: 22px;
-    padding: 0 5px;
-
-    background-color: #fff;
-    border: solid 1px #aaa;
-    text-align: center;
-
-    &:hover .tooltip {
-      opacity: 1;
-    }
-  }
-
-  .abbreviation, .name {
-    font-size: 11px;
-    font-weight: bold;
-    color: #555;
+    float: left;
   }
 
-  .tooltip {
-    position: absolute;
-    top: -1px;
-    left: -1px;
-    padding: 0 5px;
-
-    white-space: nowrap;
-    z-index: 1;
-
-    background-color: #fff;
-    border: solid 1px #aaa;
-    opacity: 0;
+  .abbreviation {
+    padding: 0 8px;
+    display: inline-block;
+    text-decoration: none;
+    margin: 2px;
+    background-color: $pageflow-badge-background-color;
+    border: solid 1px $pageflow-badge-border-color;
+    color: $pageflow-badge-color;
+    border-radius: $pageflow-badge-border-radius;
+    text-align: center;
+    font-size: 0.7rem;
   }
+}
 
-  a {
-    text-decoration: none;
-    font-weight: bold;
+.entry_user_badge_list {
+  .abbreviation {
+    width: 2em;
+    line-height: 2em;
+    padding: 0;
   }
 }

data/app/assets/stylesheets/pageflow/admin/columns.scss

@@ -1,15 +1,17 @@
-.columns {
-  width: 100%;
+@if not $pageflow-custom-admin-theme {
+  .columns {
+    width: 100%;
 
-  > div {
-    width: 49%;
-  }
+    > div {
+      width: 49%;
+    }
 
-  > div:first-child {
-    float: left;
-  }
+    > div:first-child {
+      float: left;
+    }
 
-  > div:last-child {
-    float: right;
+    > div:last-child {
+      float: right;
+    }
   }
-}
+}

data/app/assets/stylesheets/pageflow/admin/embed_code.scss

@@ -1,13 +1,10 @@
 .embed_code {
-  $hint-color: #9c9c9c;
-
   input {
     width: 100%;
   }
 
   p {
     margin: 5px 0 0 0;
-    color: $hint-color;
-    font-style: italic;
+    color: $pageflow-hint-color;
   }
 }