Download as
Browse Code »

Commit 75eba8cdc9f5e6bcb7ddd9ed523d639a969b3644

Authored by carlos.vieira
1 parent b8bb88c8
Exists in master

build.sh: Chamando o build para o default se nenhum profile ? especificado. barr… 

…abrasil.py: tratamento de SSL para testes. barra-copa.scss: modificado url da fonte para pegar http ou https conforme especificado pelo usu?rio
Showing 3 changed files with 17 additions and 5 deletions   Show diff stats
app/barrabrasil.py
  Diff comments   View file @75eba8c
1 from flask import Flask, url_for, render_template, request, Response, make_response 1 from flask import Flask, url_for, render_template, request, Response, make_response
2 import hashlib,webbrowser 2 import hashlib,webbrowser
3 -from sys import argv 3 +
  4 +# Criar Key e certificado
  5 +# openssl genrsa 1024 > ssl.key
  6 +# openssl req -new -x509 -nodes -sha1 -days 365 -key ssl.key > ssl.cert
  7 +
  8 +#from OpenSSL import SSL
  9 +#ctx = SSL.Context(SSL.SSLv23_METHOD)
  10 +#ctx.use_privatekey_file('ssl.key')
  11 +#ctx.use_certificate_file('ssl.cert')
  12 +
4 app = Flask(__name__) 13 app = Flask(__name__)
5 14
6 @app.route('/') 15 @app.route('/')
@@ -37,4 +46,6 @@ if __name__ == '__main__': @@ -37,4 +46,6 @@ if __name__ == '__main__':
37 profile = 'default' 46 profile = 'default'
38 webbrowser.open("http://127.0.0.1:5000/",new=2) 47 webbrowser.open("http://127.0.0.1:5000/",new=2)
39 app.run(debug=False) 48 app.run(debug=False)
  49 + #webbrowser.open("https://127.0.0.1:5000/",new=2)
  50 + #app.run(debug=False,ssl_context=ctx)
40 51
@@ -7,11 +7,12 @@ else @@ -7,11 +7,12 @@ else
7 profile='default' 7 profile='default'
8 fi 8 fi
9 9
10 -if test -d "recipes/$1" 10 +if test -d "recipes/$profile"
11 then 11 then
12 cd recipes/$profile 12 cd recipes/$profile
13 sh ./compile.sh 13 sh ./compile.sh
14 - python ../../app/barrabrasil.py $profile 14 + cd ../../app
  15 + python barrabrasil.py $profile
15 else 16 else
16 echo "Error. Profile $1 does not exist." 17 echo "Error. Profile $1 does not exist."
17 fi 18 fi
recipes/copa2014/assets/barra-copa.scss
  Diff comments   View file @75eba8c
1 -$borderPadrao: 1px solid #d3a725; 1 +$borderPadrao: 1px solid #D3A725;
2 $widthPadrao: 960px; 2 $widthPadrao: 960px;
3 3
4 #barra-brasil { 4 #barra-brasil {
@@ -29,7 +29,7 @@ $widthPadrao: 960px; @@ -29,7 +29,7 @@ $widthPadrao: 960px;
29 font-family: "Open Sans"; 29 font-family: "Open Sans";
30 font-style: normal; 30 font-style: normal;
31 font-weight: 700; 31 font-weight: 700;
32 - src: local("Open Sans Bold"), local("OpenSans-Bold"), url("http://barra.brasil.gov.br/static/opensans-bold.woff") format("woff"); 32 + src: local("Open Sans Bold"), local("OpenSans-Bold"), url("//barra.brasil.gov.br/static/opensans-bold.woff") format("woff");
33 } 33 }
34 34
35 35