From 76f9fe53047199202d1ef09d0507a50460bc4acb Mon Sep 17 00:00:00 2001 From: Preston Bezant Date: Sun, 12 Aug 2018 21:44:23 -0500 Subject: [PATCH 1/9] added boostrap pill nav. please test and attach screenshots. Can't get docker to run :-/ --- .../legislators/legislator_detail.html | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/influencetx/legislators/templates/legislators/legislator_detail.html b/influencetx/legislators/templates/legislators/legislator_detail.html index 437da7b..a09296b 100644 --- a/influencetx/legislators/templates/legislators/legislator_detail.html +++ b/influencetx/legislators/templates/legislators/legislator_detail.html @@ -10,18 +10,25 @@ {% endblock css %} {% block content %} + + -
Votes
+ - -
Top Donors
+ {% endblock content %} {% block javascript %} From 305aec742cbbd66d610afe6a506222636ba239a0 Mon Sep 17 00:00:00 2001 From: Preston Bezant Date: Fri, 24 Aug 2018 20:40:03 -0500 Subject: [PATCH 2/9] added tabs --- Vagrantfile | 47 +++++++++++++++++++ .../legislators/legislator_detail.html | 41 ++++++++-------- 2 files changed, 67 insertions(+), 21 deletions(-) create mode 100644 Vagrantfile diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..ec6c224 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,47 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : +Vagrant.require_version ">= 1.6.0" +Vagrant.configure(2) do |config| + # https://docs.vagrantup.com. + + # boxes at https://atlas.hashicorp.com/search. + config.vm.box = "ubuntu/xenial64" + config.vm.hostname = "inftx.dev.local.net" + + # Create a forwarded port mapping which allows access to a specific port + config.vm.network "forwarded_port", guest: 5120, host: 5120 + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network "private_network", ip: "172.16.13.7", virtualbox__intnet: "mynet" + + # Create a public network, which generally matched to bridged network. + # config.vm.network "public_network" + + config.vm.provider "virtualbox" do |vb| + # # Display the VirtualBox GUI when booting the machine + # vb.gui = true + + # Customize the amount of memory on the VM: + vb.memory = "2048" + vb.cpus = "2" + end + + # Install pre-reqs + config.vm.provision "shell", :privileged => true, inline: <<-SHELL + apt-get update + apt-get install -y python-minimal + SHELL + + config.vm.provision "ansible" do |ansible| + ansible.playbook = "../ansible/inventory/vagrant/playbook.yml" + end + + # Install application + config.vm.provision "shell", :privileged => true, inline: <<-SHELL + source /vagrant/env.sh + docker-compose -f docker-compose.build up --build --force-recreate -d + SHELL + +end + diff --git a/src/influencetx/legislators/templates/legislators/legislator_detail.html b/src/influencetx/legislators/templates/legislators/legislator_detail.html index 173201a..10ab2af 100644 --- a/src/influencetx/legislators/templates/legislators/legislator_detail.html +++ b/src/influencetx/legislators/templates/legislators/legislator_detail.html @@ -10,27 +10,25 @@ {% endblock css %} {% block content %} - - - +


{% endblock content %} {% block javascript %} diff --git a/src/influencetx/static/css/project.css b/src/influencetx/static/css/project.css index 1e4f73d..e4cd6aa 100644 --- a/src/influencetx/static/css/project.css +++ b/src/influencetx/static/css/project.css @@ -10,6 +10,16 @@ h1, h2, h3, h4, h5 { background-color: #7986cb; } +.footer { + position: fixed; + bottom: 0; + width: 100%; + background-color: #3f51b5; +} + +.flatten { + display: inline-block; } + .alert-debug { background-color: #fff; border-color: #d6e9c6; diff --git a/src/influencetx/templates/base.html b/src/influencetx/templates/base.html index 9e9b424..72831d4 100644 --- a/src/influencetx/templates/base.html +++ b/src/influencetx/templates/base.html @@ -71,13 +71,14 @@ {% endif %} {% block content %} -

Use this document as a way to quick start any new project.

+

Welcome to the INFLUENCE TEXAS OS project.

{% endblock content %} {% block modal %}{% endblock modal %} - + + {% include "pages/footer.html" %} diff --git a/src/influencetx/templates/openstates/bill_detail.html b/src/influencetx/templates/openstates/bill_detail.html index ed69e16..49534d8 100644 --- a/src/influencetx/templates/openstates/bill_detail.html +++ b/src/influencetx/templates/openstates/bill_detail.html @@ -60,4 +60,5 @@

Bill Details

+


{% endblock content %} diff --git a/src/influencetx/templates/pages/about.html b/src/influencetx/templates/pages/about.html index a748ebf..dac7f83 100644 --- a/src/influencetx/templates/pages/about.html +++ b/src/influencetx/templates/pages/about.html @@ -26,4 +26,5 @@

Get Involved

TOS and Privacy

Please read our TOS and Privacy Policy. +


{% endblock content %} diff --git a/src/influencetx/templates/pages/footer.html b/src/influencetx/templates/pages/footer.html new file mode 100644 index 0000000..fa83eeb --- /dev/null +++ b/src/influencetx/templates/pages/footer.html @@ -0,0 +1,15 @@ + diff --git a/src/influencetx/templates/pages/home.html b/src/influencetx/templates/pages/home.html index a385861..43aa2f4 100644 --- a/src/influencetx/templates/pages/home.html +++ b/src/influencetx/templates/pages/home.html @@ -17,4 +17,6 @@ +


+ {% endblock content %} diff --git a/src/influencetx/tpj/templates/tpj/donor_detail.html b/src/influencetx/tpj/templates/tpj/donor_detail.html index 2de469d..a5b8f19 100644 --- a/src/influencetx/tpj/templates/tpj/donor_detail.html +++ b/src/influencetx/tpj/templates/tpj/donor_detail.html @@ -36,6 +36,7 @@
Top Contributions
{% endfor %} +


{% endblock content %} diff --git a/src/influencetx/tpj/templates/tpj/donor_list.html b/src/influencetx/tpj/templates/tpj/donor_list.html index 78e8f39..40828fb 100644 --- a/src/influencetx/tpj/templates/tpj/donor_list.html +++ b/src/influencetx/tpj/templates/tpj/donor_list.html @@ -27,7 +27,7 @@

Top Donors

{% endfor %} - +


{% endblock content %} {% block javascript %} From 9eb3014b520583bd94787cb6619a27fd0522e47c Mon Sep 17 00:00:00 2001 From: Michael Rollins Date: Sat, 25 Aug 2018 12:47:17 -0500 Subject: [PATCH 4/9] 91: fixed color of version --- src/influencetx/templates/pages/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/influencetx/templates/pages/footer.html b/src/influencetx/templates/pages/footer.html index fa83eeb..da94459 100644 --- a/src/influencetx/templates/pages/footer.html +++ b/src/influencetx/templates/pages/footer.html @@ -2,7 +2,7 @@
  • - v0.1.85.2 + v0.1.85.2
  • -- TOS From 92193d56258117a59613ffa2c34bf22b8c1d21a5 Mon Sep 17 00:00:00 2001 From: Michael Rollins Date: Sat, 25 Aug 2018 13:47:01 -0500 Subject: [PATCH 5/9] 91: fixes for footer --- .../templates/legislators/legislator_detail.html | 4 ++-- .../templates/legislators/legislator_list.html | 2 +- src/influencetx/static/css/project.css | 7 ++++--- src/influencetx/templates/base.html | 5 ++--- src/influencetx/templates/pages/footer.html | 16 ++++++++-------- src/influencetx/templates/pages/home.html | 4 ++-- .../tpj/templates/tpj/donor_detail.html | 4 ++-- .../tpj/templates/tpj/donor_list.html | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/influencetx/legislators/templates/legislators/legislator_detail.html b/src/influencetx/legislators/templates/legislators/legislator_detail.html index b68ebd5..50ce192 100644 --- a/src/influencetx/legislators/templates/legislators/legislator_detail.html +++ b/src/influencetx/legislators/templates/legislators/legislator_detail.html @@ -61,8 +61,8 @@
    Top Donors
    {% endfor %} -


    - +
    + {% include "pages/footer.html" %} {% endblock content %} {% block javascript %} diff --git a/src/influencetx/legislators/templates/legislators/legislator_list.html b/src/influencetx/legislators/templates/legislators/legislator_list.html index 64dfeef..8e1b6b2 100644 --- a/src/influencetx/legislators/templates/legislators/legislator_list.html +++ b/src/influencetx/legislators/templates/legislators/legislator_list.html @@ -38,7 +38,7 @@
    {{ person }}
    {% endfor %}
-


+
{% endblock content %} {% block javascript %} diff --git a/src/influencetx/static/css/project.css b/src/influencetx/static/css/project.css index e4cd6aa..30a687a 100644 --- a/src/influencetx/static/css/project.css +++ b/src/influencetx/static/css/project.css @@ -11,13 +11,14 @@ h1, h2, h3, h4, h5 { } .footer { - position: fixed; + position: absolute; + left: 0 bottom: 0; width: 100%; - background-color: #3f51b5; } -.flatten { +.flatten li { + padding: 0 .7em; display: inline-block; } .alert-debug { diff --git a/src/influencetx/templates/base.html b/src/influencetx/templates/base.html index 72831d4..852b4c1 100644 --- a/src/influencetx/templates/base.html +++ b/src/influencetx/templates/base.html @@ -34,7 +34,7 @@ - INFLUENCE TEXASos + INFLUENCE TEXASos {% block modal %}{% endblock modal %} - - {% include "pages/footer.html" %} + diff --git a/src/influencetx/templates/pages/footer.html b/src/influencetx/templates/pages/footer.html index da94459..ce881fb 100644 --- a/src/influencetx/templates/pages/footer.html +++ b/src/influencetx/templates/pages/footer.html @@ -1,14 +1,14 @@ -