@@ -79,7 +79,6 @@ def entity_detail(request, entity_id): for model in entityref_cache.iterkeys(): if hasattr(model.objects, 'with_entity'): transactions[model.__name__] = model.objects.with_entity(entity).order_by('-amount')[:20] - print transactions data = { 'entity': entity, 'transactions': transactions dc_matchbox/matchbox/views.py @@ -71,18 +71,42 @@ div.transaction_preview { width: 700px; } -#content ul#aliases { font-size: 90%; list-style: none; margin: 0; padding: 0; } -#content ul#aliases li { float: left; padding: 0 0.5em 0 0; } +#content h2 { display: inline-block; } +#content p.entity_type { + color: #666; + display: inline-block; + font-size: 80%; + font-weight: bold; + padding-left: 10px; + text-transform: uppercase; +} + +#content div.attributes { margin: 1em 0 0 0; } +#content div.attributes h4 { display: inline; } +#content div.attributes ul { display: inline; list-style: none; margin: 0; padding: 0; } +#content div.attributes ul li { display: inline; margin: 0 2px; padding: 0; } +#content div.attributes ul li a { + background-color: #FBF9F9; + border-bottom: 1px solid #CBCCCB; + color: #999; + padding: 2px 2px; + text-align: center; + text-decoration: none; +} +#content div.attributes ul li a:hover { border-bottom: 1px solid #000; color: #000; } + +#content h4.aliases_header { display: inline; } +#content ul#aliases { display: inline; font-size: 90%; list-style: none; margin: 0; padding: 0; } +#content ul#aliases li { display: inline; padding: 0 0.5em 0 0; } #content ul#aliases li a { background-color: #FBF9F9; - border: 1px solid #CBCCCB; + border-bottom: 1px solid #CBCCCB; color: #999; - display: block; - padding: 2px 10px; + padding: 2px 2px; text-align: center; text-decoration: none; } -#content ul#aliases li a:hover { border: 1px solid #999; color: #333; } +#content ul#aliases li a:hover { border-bottom: 1px solid #000; color: #000; } #content table.contributions { border-collapse: collapse; width: 1200px; } #content table.contributions tr.odd { background-color: #FBF9F9; } dc_matchbox/media/styles/matchbox.css @@ -4,8 +4,11 @@ {% block content %} <h2>{{ entity.name }}</h2> + <p class="entity_type">{{ entity.type }}</p> + <div class="clear"></div> {% if entity.aliases %} + <h4 class="aliases_header">Aliases:</h4> <ul id="aliases"> {% for alias in entity.aliases.all %} <li><a href="http://google.com/search?q={{ alias|urlencode }}">{{ alias }}</a></li> @@ -18,8 +21,9 @@ {% if entity.attributes %} {% regroup entity.attributes.all by namespace as namespace_list %} {% for namespace in namespace_list %} + <div class="attributes"> {% ifequal namespace.grouper "urn:crp:candidate" %} - <h4>CRP Candidate IDs</h4> + <h4>CRP Candidate:</h4> <ul> {% for attr in namespace.list %} <li><a href="http://www.opensecrets.org/politicians/summary.php?cid={{ attr.value }}">{{ attr.value }}</a></li> @@ -27,7 +31,7 @@ </ul> {% else %} {% ifequal namespace.grouper "urn:crp:committee" %} - <h4>CRP PAC</h4> + <h4>CRP PAC:</h4> <ul> {% for attr in namespace.list %} <li><a href="http://www.opensecrets.org/pacs/lookup2.php?strID={{ attr.value }}">{{ attr.value }}</a></li> @@ -35,14 +39,14 @@ </ul> {% else %} {% ifequal namespace.grouper "urn:crp:organization" %} - <h4>CRP Organization</h4> + <h4>CRP Organization:</h4> <ul> {% for attr in namespace.list %} <li><a href="http://www.opensecrets.org/indivs/index.php?employ={{ attr.value }}">{{ attr.value }}</a></li> {% endfor %} </ul> {% else %} - <h4>Other Attributes</h4> + <h4>Other Attributes:</h4> <ul> {% for attr in namespace.list %} <li>{{ attr.value }}</li> @@ -51,6 +55,7 @@ {% endifequal %} {% endifequal %} {% endifequal %} + </div> {% endfor %} {% endif %} dc_matchbox/templates/matchbox/entity_detail.html bb094a7eb1b610f182c221b0acc18dd1bcdaaef5 Jeremy Carbaugh jcarbaugh@gmail.com http://github.com/sunlightlabs/datacommons/commit/2c0ec9d744b882ca3265c1ce16699a3a3041b34c 2c0ec9d744b882ca3265c1ce16699a3a3041b34c 2009-11-06T13:55:00-08:00 2009-11-06T13:55:00-08:00 more layout improvements 582c0d89ab12af2cb75e984de768ea0e4392edb6 Jeremy Carbaugh jcarbaugh@gmail.com