From 8a03b03fb21e168ace1c5424967d0e6ddbc6c7cc Mon Sep 17 00:00:00 2001 From: piernov Date: Fri, 19 Oct 2012 21:37:53 +0200 Subject: Header déplacé dans header.rb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- header.rb | 24 ++++++++++++++++++++++++ index.cgi | 24 +++--------------------- latest.cgi | 44 +++++++++++++------------------------------- top.cgi | 25 +++---------------------- 4 files changed, 43 insertions(+), 74 deletions(-) create mode 100755 header.rb diff --git a/header.rb b/header.rb new file mode 100755 index 0000000..51c3a85 --- /dev/null +++ b/header.rb @@ -0,0 +1,24 @@ +def header_bdg() + $cgi = CGI.new + puts $cgi.header + + html = < + + + + + BDG � Blagues de Geek + + + + + + + + + +HTML_BDG + return html +end \ No newline at end of file diff --git a/index.cgi b/index.cgi index 5cd81ac..177054f 100755 --- a/index.cgi +++ b/index.cgi @@ -10,27 +10,9 @@ db=$db page="Blagues" subpage="Aléatoire" -cgi = CGI.new -puts cgi.header - -puts < - - - - - BDG — Blagues de Geek - - - - - - - - - -HTML_BDG +require 'header' +puts header_bdg() +cgi=$cgi require 'menu' puts menu_bdg(page,subpage) diff --git a/latest.cgi b/latest.cgi index 22bb34a..30ee24a 100755 --- a/latest.cgi +++ b/latest.cgi @@ -10,41 +10,23 @@ db=$db page="Blagues" subpage="Derniers ajouts" -cgi = CGI.new -puts cgi.header +require 'header' +puts header_bdg() +cgi=$cgi if cgi['page'] =~ /\d*/ - page = cgi['page'].to_i + current_page = cgi['page'].to_i else - page = 1 + current_page = 1 end -puts < - - - - - BDG — Blagues de Geek - - - - - - - - - -HTML_BDG - require 'menu' puts menu_bdg(page,subpage) puts < -

Dernières blagues ajoutés

HTML_BDG @@ -53,8 +35,8 @@ db.execute("SELECT count(id) FROM blague").each { |row| num_bdg = row[0].to_i } num_page = ((num_bdg+11)/10+1) i = 0 -if page > 5 then - i = page +if current_page > 5 then + i = current_page puts <1 @@ -63,20 +45,20 @@ HTML_BDG end until i == num_page i = i+1 - if i > (page+10) and num_page/2 > 10 then + if i > (current_page+10) and num_page/2 > 10 then puts <#{(num_page+page)/2} + #{(num_page+current_page)/2} HTML_BDG break - elsif i > 5 and page > 5 then + elsif i > 5 and current_page > 5 then puts <#{i-4} HTML_BDG - elsif i < 11 and page <= 5 + elsif i < 11 and current_page <= 5 puts <#{i} @@ -95,7 +77,7 @@ puts"

" i = 0 -db.execute("SELECT * FROM blague WHERE id < ((SELECT id FROM blague ORDER BY id DESC LIMIT 1)-#{(page*10)-11}) ORDER BY id DESC LIMIT 10").each { |row| +db.execute("SELECT * FROM blague WHERE id < ((SELECT id FROM blague ORDER BY id DESC LIMIT 1)-#{(current_page*10)-11}) ORDER BY id DESC LIMIT 10").each { |row| unless row[1] == "" if i.modulo(2) == 1 parity = " impair" diff --git a/top.cgi b/top.cgi index df6424f..0f88548 100755 --- a/top.cgi +++ b/top.cgi @@ -11,34 +11,15 @@ order = "-" page="Blagues" subpage="Top 10" -cgi = CGI.new +require 'header' +puts header_bdg() +cgi=$cgi if cgi['order'] == "worst" order = "+" subpage="Worst" end -puts cgi.header - -puts < - - - - - BDG — Blagues de Geek - - - - - - - - - -HTML_BDG - require 'menu' puts menu_bdg(page,subpage) -- cgit v1.2.3-70-g09d2