Permalink
Browse files

Merge remote-tracking branch 'origin/dev' into dev

  • Loading branch information...
zioproto committed Aug 5, 2012
2 parents 08b9cca + d13402a commit 319f51ef51ab23bcc9f5ea8c7f024090e4ea5d64
Showing with 4 additions and 14 deletions.
  1. +2 −2 media/js/compressed/jquery.formset.min.js
  2. +1 −2 media/js/jquery.formset.js
  3. +1 −10 nodeshot/templates/index.html

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -150,8 +150,7 @@
var formCount = parseInt($('#id_' + options.prefix + '-TOTAL_FORMS').val()),
row = options.formTemplate.clone(true).removeClass('formset-custom-template'),
buttonRow = $(this).parents('tr.' + options.formCssClass + '-add').get(0) || this;
- applyExtraClasses(row, formCount);
- console.log(row, options.prefix, formCount);
+ applyExtraClasses(row, formCount);
row.insertBefore($(buttonRow)).show();
row.find('input,select,textarea,label').each(function() {
updateElementIndex($(this), options.prefix, formCount);
@@ -1,11 +1,2 @@
{% extends "base.html" %}
-{% block extrajs %}
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-26436344-1']);
-_gaq.push(['_trackPageview']);
-(function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-{% endblock %}
+{% block extrajs %}{% endblock %}

0 comments on commit 319f51e

Please sign in to comment.