Removes redundant titles in detail page

Vizzuality · Apr 13, 2012 · 5677c7c · 5677c7c
1 parent 2a785d8
commit 5677c7c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 63 deletions.
diff --git a/css/style.css b/css/style.css
@@ -338,7 +338,7 @@ a:hover {text-decoration:underline; color:#C93B00;}
           margin: 0;
         }
 
-        #openbudget .two_columns .right div p {
+        #openbudget .two_columns .right div p, #openbudget .two_columns .right div span {
           margin: 0 0 15px 0;
           font-size: 13px;
 					line-height: 18px;

diff --git a/index.html b/index.html
@@ -188,21 +188,12 @@ <h4>Related experiences</h4>
           <p>{{country}}</p>
         </div>
 
-        {{#classification}}
-      	<div>
-          <h4>Classification</h4>
-
-          <ul>
-            {{#topic}}
-            <li>
-              <h6>Topic</h6>
-              <span>{{topic}}</span>
-            </li>
-            {{/topic}}
-          </ul>
-
+        {{#topic}}
+        <div>
+          <h4>Topic</h4>
+          <span>{{topic}}</span>
       	</div>
-        {{/classification}}
+        {{/topic}}
 
         {{#implementing_partners_html}}
       	<div>
@@ -218,56 +209,40 @@ <h4>Relevant Networks</h4>
       	</div>
         {{/relevant_networks_html}}
 
-        {{#contact}}
+        {{#contact_information_html}}
       	<div>
-          <h4>Contact</h4>
-          <ul>
-            {{#contact_information_html}}
-            <li>
-              <h6>Contact Information</h6>
-              <p>{{{contact_information_html}}}</p>
-            </li>
-            {{/contact_information_html}}
-            {{#website_html}}
-            <li>
-              <h6>Web Site</h6>
-              <p>{{{website_html}}}</p>
-            </li>
-            {{/website_html}}
-          </ul>
+          <h4>Contact Information</h4>
+          <p>{{{contact_information_html}}}</p>
       	</div>
-        {{/contact}}
+        {{/contact_information_html}}
+        {{#website_html}}
+        <div>
+          <h4>Web Site</h4>
+          <p>{{{website_html}}}</p>
+        </div>
+        {{/website_html}}
 
 
-        {{#resources}}
-      	<div>
-          <h4>Related resources</h4>
-          <ul>
+        {{#resources_media_html}}
+        <div>
+          <h4>Media</h4>
+          <p>{{{resources_media_html}}}</p>
+        </div>
+        {{/resources_media_html}}
 
-            {{#resources_media_html}}
-          	<li>
-          		<h6>Media</h6>
-              <p>{{{resources_media_html}}}</p>
-          	</li>
-            {{/resources_media_html}}
-
-            {{#resources_document_html}}
-          	<li>
-          		<h6>Documents</h6>
-              <p>{{{resources_document_html}}}</p>
-          	</li>
-            {{/resources_document_html}}
-
-            {{#resources_links_html}}
-          	<li>
-          		<h6>Links & Further reading</h6>
-              <p>{{{resources_links_html}}}</p>
-          	</li>
-            {{/resources_links_html}}
+        {{#resources_document_html}}
+        <div>
+          <h4>Documents</h4>
+          <p>{{{resources_document_html}}}</p>
+        </div>
+        {{/resources_document_html}}
 
-          </ul>
-      	</div>
-        {{/resources}}
+        {{#resources_links_html}}
+        <div>
+          <h4>Links & Further reading</h4>
+          <p>{{{resources_links_html}}}</p>
+        </div>
+        {{/resources_links_html}}
 
       	<div class="last">
           <ul>

diff --git a/js/backbone/models/case_study.js b/js/backbone/models/case_study.js
@@ -17,14 +17,10 @@ var CaseStudy = Backbone.Model.extend({
 
     var json_object = _.extend(this.attributes, {
       short_overview: this._truncate(this.get('overview'), 165),
-      classification: country_name || topic_name,
-      resources: this.get('resources_media') || this.get('resources_document') || this.get('resources_links'),
       country: country_name,
       topic: topic_name,
-      category: Categories.getByCartoDBId(this.get('category_id')).get('name'),
       country_iso: Countries.getByCartoDBId(this.get('country_id')).get('iso'),
       subtitle_country: country_name && this.get('subtitle'),
-      contact: this.get('contact_information') || this.get('website'),
       video_player_url: this.youtube_player_url()
     });