Merge branch 'master' into dev

ninuxorg · Jul 31, 2012 · d13402a · d13402a
2 parents 1730e80 + 8640d24
commit d13402a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/media/js/compressed/jquery.formset.min.js b/media/js/compressed/jquery.formset.min.js
diff --git a/media/js/jquery.formset.js b/media/js/jquery.formset.js
@@ -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);

diff --git a/nodeshot/templates/index.html b/nodeshot/templates/index.html
@@ -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 %}