fixed issue in index view calling wrong model field. removed starting…

… slash from index url pattern to allow it to work.

Wrapped container-right div in block tags to allow front page to override its content

open_fmri/apps/dataset/views.py

@@ -199,6 +199,6 @@ def get_context_data(self, **kwargs):
         context['num_datasets'] = len(Dataset.objects.all())
         total = 0
         for x in Dataset.objects.all():
-            total += x.subjects
+            total += x.sample_size
         context['num_subjects'] =  total
         return context

open_fmri/templates/base.html

@@ -80,6 +80,7 @@
         {% endblock content %}
         </div>
 
+        {% block container-right %}
         <div id="container-right" class="col-md-4">
             <div id="toc" class="right-elem">
                 <h3 class="block-title">Find Out More:</h3>
@@ -101,6 +102,7 @@ <h4><a href="{% url 'dataset_detail' featured_dataset.dataset.id %}">{{ featured
             </div>
             {% endif %}
         </div>
+        {% endblock container-right %}
 
     </div> <!-- /container -->
     <div>

open_fmri/templates/index.html

@@ -3,3 +3,5 @@
 
 {% block content %}
 {% endblock %}
+{% block container-right %}
+{% endblock %}

open_fmri/urls.py

@@ -16,6 +16,6 @@
     url(r'^dataset/', include(dataset.urls)),
     url(r'^contact/', include('contact.urls')),
     url(r'^$', DatasetList.as_view()),
-    url(r'^/front/$', Index.as_view(), name='index'),
+    url(r'^front/$', Index.as_view(), name='index'),
     url(r'^(?P<url>.*/)$', views.flatpage),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)