Permalink
Browse files

make the two halfs play nicely

  • Loading branch information...
1 parent cc82fbb commit 37e6ed6020e7da82cc98a70f3c05d534dd349e8a @jamesturk jamesturk committed May 15, 2012
Showing with 27 additions and 24 deletions.
  1. BIN site/_media/images/public/bg.jpg
  2. BIN site/_media/images/public/bg_bill1.png
  3. BIN site/_media/images/public/bg_bill2.png
  4. BIN site/_media/images/public/bg_bill3.png
  5. BIN site/_media/images/public/bg_bill4.png
  6. BIN site/_media/images/public/bg_bill5.png
  7. BIN site/_media/images/public/bg_borderFooter.jpg
  8. BIN site/_media/images/public/bg_colHeader.jpg
  9. BIN site/_media/images/public/bg_filterTitle.png
  10. BIN site/_media/images/public/bg_footer.jpg
  11. BIN site/_media/images/public/bg_header.jpg
  12. BIN site/_media/images/public/bg_mainBorder.png
  13. BIN site/_media/images/public/bg_map.jpg
  14. BIN site/_media/images/public/bg_moduleTitle.jpg
  15. BIN site/_media/images/public/bg_moduleborder.jpg
  16. BIN site/_media/images/public/bg_nav.png
  17. BIN site/_media/images/public/bg_navActive.png
  18. BIN site/_media/images/public/bg_question.png
  19. BIN site/_media/images/public/bg_resources.png
  20. BIN site/_media/images/public/bg_resourcesTitle.png
  21. BIN site/_media/images/public/bg_secNav.png
  22. BIN site/_media/images/public/bg_sunlightLogo.png
  23. BIN site/_media/images/public/bg_viewMore.png
  24. BIN site/_media/images/public/btn_go.png
  25. BIN site/_media/images/public/btn_search.png
  26. BIN site/_media/images/public/btn_submit.png
  27. BIN site/_media/images/public/btn_submitFooter.png
  28. BIN site/_media/images/public/img_test.jpg
  29. BIN site/_media/images/public/logo.png
  30. BIN site/_media/images/social_sprites.png
  31. 0 site/{_media → media/origsite}/css/buggy_7.css
  32. 0 site/{_media → media/origsite}/css/main.css
  33. BIN site/{_media → media/origsite}/images/bg.jpg
  34. BIN site/{_media → media/origsite}/images/bg_bill1.png
  35. BIN site/{_media → media/origsite}/images/bg_bill2.png
  36. BIN site/{_media → media/origsite}/images/bg_bill3.png
  37. BIN site/{_media → media/origsite}/images/bg_bill4.png
  38. BIN site/{_media → media/origsite}/images/bg_bill5.png
  39. BIN site/{_media → media/origsite}/images/bg_body.jpg
  40. BIN site/{_media → media/origsite}/images/bg_borderFooter.jpg
  41. BIN site/{_media → media/origsite}/images/bg_colHeader.jpg
  42. BIN site/{_media → media/origsite}/images/bg_filterTitle.png
  43. BIN site/{_media → media/origsite}/images/bg_footer.jpg
  44. BIN site/{_media → media/origsite}/images/bg_glow.jpg
  45. BIN site/{_media → media/origsite}/images/bg_header.jpg
  46. BIN site/{_media → media/origsite}/images/bg_mainBorder.png
  47. BIN site/{_media → media/origsite}/images/bg_map.jpg
  48. BIN site/{_media → media/origsite}/images/bg_moduleTitle.jpg
  49. BIN site/{_media → media/origsite}/images/bg_moduleborder.jpg
  50. BIN site/{_media → media/origsite}/images/bg_nav.png
  51. BIN site/{_media → media/origsite}/images/bg_navActive.png
  52. BIN site/{_media → media/origsite}/images/bg_question.png
  53. BIN site/{_media → media/origsite}/images/bg_resources.png
  54. BIN site/{_media → media/origsite}/images/breadcrumb_li_style.png
  55. BIN site/{_media → media/origsite}/images/contribute.png
  56. BIN site/{_media → media/origsite}/images/contribute_bullet.png
  57. BIN site/{_media → media/origsite}/images/contribute_bullet_live.png
  58. BIN site/{_media → media/origsite}/images/dropshadow_left.png
  59. BIN site/{_media → media/origsite}/images/dropshadow_top.png
  60. BIN site/{_media → media/origsite}/images/experimental.png
  61. BIN site/{_media → media/origsite}/images/favicon.ico
  62. BIN site/{_media → media/origsite}/images/footer_arrows.jpg
  63. BIN site/{_media → media/origsite}/images/footer_arrows.png
  64. BIN site/{_media → media/origsite}/images/glow.jpg
  65. BIN site/{_media → media/origsite}/images/glow.png
  66. BIN site/{_media → media/origsite}/images/header_arrow.png
  67. BIN site/{_media → media/origsite}/images/header_ribbon.png
  68. BIN site/{_media → media/origsite}/images/header_ribbon_all.png
  69. BIN site/{_media → media/origsite}/images/header_shadow.jpg
  70. BIN site/{_media → media/origsite}/images/header_shadow.png
  71. BIN site/{_media → media/origsite}/images/header_shadow_tiny.jpg
  72. BIN site/{_media → media/origsite}/images/join_button.png
  73. BIN site/{_media → media/origsite}/images/join_right_sun_shadow.png
  74. BIN site/{_media → media/origsite}/images/join_sun.png
  75. BIN site/{_media → media/origsite}/images/live_section.png
  76. BIN site/{_media → media/origsite}/images/map_key.png
  77. BIN site/{_media → media/origsite}/images/openstateslogo.png
  78. BIN site/{_media → media/origsite}/images/openstatesmap.png
  79. 0 site/{_media → media/origsite}/images/openstatesmap.svg
  80. BIN site/{_media → media/origsite}/images/ready.png
  81. BIN site/{_media → media/origsite}/images/sf_mini_logo.png
  82. BIN site/{_media → media/origsite}/images/sf_mini_nav_bg.jpg
  83. BIN site/{_media → media/origsite}/images/sf_product_badge.png
  84. BIN site/{_media/images/public → media/origsite/images}/social_sprites.png
  85. BIN site/{_media → media/origsite}/images/sunlightfoundationlogo.png
  86. BIN site/{_media → media/origsite}/images/sunlightfoundationlogo_hover.png
  87. BIN site/{_media → media/origsite}/images/use.png
  88. BIN site/{_media → media/origsite}/images/use_bullet.png
  89. BIN site/{_media → media/origsite}/images/use_bullet_live.png
  90. 0 site/{_media → media/origsite}/js/html5.js
  91. 0 site/{_media → media/origsite}/js/jquery-1.5.min.js
  92. 0 site/{_media → media/origsite}/js/jquery.placeholder.js
  93. +6 −5 site/templates/base.html
  94. +10 −9 site/templates/flatpage.html
  95. +11 −10 site/templates/index.html
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -1,15 +1,16 @@
+{% load static from staticfiles %}
<!DOCTYPE html>
<html>
<head>
<title>{% block title %}Open State Project: freeing state legislative information {% endblock %}</title>
<meta name="keywords" content="Sunlight, Sunlight Foundation, Government Transparency, Bills, Legislators, Committees, Votes, Schedules, Developers, State, Open States" />
<meta name="description" content="The Open State Project gathers legislative data directly from the states and makes it available in a common format for interested developers." />
- <link rel="stylesheet" href="{{STATIC_URL}}css/main.css" media="screen" title="no title" charset="utf-8"/>
- <!--[if IE 7]><link rel="stylesheet" href="{{STATIC_URL}}css/buggy_7.css" %}" media="screen" /><![endif]-->
- <!--[if IE 7]><script src="{{STATIC_URL}}js/html5.js"></script><![endif]-->
+ <link rel="stylesheet" href={% static "origsite/css/main.css" %} media="screen" title="no title" charset="utf-8"/>
+ <!--[if IE 7]><link rel="stylesheet" href="{% static "origsite/css/buggy_7.css" %}" media="screen" /><![endif]-->
+ <!--[if IE 7]><script src="{% static "origsite/js/html5.js"%}"></script><![endif]-->
<script src="http://use.typekit.com/xau7dem.js"></script>
- <script src="{{STATIC_URL}}js/jquery-1.5.min.js"></script>
- <script src="{{STATIC_URL}}js/jquery.placeholder.js"></script>
+ <script src="{% static "origsite/js/jquery-1.5.min.js" %}"></script>
+ <script src="{% static "origsite/js/jquery.placeholder.js" %}"></script>
<script>try{Typekit.load();}catch(e){}</script>
<script type="text/javascript">
$(function() {
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load static from staticfiles %}
{% block body %}
<div class="wrapper">
<div class="header-shadow"></div>
@@ -9,7 +10,7 @@ <h1 id="logo">
OpenStates
</a>
</h1>
- <img class="arrow" src="{{STATIC_URL}}images/header_arrow.png" alt="Header Arrow" />
+ <img class="arrow" src="{% static "origsite/images/header_arrow.png" %}" alt="Header Arrow" />
</div>
<div class="header-ribbon header-ribbon-all">
@@ -40,16 +41,16 @@ <h1 id="logo">
<ul>
<li>
- <img src="{{STATIC_URL}}images/use_bullet.png" alt="Use Bullet" /><a href="/api/">Open States API</a>
+ <img src="{% static "origsite/images/use_bullet.png" %}" alt="Use Bullet" /><a href="/api/">Open States API</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/use_bullet.png" alt="Use Bullet" /><a href="/downloads/">Bulk Downloads</a>
+ <img src="{% static "origsite/images/use_bullet.png" %}" alt="Use Bullet" /><a href="/downloads/">Bulk Downloads</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/use_bullet.png" alt="Use Bullet" /> <a href="http://python-sunlight.readthedocs.org/">Python Client Library</a>
+ <img src="{% static "origsite/images/use_bullet.png" %}" alt="Use Bullet" /> <a href="http://python-sunlight.readthedocs.org/">Python Client Library</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/use_bullet.png" alt="Use Bullet" /><a href="http://github.com/sunlightlabs/openstates/issues">Issue Tracker</a>
+ <img src="{% static "origsite/images/use_bullet.png" %}" alt="Use Bullet" /><a href="http://github.com/sunlightlabs/openstates/issues">Issue Tracker</a>
</li>
</ul>
</div>
@@ -60,18 +61,18 @@ <h1 id="logo">
<ul>
<li>
- <img src="{{STATIC_URL}}images/contribute_bullet.png" alt="Contribute Bullet" /> <a href="/contributing/">Contributor's Guide</a>
+ <img src="{% static "origsite/images/contribute_bullet.png" %}" alt="Contribute Bullet" /> <a href="/contributing/">Contributor's Guide</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/contribute_bullet.png" alt="Contribute Bullet" /> <a href="http://github.com/sunlightlabs/openstates/">Code on GitHub</a>
+ <img src="{% static "origsite/images/contribute_bullet.png" %}" alt="Contribute Bullet" /> <a href="http://github.com/sunlightlabs/openstates/">Code on GitHub</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/contribute_bullet.png" alt="Contribute Bullet" /> <a href="http://readthedocs.org/docs/billy/en/latest/scrapers.html">Writing Scrapers</a>
+ <img src="{% static "origsite/images/contribute_bullet.png" %}" alt="Contribute Bullet" /> <a href="http://readthedocs.org/docs/billy/en/latest/scrapers.html">Writing Scrapers</a>
</li>
</ul>
</div>
<div class="join-side">
- <img id="sf-product" src="{{STATIC_URL}}images/sf_product_badge.png" alt="Sf Product Badge" />
+ <img id="sf-product" src="{% static "origsite/images/sf_product_badge.png" %}" alt="Sf Product Badge" />
<h3>
Like this Project and Want to Discover Others Like It?
View
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load static from staticfiles %}
{% block body %}
<div class="wrapper">
<div class="header-shadow"></div>
@@ -8,7 +9,7 @@
<h1 id="logo">
<a href="/">OpenStates</a>
</h1>
- <img class="arrow" src="{{STATIC_URL}}images/header_arrow.png" alt="Header Arrow" />
+ <img class="arrow" src="{% static "origsite/images/header_arrow.png" %}" alt="Header Arrow" />
<p class="intro">
We're gathering legislative data directly from the states and making it available in a common format through a <a href="/api/">RESTful API</a> and <a href="/downloads/">regular bulk downloads.</a> Join our <a href="http://groups.google.com/group/fifty-state-project">Google Group</a> to get involved. Now you can also get <a href="http://itunes.apple.com/app/open-states/id500672932?mt=8">Open States on your iPhone or iPad.</a>
</p>
@@ -51,7 +52,7 @@ <h1 id="logo">
</div>
<div class="clear">
</div>
- <img src="{{STATIC_URL}}images/openstatesmap.png?50" id="map" alt="Open States Map" />
+ <img src="{% static "origsite/images/openstatesmap.png" %}?50" id="map" alt="Open States Map" />
</div>
<div class="main-right">
<div class="use">
@@ -63,16 +64,16 @@ <h1 id="logo">
</p>
<ul>
<li>
- <img src="{{STATIC_URL}}images/use_bullet.png" alt="Use Bullet" /> <a href="/api/">Open States API</a>
+ <img src="{% static "origsite/images/use_bullet.png" %}" alt="Use Bullet" /> <a href="/api/">Open States API</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/use_bullet.png" alt="Use Bullet" /> <a href="/downloads/">Bulk Downloads</a>
+ <img src="{% static "origsite/images/use_bullet.png" %}" alt="Use Bullet" /> <a href="/downloads/">Bulk Downloads</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/use_bullet.png" alt="Use Bullet" /> <a href="http://python-sunlight.readthedocs.org/">Python Client Library</a>
+ <img src="{% static "origsite/images/use_bullet.png" %}" alt="Use Bullet" /> <a href="http://python-sunlight.readthedocs.org/">Python Client Library</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/use_bullet.png" alt="Use Bullet" /> <a href="https://github.com/sunlightlabs/openstates/issues">Issue Tracker</a>
+ <img src="{% static "origsite/images/use_bullet.png" %}" alt="Use Bullet" /> <a href="https://github.com/sunlightlabs/openstates/issues">Issue Tracker</a>
</li>
</ul>
</div>
@@ -85,13 +86,13 @@ <h1 id="logo">
</p>
<ul>
<li>
- <img src="{{STATIC_URL}}images/contribute_bullet.png" alt="Contribute Bullet" /> <a href="/contributing/">Contributor's Guide</a>
+ <img src="{% static "origsite/images/contribute_bullet.png" %}" alt="Contribute Bullet" /> <a href="/contributing/">Contributor's Guide</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/contribute_bullet.png" alt="Contribute Bullet" /> <a href="http://github.com/sunlightlabs/openstates/">Code on GitHub</a>
+ <img src="{% static "origsite/images/contribute_bullet.png" %}" alt="Contribute Bullet" /> <a href="http://github.com/sunlightlabs/openstates/">Code on GitHub</a>
</li>
<li>
- <img src="{{STATIC_URL}}images/contribute_bullet.png" alt="Contribute Bullet" /> <a href="http://readthedocs.org/docs/billy/en/latest/scrapers.html">Writing Scrapers</a>
+ <img src="{% static "origsite/images/contribute_bullet.png" %}" alt="Contribute Bullet" /> <a href="http://readthedocs.org/docs/billy/en/latest/scrapers.html">Writing Scrapers</a>
</li>
</ul>
</div>
@@ -101,7 +102,7 @@ <h1 id="logo">
</div>
<div id="join">
<div id="join-borders">
- <img id="sf-product" src="{{STATIC_URL}}images/sf_product_badge.png" alt="Sf Product Badge" />
+ <img id="sf-product" src="{% static "origsite/images/sf_product_badge.png" %}" alt="Sf Product Badge" />
<div class="join-left">
<h3>
Like this Project and Want to Discover Others Like It?

0 comments on commit 37e6ed6

Please sign in to comment.